From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmQvw-00061E-Eg for qemu-devel@nongnu.org; Mon, 19 May 2014 13:01:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmQvq-0003qr-6v for qemu-devel@nongnu.org; Mon, 19 May 2014 13:01:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmQvp-0003ql-Vo for qemu-devel@nongnu.org; Mon, 19 May 2014 13:00:58 -0400 From: "Dr. David Alan Gilbert (git)" Date: Mon, 19 May 2014 18:00:26 +0100 Message-Id: <1400518826-19144-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH] -machine vmport=off: Allow disabling of VMWare ioport emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rjones@redhat.com, armbru@redhat.com, aliguori@amazon.com, mst@redhat.com From: "Dr. David Alan Gilbert" 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 --- 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