ia64/xen-unstable

changeset 3949:279cb235be66

bitkeeper revision 1.1236.1.36 (4221cfd30UrMyu3TpXKGjVNXNVS1Bw)

Update 'xen version' in guest-OS images to 3.0.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@scramble.cl.cam.ac.uk
date Sun Feb 27 13:49:07 2005 +0000 (2005-02-27)
parents 48f375bb04c4
children 1287a4b3e6c3 4d71c8e12d6f
files extras/mini-os/x86_32.S extras/mini-os/x86_64.S linux-2.4.29-xen-sparse/arch/xen/kernel/head.S linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S tools/libxc/xc_linux_build.c xen/common/elf.c
line diff
     1.1 --- a/extras/mini-os/x86_32.S	Sun Feb 27 13:40:30 2005 +0000
     1.2 +++ b/extras/mini-os/x86_32.S	Sun Feb 27 13:49:07 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #include <os.h>
     1.5  
     1.6  .section __xen_guest
     1.7 -        .asciz  "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE"
     1.8 +        .asciz  "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE"
     1.9  .text
    1.10  
    1.11  .globl _start, shared_info
     2.1 --- a/extras/mini-os/x86_64.S	Sun Feb 27 13:40:30 2005 +0000
     2.2 +++ b/extras/mini-os/x86_64.S	Sun Feb 27 13:49:07 2005 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #include <os.h>
     2.5  
     2.6  .section __xen_guest
     2.7 -        .asciz  "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE"
     2.8 +        .asciz  "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE"
     2.9  .text
    2.10  
    2.11  #define ENTRY(X) .globl X ; X :
     3.1 --- a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S	Sun Feb 27 13:40:30 2005 +0000
     3.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S	Sun Feb 27 13:49:07 2005 +0000
     3.3 @@ -1,6 +1,6 @@
     3.4  
     3.5  .section __xen_guest
     3.6 -    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=2.0,VIRT_BASE=0xC0000000"
     3.7 +    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=3.0,VIRT_BASE=0xC0000000"
     3.8  
     3.9  .text
    3.10  #include <linux/config.h>
     4.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S	Sun Feb 27 13:40:30 2005 +0000
     4.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S	Sun Feb 27 13:49:07 2005 +0000
     4.3 @@ -2,7 +2,7 @@
     4.4  #include <linux/config.h>
     4.5  
     4.6  .section __xen_guest
     4.7 -	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0,VIRT_BASE=0xC0000000"
     4.8 +	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xC0000000"
     4.9  	.ascii	",LOADER=generic"
    4.10  	.ascii	",PT_MODE_WRITABLE"
    4.11  	.byte	0
     5.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Sun Feb 27 13:40:30 2005 +0000
     5.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Sun Feb 27 13:49:07 2005 +0000
     5.3 @@ -180,7 +180,7 @@
     5.4   * Xen guest identifier and loader selection
     5.5   */
     5.6  .section __xen_guest
     5.7 -	.ascii	"GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0"
     5.8 +	.ascii	"GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=3.0"
     5.9  	.ascii	",LOADER=generic"
    5.10  #if (NKSYMS || defined(DDB) || defined(LKM)) && !defined(SYMTAB_SPACE)
    5.11  	.ascii	",BSD_SYMTAB"
     6.1 --- a/tools/libxc/xc_linux_build.c	Sun Feb 27 13:40:30 2005 +0000
     6.2 +++ b/tools/libxc/xc_linux_build.c	Sun Feb 27 13:49:07 2005 +0000
     6.3 @@ -538,7 +538,7 @@ static int parseelfimage(char *elfbase,
     6.4              return -EINVAL;
     6.5          }
     6.6  
     6.7 -        if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
     6.8 +        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     6.9          {
    6.10              ERROR("Will only load images built for Xen v2.0");
    6.11              ERROR("Actually saw: '%s'", guestinfo);
     7.1 --- a/xen/common/elf.c	Sun Feb 27 13:40:30 2005 +0000
     7.2 +++ b/xen/common/elf.c	Sun Feb 27 13:49:07 2005 +0000
     7.3 @@ -76,7 +76,7 @@ int parseelfimage(char *elfbase,
     7.4              return -EINVAL;
     7.5          }
     7.6  
     7.7 -        if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
     7.8 +        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     7.9          {
    7.10              printk("ERROR: Xen will only load images built for Xen v2.0\n");
    7.11              return -EINVAL;