]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
pc_piix: allow xenfv machine with XEN_EMULATE
authorJoao Martins <joao.m.martins@oracle.com>
Fri, 18 Jan 2019 19:38:16 +0000 (14:38 -0500)
committerJoao Martins <joao.m.martins@oracle.com>
Tue, 19 Feb 2019 14:00:57 +0000 (09:00 -0500)
This allows -machine xenfv to work with Xen emulated guests.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
hw/i386/pc_piix.c

index 43cca0a76221a6629263dbf114b9a475934b9f0b..9240c79d036305d2e7127bb072fb73cf45be705b 100644 (file)
@@ -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);
     }