From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] libxl: check HVM direct boot parameters Date: Mon, 19 Jan 2015 15:37:43 +0000 Message-ID: <1421681863.10440.114.camel@citrix.com> References: <1421334702-5776-1-git-send-email-wei.liu2@citrix.com> <20150115160140.GC3945@zion.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150115160140.GC3945@zion.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: Stefano Stabellini , Ian Jackson , Chunyan Liu , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Thu, 2015-01-15 at 16:01 +0000, Wei Liu wrote: > On Thu, Jan 15, 2015 at 03:11:42PM +0000, Wei Liu wrote: > > We should honour -initrd and -append iff -kernel is specified, because > > that's how QEMU works. > > > > Check direct boot parameters in libxl__domain_build_info_setdefault. > > Return failure if kernel is missing while ramdisk (-initrd) and / or > > cmdline (-append) is present. > > > > Signed-off-by: Wei Liu > > Cc: Ian Campbell > > Cc: Ian Jackson > > Cc: Stefano Stabellini > > Cc: Chunyan Liu > > --- > > tools/libxl/libxl_create.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c > > index 1198225..31f681e 100644 > > --- a/tools/libxl/libxl_create.c > > +++ b/tools/libxl/libxl_create.c > > @@ -170,6 +170,15 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, > > break; > > default:abort(); > > } > > + > > + /* Check HVM direct boot parameters, we should honour ->ramdisk and > > + * ->cmdline iff ->kernel is set. > > + */ > > + if (!b_info->kernel && (b_info->ramdisk || b_info->cmdline)) { > > + LIBXL__LOG(CTX, XLT_ERROR, > > + "direct boot parameters specified but kernel is missing"); > > Hmm... There's a formatting error. I can resend if it's necessary. In trying to correctly indent this line while committing I pushed it over 80-columns, rather than my rewrapping more, could you make this use the LOG helper please, and thereby pull everything in a bit? With that done: Acked-by: Ian Campbell Ian.