[PATCH] Properly control platform device creation in upstream QEMU

[Paul Durrant <paul.durrant@citrix.com>]

The xen_platform_pci xl configuration parameter currently has no effect on
upstream QEMU; creation of the platform device is hardcoded.
I have created a patch to QEMU to remove this hardcoded creation. This patch
specifies the appropriate -device argument on the QEMU command line (and
hence creates the device) only when xen_platform_pci is true.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
 tools/libxl/libxl_dm.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index ac1f90e..ce4ad99 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -383,6 +383,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
         flexarray_append(dm_args, "-xen-attach");
     }
 
+    if (b_info->type == LIBXL_DOMAIN_TYPE_HVM &&
+        libxl_defbool_val(b_info->u.hvm.xen_platform_pci)) {
+        flexarray_append(dm_args, "-device");
+        flexarray_append(dm_args, "xen-platform");
+    }
+
     if (c_info->name) {
         flexarray_vappend(dm_args, "-name", c_info->name, NULL);
     }
-- 
1.7.10.4