[Xen-changelog] Make version strings consistent across all interfaces.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 75637383278c60adb9508ecd113945abb316885d
# Parent  f3f0be0588555078d3a2593b56f212082a2b690b
Make version strings consistent across all interfaces.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r f3f0be058855 -r 75637383278c 
linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S  Sun Dec  4 17:12:18 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/head.S  Sun Dec  4 17:16:33 2005
@@ -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 -r f3f0be058855 -r 75637383278c 
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S        Sun Dec  4 
17:12:18 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S        Sun Dec  4 
17:16:33 2005
@@ -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 -r f3f0be058855 -r 75637383278c tools/libxc/xc_load_elf.c
--- a/tools/libxc/xc_load_elf.c Sun Dec  4 17:12:18 2005
+++ b/tools/libxc/xc_load_elf.c Sun Dec  4 17:16:33 2005
@@ -109,7 +109,7 @@
             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 -r f3f0be058855 -r 75637383278c xen/common/elf.c
--- a/xen/common/elf.c  Sun Dec  4 17:12:18 2005
+++ b/xen/common/elf.c  Sun Dec  4 17:16:33 2005
@@ -71,7 +71,7 @@
             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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog