[Xen-devel] [PATCH] libxl: adjust hvm direct boot code

[Wei Liu <wei.liu2@xxxxxxxxxx>]

The -initrd and -append parameters should only be supplied to QEMU iff
-kernel parameter is present, because that's how QEMU works.

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


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