diff options
| author | Don Slutz <dslutz@verizon.com> | 2014-11-21 11:18:52 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-11-26 12:11:27 +0100 |
| commit | d1048bef9df0aacde9a54bf9b5b97a6e10950d8c (patch) | |
| tree | f7028b9b852ae94b7c949907541335a2233ef65f /include | |
| parent | 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80 (diff) | |
| download | qemu-d1048bef9df0aacde9a54bf9b5b97a6e10950d8c.tar.gz | |
-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 <eblake@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Don Slutz <dslutz@verizon.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; }; |