Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx> Signed-off-by: Hu Tao <hutao@xxxxxxxxxxxxxx> --- hw/pc_piix.c | 9 ++++++++- qemu-options.hx | 3 ++- vl.c | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fed6ccf..507c98b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -44,6 +44,7 @@ #include "exec/memory.h" #include "exec/address-spaces.h" #include "cpu.h" +#include "qemu/config-file.h" #ifdef CONFIG_XEN # include <xen/hvm/hvm_info_table.h> #endif @@ -86,6 +87,8 @@ static void pc_init1(MemoryRegion *system_memory, MemoryRegion *pci_memory; MemoryRegion *rom_memory; void *fw_cfg = NULL; + QemuOptsList *list = qemu_find_opts("machine"); + bool enable_pv_event = false; pc_cpus_init(cpu_model); pc_acpi_init("acpi-dsdt.aml"); @@ -218,7 +221,11 @@ static void pc_init1(MemoryRegion *system_memory, pc_pci_device_init(pci_bus); } - if (kvm_enabled()) { + if (list && !QTAILQ_EMPTY(&list->head)) { + enable_pv_event = qemu_opt_get_bool(QTAILQ_FIRST(&list->head), + "enable_pv_event", false); + } + if (kvm_enabled() && enable_pv_event) { kvm_pv_event_init(isa_bus); } } diff --git a/qemu-options.hx b/qemu-options.hx index 4e2b499..7522f4a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -35,7 +35,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " kernel_irqchip=on|off controls accelerated irqchip support\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", + " mem-merge=on|off controls memory merge support (default: on)\n" + " enable_pv_event=on|off controls pv event support (default: off)\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] diff --git a/vl.c b/vl.c index 5aae03f..aa15b23 100644 --- a/vl.c +++ b/vl.c @@ -424,6 +424,10 @@ static QemuOptsList qemu_machine_opts = { .name = "usb", .type = QEMU_OPT_BOOL, .help = "Set on/off to enable/disable usb", + }, { + .name = "enable_pv_event", + .type = QEMU_OPT_BOOL, + .help = "handle pv event" }, { /* End of list */ } }, -- 1.8.0.1.240.ge8a1f5a -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html