diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-01-29 11:28:09 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-01-29 11:28:09 +0000 |
| commit | 6fd8a628cfe4f9249031f8c920d9963ae79db274 (patch) | |
| tree | b18ab51ee2444e43e94bc996860c5ef45c5278fa /xen/arch/x86/bzimage.c | |
| parent | dc064d77d87d3024da2dab804e9b63871916ae3d (diff) | |
| download | xen-6fd8a628cfe4f9249031f8c920d9963ae79db274.tar.gz xen-6fd8a628cfe4f9249031f8c920d9963ae79db274.tar.bz2 xen-6fd8a628cfe4f9249031f8c920d9963ae79db274.zip | |
x86: Although bzimage_headroom() doesn't return -ve values,
bzimage_parse() can.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/bzimage.c')
| -rw-r--r-- | xen/arch/x86/bzimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index f432c9e115..37bc78eec2 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -185,7 +185,7 @@ static __init int bzimage_check(struct setup_header *hdr, unsigned long len) 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_start, unsigned long image_length) 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; |