From: Joao Martins <joao.m.martins@oracle.com>
Date: Fri, 18 Jan 2019 19:38:16 +0000 (-0500)
Subject: pc_piix: allow xenfv machine with XEN_EMULATE
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fb105f4535c840709fd1adb5d375e5a15dc778e2;p=users%2Fdwmw2%2Fqemu.git

pc_piix: allow xenfv machine with XEN_EMULATE

This allows -machine xenfv to work with Xen emulated guests.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 43cca0a762..9240c79d03 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -399,8 +399,8 @@ static void pc_xen_hvm_init(MachineState *machine)
 {
     PCMachineState *pcms = PC_MACHINE(machine);
 
-    if (!xen_enabled()) {
-        error_report("xenfv machine requires the xen accelerator");
+    if (!xen_enabled() && (xen_mode != XEN_EMULATE)) {
+        error_report("xenfv machine requires the xen or kvm accelerator");
         exit(1);
     }