ia64/xen-unstable

changeset 11779:f028e3732803

Correct check for extended-cr3 support in __xen_guest fallback code.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Tue Oct 10 10:06:56 2006 +0100 (2006-10-10)
parents ab85c20d33e5
children cb337b2f817b
files tools/libxc/xc_load_elf.c xen/common/elf.c
line diff
     1.1 --- a/tools/libxc/xc_load_elf.c	Mon Oct 09 23:34:00 2006 +0100
     1.2 +++ b/tools/libxc/xc_load_elf.c	Tue Oct 10 10:06:56 2006 +0100
     1.3 @@ -364,7 +364,7 @@ static int parseelfimage(const char *ima
     1.4          if ( p != NULL && strncmp(p, "yes", 3) == 0 )
     1.5          {
     1.6              dsi->pae_kernel = PAEKERN_yes;
     1.7 -            if ( !strncmp(p+4, "[extended-cr3]", 14) )
     1.8 +            if ( !strncmp(p+3, "[extended-cr3]", 14) )
     1.9                  dsi->pae_kernel = PAEKERN_extended_cr3;
    1.10          }
    1.11      }
     2.1 --- a/xen/common/elf.c	Mon Oct 09 23:34:00 2006 +0100
     2.2 +++ b/xen/common/elf.c	Tue Oct 10 10:06:56 2006 +0100
     2.3 @@ -304,7 +304,7 @@ int parseelfimage(struct domain_setup_in
     2.4          if ( p != NULL && strncmp(p, "yes", 3) == 0 )
     2.5          {
     2.6              dsi->pae_kernel = PAEKERN_yes;
     2.7 -            if ( !strncmp(p+4, "[extended-cr3]", 14) )
     2.8 +            if ( !strncmp(p+3, "[extended-cr3]", 14) )
     2.9                  dsi->pae_kernel = PAEKERN_extended_cr3;
    2.10          }
    2.11      }