From patchwork Thu Oct 25 03:42:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 194036 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 A171B2C009B for ; Thu, 25 Oct 2012 15:17:47 +1100 (EST) Received: from localhost ([::1]:51303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TREt7-0005eo-Q0 for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 00:17:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TREsT-0004Bj-En for qemu-devel@nongnu.org; Thu, 25 Oct 2012 00:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TREsS-0003R8-51 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 00:17:05 -0400 Received: from [222.73.24.84] (port=2671 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TREsR-0003PZ-NX for qemu-devel@nongnu.org; Thu, 25 Oct 2012 00:17:04 -0400 X-IronPort-AV: E=Sophos;i="4.80,645,1344182400"; d="scan'208";a="6064363" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 25 Oct 2012 11:41:04 +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 q9P3gWQl002398; Thu, 25 Oct 2012 11:42:35 +0800 Received: from localhost.localdomain ([10.167.225.29]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012102511415982-744277 ; Thu, 25 Oct 2012 11:41:59 +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: Thu, 25 Oct 2012 11:42:38 +0800 Message-Id: <1351136563-15073-6-git-send-email-hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.2 In-Reply-To: <0a2274eccf1b1dd420f16359f7e1de74fa2f9fbe.1351131144.git.hutao@cn.fujitsu.com> References: <0a2274eccf1b1dd420f16359f7e1de74fa2f9fbe.1351131144.git.hutao@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/25 11:42:00, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/25 11:42:02, Serialize complete at 2012/10/25 11:42:02 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 v11 6/6] 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 From: Wen Congyang Signed-off-by: Wen Congyang --- hw/pc_piix.c | 6 +++++- qemu-config.c | 4 ++++ qemu-options.hx | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fb67dc1..864d356 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -149,6 +149,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; pc_cpus_init(cpu_model); @@ -287,7 +289,9 @@ static void pc_init1(MemoryRegion *system_memory, pc_pci_device_init(pci_bus); } - if (kvm_enabled()) { + 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 cd1ec21..db8f828 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -619,6 +619,10 @@ static QemuOptsList qemu_machine_opts = { .name = "mem-merge", .type = QEMU_OPT_BOOL, .help = "enable/disable memory merge support", + }, { + .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 46f0539..de667d6 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\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]]