From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH] libxl: adjust hvm direct boot code
Date: Thu, 15 Jan 2015 13:50:27 +0000
Message-ID: <1421329827.5437.12.camel@citrix.com>
References: <1421324991-5146-1-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1421324991-5146-1-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Chunyan Liu <cyliu@suse.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

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?

> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Chunyan Liu <cyliu@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 )