From: Roger Pau Monne Date: Fri, 23 Mar 2018 10:57:56 +0000 (+0000) Subject: x86/libxc: fix usage of XEN_X86_EMU_ALL after VPCI addition X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~322 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eabb83121226d5a6a5a68da3a913ac0b5bb1e0cf;p=xen.git 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é Acked-by: Wei Liu --- diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index ea3df1ef31..26b4b908b9 100644 --- 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;