ia64/xen-unstable

changeset 3950:1287a4b3e6c3

bitkeeper revision 1.1236.1.37 (42220839uiUo4mhX0fedaXFvOocS4Q)

Update error message when loading a "not Xen v3.0" image.
Signed-off-by: chris@xensource.com
author cl349@firebug.cl.cam.ac.uk
date Sun Feb 27 17:49:45 2005 +0000 (2005-02-27)
parents 279cb235be66
children 5c98a123eb05
files BitKeeper/etc/logging_ok tools/libxc/xc_linux_build.c xen/common/elf.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Sun Feb 27 13:49:07 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Sun Feb 27 17:49:45 2005 +0000
     1.3 @@ -15,6 +15,7 @@ br260@laudney.cl.cam.ac.uk
     1.4  bren@anvil.research
     1.5  bren@br260.wolfson.cam.ac.uk
     1.6  cl349@arcadians.cl.cam.ac.uk
     1.7 +cl349@firebug.cl.cam.ac.uk
     1.8  cl349@freefall.cl.cam.ac.uk
     1.9  cl349@labyrinth.cl.cam.ac.uk
    1.10  cwc22@centipede.cl.cam.ac.uk
     2.1 --- a/tools/libxc/xc_linux_build.c	Sun Feb 27 13:49:07 2005 +0000
     2.2 +++ b/tools/libxc/xc_linux_build.c	Sun Feb 27 17:49:45 2005 +0000
     2.3 @@ -540,7 +540,7 @@ static int parseelfimage(char *elfbase,
     2.4  
     2.5          if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     2.6          {
     2.7 -            ERROR("Will only load images built for Xen v2.0");
     2.8 +            ERROR("Will only load images built for Xen v3.0");
     2.9              ERROR("Actually saw: '%s'", guestinfo);
    2.10              return -EINVAL;
    2.11          }
     3.1 --- a/xen/common/elf.c	Sun Feb 27 13:49:07 2005 +0000
     3.2 +++ b/xen/common/elf.c	Sun Feb 27 17:49:45 2005 +0000
     3.3 @@ -78,7 +78,7 @@ int parseelfimage(char *elfbase,
     3.4  
     3.5          if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
     3.6          {
     3.7 -            printk("ERROR: Xen will only load images built for Xen v2.0\n");
     3.8 +            printk("ERROR: Xen will only load images built for Xen v3.0\n");
     3.9              return -EINVAL;
    3.10          }
    3.11