From: Michael Young <m.a.young@durham.ac.uk>
Date: Mon, 15 Jan 2018 21:23:20 +0000 (+0000)
Subject: -xen-attach is needed for pvh boot with qemu-xen
X-Git-Tag: 4.8.3pre-shim-comet-2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a2a37877d7ded8f3723e1a4849efca901b409d01;p=xen.git

-xen-attach is needed for pvh boot with qemu-xen

Currently the boot of a pvh guest using the qemu-xen device model fails
with the error
xen emulation not implemented (yet)
in the qemu-dm log file. This patch adds the missing -xen-attach
argument.

V2: Use  b_info->type != LIBXL_DOMAIN_TYPE_HVM    instead of
 	(b_info->type == LIBXL_DOMAIN_TYPE_PV) ||
 	(b_info->type == LIBXL_DOMAIN_TYPE_PVH)
as recommended by Roger Pau Monné.

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
(cherry picked from commit 6f1979c8e4184f1f2b24b860e30d3b037b2e7f05)
---

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 5306623649..c8b033286e 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -991,7 +991,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,
      */
     flexarray_append(dm_args, "-no-user-config");
 
-    if (b_info->type == LIBXL_DOMAIN_TYPE_PV) {
+    if (b_info->type != LIBXL_DOMAIN_TYPE_HVM) {
         flexarray_append(dm_args, "-xen-attach");
     }