Re: [Xen-devel] Test result of xen-unstable changeset 25259

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

> > About pv-grub I think it fails with:
> > ... (from xl create...)
> > xc: error: panic: xc_dom_bzimageloader.c:588: xc_dom_probe_bzimage_kernel:
> > kernel is not a bzImage: Invalid kernel
> > ...
> > And after seems start as hvm domU but is not working and I must destroy it.
> 
> I think this is just a warning (which needs to be toned down), since the
> pvgrub kernel isn't a bzImage, it's a simple elf file.

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1336485612 -3600
# Node ID 8aba3396a61a2224b7cb36046ce06bad053e956b
# Parent  2fe12fc7bf1f863487920e06589641904b3d9466
libxc: do not "panic" if a kernel is not a bzImage.

Up untul 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@xxxxxxxxxx>

diff -r 2fe12fc7bf1f -r 8aba3396a61a tools/libxc/xc_dom_bzimageloader.c
--- a/tools/libxc/xc_dom_bzimageloader.c        Tue May 08 14:25:27 2012 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c        Tue May 08 15:00:12 2012 +0100
@@ -575,8 +575,7 @@ static int xc_dom_probe_bzimage_kernel(s
 
     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(s
 
     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;
     }
 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel