[Xen-changelog] [xen-unstable] x86: Although bzimage_headroom() doesn't return -ve values,

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1233228489 0
# Node ID a8c342f352c385cd42c4f22fdbb90860c4c6802f
# Parent  1bd06ed9369d5ebc196f893661921948d9965211
x86: Although bzimage_headroom() doesn't return -ve values,
bzimage_parse() can.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/bzimage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 1bd06ed9369d -r a8c342f352c3 xen/arch/x86/bzimage.c
--- a/xen/arch/x86/bzimage.c    Thu Jan 29 01:16:30 2009 +0000
+++ b/xen/arch/x86/bzimage.c    Thu Jan 29 11:28:09 2009 +0000
@@ -185,7 +185,7 @@ static __init int bzimage_check(struct s
     if ( hdr->version < VERSION(2,8) ) {
         printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n",
            hdr->version >> 8, hdr->version & 0xff);
-        return 0;
+        return -EINVAL;
     }
     return 1;
 }
@@ -198,7 +198,7 @@ int __init bzimage_headroom(char *image_
 
     err = bzimage_check(hdr, image_length);
     if (err < 1)
-        return err;
+        return 0;
 
     img = image_start + (hdr->setup_sects+1) * 512;
     img += hdr->payload_offset;

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