From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
VMWare apparently doesn't like running under QEMU due to our
incomplete emulation of it's special IO Port. This adds a
-machine suboption to allow it to be turned off.
Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
---
hw/i386/pc_piix.c | 5 +++--
hw/i386/pc_q35.c | 5 ++++-
qemu-options.hx | 3 +++
vl.c | 4 ++++
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index eaf3e61..418f95a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -204,8 +204,9 @@ static void pc_init1(QEMUMachineInitArgs *args,
pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled(),
- 0x4);
+ pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,
+ !qemu_opt_get_bool(qemu_get_machine_opts(), "vmport",
+ true) || xen_enabled(), 0x4);
pc_nic_init(isa_bus, pci_bus);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 9517ec6..c868af1 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -206,7 +206,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
pc_register_ferr_irq(gsi[13]);
/* init basic PC hardware */
- pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false, 0xff0104);
+ pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,
+ !qemu_opt_get_bool(qemu_get_machine_opts(), "vmport",
+ true),
+ 0xff0104);
/* connect pm stuff to lpc */
ich9_lpc_pm_init(lpc);
diff --git a/qemu-options.hx b/qemu-options.hx
index 781af14..54e8f94 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -33,6 +33,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" property accel=accel1[:accel2[:...]] selects
accelerator\n"
" supported accelerators are kvm, xen, tcg (default: tcg)\n"
" kernel_irqchip=on|off controls accelerated irqchip
support\n"
+ " vmport=on|off controls emulation of vmport (default:
on)\n"
" kvm_shadow_mem=size of KVM shadow MMU\n"
" dump-guest-core=on|off include guest memory in a core
dump (default=on)\n"
" mem-merge=on|off controls memory merge support (default:
on)\n",
@@ -50,6 +51,8 @@ than one accelerator specified, the next one is used if the
previous one fails
to initialize.
@item kernel_irqchip=on|off
Enables in-kernel irqchip support for the chosen accelerator when available.
+@item vmport=on|off
+Enables emulation of VMWare IO port, for vmmouse etc. (enabled by default)
@item kvm_shadow_mem=size
Defines the size of the KVM shadow MMU.
@item dump-guest-core=on|off
diff --git a/vl.c b/vl.c
index 99b6fc0..eb26c77 100644
--- a/vl.c
+++ b/vl.c
@@ -331,6 +331,10 @@ static QemuOptsList qemu_machine_opts = {
.type = QEMU_OPT_BOOL,
.help = "use KVM in-kernel irqchip",
}, {
+ .name = "vmport",
+ .type = QEMU_OPT_BOOL,
+ .help = "Enable vmport",
+ }, {
.name = "kvm_shadow_mem",
.type = QEMU_OPT_SIZE,
.help = "KVM shadow MMU size",
--
1.9.0
