Ian Campbell
2012-May-25 09:24 UTC
[PATCH] libxc: do not "panic" if a kernel is not a bzImage
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1337937866 -3600
# Node ID 42b4ca522057ecf3bf48250bf964d12e1a9e865c
# Parent b68bb5eb0503bcec053de4422212a33fa6be9698
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>
diff -r b68bb5eb0503 -r 42b4ca522057 tools/libxc/xc_dom_bzimageloader.c
--- a/tools/libxc/xc_dom_bzimageloader.c Fri May 25 10:19:45 2012 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c Fri May 25 10:24:26 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;
}
Ian Jackson
2012-May-25 10:57 UTC
Re: [PATCH] libxc: do not "panic" if a kernel is not a bzImage
Ian Campbell writes ("[PATCH] libxc: do not "panic" if a kernel
is not a bzImage"):> 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>
Ian Campbell
2012-Jun-06 13:21 UTC
[PATCH] libxc: do not "panic" if a kernel is not a bzImage
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1338988345 -3600
# Node ID beca28fe812ffd3c8e50aa5fc6ba89c6b706d5e2
# Parent 04b4bfaaed2f8fc5fb80068dfe2c00305200491d
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>
diff -r 04b4bfaaed2f -r beca28fe812f tools/libxc/xc_dom_bzimageloader.c
--- a/tools/libxc/xc_dom_bzimageloader.c Wed Jun 06 14:12:12 2012 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c Wed Jun 06 14:12:25 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;
}
Ian Jackson
2012-Jun-06 13:59 UTC
Re: [PATCH] libxc: do not "panic" if a kernel is not a bzImage
Ian Campbell writes ("[PATCH] libxc: do not "panic" if a kernel
is not a bzImage"):> 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>
Ian Jackson
2012-Jun-08 15:16 UTC
Re: [PATCH] libxc: do not "panic" if a kernel is not a bzImage [and 2 more messages]
Ian Jackson writes ("Re: [Xen-devel] [PATCH] libxc: do not
"panic" if a kernel is not a bzImage"):> Ian Campbell writes ("[PATCH] libxc: do not "panic" if a
kernel is not a bzImage"):
> > 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>
Ian Campbell writes ("[Xen-devel] [PATCH] libxc: do not "panic"
if a kernel is not a bzImage"):> 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>
>
> diff -r 04b4bfaaed2f -r beca28fe812f tools/libxc/xc_dom_bzimageloader.c
Ian Jackson writes ("Re: [Xen-devel] [PATCH] libxc: do not
"panic" if a kernel is not a bzImage"):> Ian Campbell writes ("[PATCH] libxc: do not "panic" if a
kernel is not a bzImage"):
> > 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>