From patchwork Wed Dec 12 06:13:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 205438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1AC8F2C00E7 for ; Wed, 12 Dec 2012 17:15:13 +1100 (EST) Received: from localhost ([::1]:55031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tifb5-0007SB-4g for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 01:15:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tifa5-0005YF-3d for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tifa1-0004Cz-Q6 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:09 -0500 Received: from [222.73.24.84] (port=27930 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tifa1-0004By-FG for qemu-devel@nongnu.org; Wed, 12 Dec 2012 01:14:05 -0500 X-IronPort-AV: E=Sophos;i="4.84,264,1355068800"; d="scan'208";a="6380978" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 12 Dec 2012 14:12:05 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qBC6FxCO016242; Wed, 12 Dec 2012 14:16:00 +0800 Received: from localhost.localdomain ([10.167.225.29]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012121214130558-369285 ; Wed, 12 Dec 2012 14:13:05 +0800 From: Hu Tao To: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti , Sasha Levin , Luiz Capitulino Date: Wed, 12 Dec 2012 14:13:50 +0800 Message-Id: <214177b6e6e6734269dd1fd50a710d68ce8b37e1.1355290850.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0.1.240.ge8a1f5a In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/12 14:13:05, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/12 14:13:07, Serialize complete at 2012/12/12 14:13:07 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH v12 7/8] allower the user to disable pv event support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Wen Congyang Signed-off-by: Hu Tao --- hw/pc_piix.c | 8 +++++++- qemu-config.c | 4 ++++ qemu-options.hx | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 8380702..bf31b96 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -150,6 +150,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); @@ -288,7 +290,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-config.c b/qemu-config.c index 10d1ba4..6682276 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -627,6 +627,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 */ } }, diff --git a/qemu-options.hx b/qemu-options.hx index dd86bfe..44c7760 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}[,...]]