diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2012-06-08 16:05:38 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2012-06-08 16:05:38 +0100 |
commit | 1dedb82654ef936f189813e5002af825d81e9b1c (patch) | |
tree | 8c21077de829682c3156506282976b438e4bbdac /tools/libxc | |
parent | 003668e25968a957b193e5cec1946ad1a1122fb1 (diff) | |
download | xen-1dedb82654ef936f189813e5002af825d81e9b1c.tar.gz xen-1dedb82654ef936f189813e5002af825d81e9b1c.tar.bz2 xen-1dedb82654ef936f189813e5002af825d81e9b1c.zip |
libxc: do not "panic" if a kernel is not a bzImage.
Up until the point where we think this is a bzImage there is no point in
printing panicy messages -- some other loader will have a go (probably the
compressed ELF one)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxc')
-rw-r--r-- | tools/libxc/xc_dom_bzimageloader.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 4954768a0d..113d40ff2f 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -575,8 +575,7 @@ static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) if ( dom->kernel_size < sizeof(struct setup_header) ) { - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: kernel image too small", __FUNCTION__); + xc_dom_printf(dom->xch, "%s: kernel image too small", __FUNCTION__); return -EINVAL; } @@ -584,8 +583,7 @@ static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 ) { - xc_dom_panic(dom->xch, XC_INVALID_KERNEL, - "%s: kernel is not a bzImage", __FUNCTION__); + xc_dom_printf(dom->xch, "%s: kernel is not a bzImage", __FUNCTION__); return -EINVAL; } |