x86/libxc: fix usage of XEN_X86_EMU_ALL after VPCI addition

HVM guest should be created with (XEN_X86_EMU_ALL &
~XEN_X86_EMU_VPCI). This is not an issue for xl/libxl because it
already sets the correct emulation flags and doesn't pass a NULL
xc_domain_configuration_t to xc_domain_create.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index ea3df1ef316572b2846ffe1fb365700e0b593801..26b4b908b937a7339dd0f605e25e90a11ca573e2 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -40,7 +40,7 @@ int xc_domain_create(xc_interface *xch, uint32_t ssidref,
 
 #if defined (__i386) || defined(__x86_64__)
         if ( flags & XEN_DOMCTL_CDF_hvm_guest )
-            lconfig.emulation_flags = XEN_X86_EMU_ALL;
+            lconfig.emulation_flags = (XEN_X86_EMU_ALL & ~XEN_X86_EMU_VPCI);
 #elif defined (__arm__) || defined(__aarch64__)
         lconfig.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE;
         lconfig.nr_spis = 0;