>>> On 1/15/2015 at 10:51 PM, in message
<20150115145156.ga3...@zion.uk.xensource.com>, Wei Liu <wei.l...@citrix.com>
wrote:
> On Thu, Jan 15, 2015 at 01:50:27PM +0000, Ian Campbell wrote:
> > On Thu, 2015-01-15 at 12:29 +0000, Wei Liu wrote:
> > > The -initrd and -append parameters should only be supplied to QEMU iff
> > > -kernel parameter is present, because that's how QEMU works.
> >
> > What do you think of catching this e.g. in the setdefault function and
> > warning or erroring in this case?
> >
>
> I'm OK with that. Explicitly warning or erroring is more sensible than
> silently dropping those values.
Thanks Wei. With the check, can report error to users earlier.
>
> Wei.
>
> > > Signed-off-by: Wei Liu <wei.l...@citrix.com>
> > > Cc: Ian Campbell <ian.campb...@citrix.com>
> > > Cc: Ian Jackson <ian.jack...@eu.citrix.com>
> > > Cc: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
> > > Cc: Chunyan Liu <cy...@suse.com>
> > > ---
> > > tools/libxl/libxl_dm.c | 11 ++++++-----
> > > 1 file changed, 6 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
> > > index c2b0487..7226f5d 100644
> > > --- a/tools/libxl/libxl_dm.c
> > > +++ b/tools/libxl/libxl_dm.c
> > > @@ -527,14 +527,15 @@ static char **
> libxl__build_device_model_args_new(libxl__gc *gc,
> > > if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
> > > int ioemu_nics = 0;
> > >
> > > - if (b_info->kernel)
> > > + if (b_info->kernel) {
> > > flexarray_vappend(dm_args, "-kernel", b_info->kernel, NULL);
> > >
> > > - if (b_info->ramdisk)
> > > - flexarray_vappend(dm_args, "-initrd", b_info->ramdisk,
> > > NULL);
> > > + if (b_info->ramdisk)
> > > + flexarray_vappend(dm_args, "-initrd", b_info->ramdisk,
> NULL);
> > >
> > > - if (b_info->cmdline)
> > > - flexarray_vappend(dm_args, "-append", b_info->cmdline,
> > > NULL);
> > > + if (b_info->cmdline)
> > > + flexarray_vappend(dm_args, "-append", b_info->cmdline,
> NULL);
> > > + }
> > >
> > > if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) {
> > > if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list )
> >
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
