diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-12-04 18:16:33 +0100 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-12-04 18:16:33 +0100 |
| commit | c4b779466940b72677c3929ae2e3072b994c8371 (patch) | |
| tree | f54ef9713860072393f4637a4a41dd467749a083 | |
| parent | fac70b835d5e6483f1f11ffc859cb4ee5a5e1dd8 (diff) | |
| download | xen-c4b779466940b72677c3929ae2e3072b994c8371.tar.gz xen-c4b779466940b72677c3929ae2e3072b994c8371.tar.bz2 xen-c4b779466940b72677c3929ae2e3072b994c8371.zip | |
Make version strings consistent across all interfaces.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
| -rw-r--r-- | linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S | 2 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S | 2 | ||||
| -rw-r--r-- | tools/libxc/xc_load_elf.c | 2 | ||||
| -rw-r--r-- | xen/common/elf.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S index 64eaa9fe78..220cf8fd7a 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S @@ -3,7 +3,7 @@ .section __xen_guest .ascii "GUEST_OS=linux,GUEST_VER=2.6" - .ascii ",XEN_VER=3.0" + .ascii ",XEN_VER=xen-3.0" .ascii ",VIRT_BASE=0xC0000000" #ifdef CONFIG_X86_PAE .ascii ",PAE=yes" diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S index b1418e6afe..c22996e8e4 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S @@ -16,7 +16,7 @@ #include <linux/linkage.h> .section __xen_guest - .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80000000" + .ascii "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=xen-3.0,VIRT_BASE=0xffffffff80000000" .ascii ",LOADER=generic" /* .ascii ",PT_MODE_WRITABLE" */ .byte 0 diff --git a/tools/libxc/xc_load_elf.c b/tools/libxc/xc_load_elf.c index 9d00be1e78..ac8fb81ccc 100644 --- a/tools/libxc/xc_load_elf.c +++ b/tools/libxc/xc_load_elf.c @@ -109,7 +109,7 @@ static int parseelfimage(char *image, return -EINVAL; } - if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) + if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) ) { ERROR("Will only load images built for Xen v3.0"); ERROR("Actually saw: '%s'", guestinfo); diff --git a/xen/common/elf.c b/xen/common/elf.c index 08ff377d7c..4fc8f26ecd 100644 --- a/xen/common/elf.c +++ b/xen/common/elf.c @@ -71,7 +71,7 @@ int parseelfimage(struct domain_setup_info *dsi) return -EINVAL; } - if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) + if ( (strstr(guestinfo, "XEN_VER=xen-3.0") == NULL) ) { printk("ERROR: Xen will only load images built for Xen v3.0\n"); return -EINVAL; |