From d1048bef9df0aacde9a54bf9b5b97a6e10950d8c Mon Sep 17 00:00:00 2001 From: Don Slutz Date: Fri, 21 Nov 2014 11:18:52 -0500 Subject: -machine vmport=auto: Fix handling of VMWare ioport emulation for xen c/s 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4 or c/s b154537ad07598377ebf98252fb7d2aff127983b moved the testing of xen_enabled() from pc_init1() to pc_machine_initfn(). xen_enabled() does not return the correct value in pc_machine_initfn(). Changed vmport from a bool to an enum. Added the value "auto" to do the old way. Move check of xen_enabled() back to pc_init1(). Acked-by: Eric Blake Reviewed-by: Eduardo Habkost Signed-off-by: Don Slutz Signed-off-by: Paolo Bonzini --- include/hw/i386/pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9d85b89e4f..69d9cf8e67 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -39,7 +39,7 @@ struct PCMachineState { ISADevice *rtc; uint64_t max_ram_below_4g; - bool vmport; + OnOffAuto vmport; bool enforce_aligned_dimm; }; -- cgit v1.2.3-55-g7522