ia64/xen-unstable

changeset 8238:75637383278c

Make version strings consistent across all interfaces.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Sun Dec 04 18:16:33 2005 +0100 (2005-12-04)
parents f3f0be058855
children 2d32c7489a39
files linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S tools/libxc/xc_load_elf.c xen/common/elf.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S	Sun Dec 04 18:12:18 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S	Sun Dec 04 18:16:33 2005 +0100
     1.3 @@ -3,7 +3,7 @@
     1.4  
     1.5  .section __xen_guest
     1.6  	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
     1.7 -	.ascii	",XEN_VER=3.0"
     1.8 +	.ascii	",XEN_VER=xen-3.0"
     1.9  	.ascii	",VIRT_BASE=0xC0000000"
    1.10  #ifdef CONFIG_X86_PAE
    1.11  	.ascii	",PAE=yes"
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S	Sun Dec 04 18:12:18 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S	Sun Dec 04 18:16:33 2005 +0100
     2.3 @@ -16,7 +16,7 @@
     2.4  #include <linux/linkage.h>
     2.5  
     2.6  .section __xen_guest
     2.7 -	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80000000"
     2.8 +	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=xen-3.0,VIRT_BASE=0xffffffff80000000"
     2.9  	.ascii	",LOADER=generic"
    2.10  /*	.ascii	",PT_MODE_WRITABLE" */
    2.11  	.byte	0
     3.1 --- a/tools/libxc/xc_load_elf.c	Sun Dec 04 18:12:18 2005 +0100
     3.2 +++ b/tools/libxc/xc_load_elf.c	Sun Dec 04 18:16:33 2005 +0100
     3.3 @@ -109,7 +109,7 @@ static int parseelfimage(char *image,
     3.4              return -EINVAL;
     3.5          }
     3.6  
     3.7 -        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     3.8 +        if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) )
     3.9          {
    3.10              ERROR("Will only load images built for Xen v3.0");
    3.11              ERROR("Actually saw: '%s'", guestinfo);
     4.1 --- a/xen/common/elf.c	Sun Dec 04 18:12:18 2005 +0100
     4.2 +++ b/xen/common/elf.c	Sun Dec 04 18:16:33 2005 +0100
     4.3 @@ -71,7 +71,7 @@ int parseelfimage(struct domain_setup_in
     4.4              return -EINVAL;
     4.5          }
     4.6  
     4.7 -        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     4.8 +        if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) )
     4.9          {
    4.10              printk("ERROR: Xen will only load images built for Xen v3.0\n");
    4.11              return -EINVAL;