From patchwork Tue Jul 10 19:50:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 170267 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 62A042C01B4 for ; Wed, 11 Jul 2012 05:50:56 +1000 (EST) Received: from localhost ([::1]:46648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogSU-0003Le-95 for incoming@patchwork.ozlabs.org; Tue, 10 Jul 2012 15:50:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogS5-0002vW-JV for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SogS3-00021C-Hv for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogS3-0001zG-8s for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:27 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6AJoPBt029747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 10 Jul 2012 15:50:25 -0400 Received: from localhost (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6AJoNSH001898; Tue, 10 Jul 2012 15:50:24 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 10 Jul 2012 16:50:28 -0300 Message-Id: <1341949831-13547-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1341949831-13547-1-git-send-email-lcapitulino@redhat.com> References: <1341949831-13547-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 2/5] machine: rename kernel_irqchip to kernel-irqchip 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 QOM conversion wants option names with dashes (instead of underscores), this commit does the change for the kernel_irqchip machine option. The underscore is still supported through an option alias for backwards compatibility. Signed-off-by: Luiz Capitulino --- kvm-all.c | 2 +- qemu-config.c | 3 ++- qemu-options.hx | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index f8e4328..c988bb6 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1168,7 +1168,7 @@ static int kvm_irqchip_create(KVMState *s) if (QTAILQ_EMPTY(&list->head) || !qemu_opt_get_bool(QTAILQ_FIRST(&list->head), - "kernel_irqchip", true) || + "kernel-irqchip", true) || !kvm_check_extension(s, KVM_CAP_IRQCHIP)) { return 0; } diff --git a/qemu-config.c b/qemu-config.c index 5c3296b..3fe91a8 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -560,7 +560,8 @@ static QemuOptsList qemu_machine_opts = { .type = QEMU_OPT_STRING, .help = "accelerator list", }, { - .name = "kernel_irqchip", + .name = "kernel-irqchip", + .alias= "kernel_irqchip", .type = QEMU_OPT_BOOL, .help = "use KVM in-kernel irqchip", }, { diff --git a/qemu-options.hx b/qemu-options.hx index ecf7ca1..b149852 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -32,7 +32,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " selects emulated machine (-machine ? for list)\n" " 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" + " kernel-irqchip=on|off controls accelerated irqchip support\n" " kvm_shadow_mem=size of KVM shadow MMU\n", QEMU_ARCH_ALL) STEXI @@ -46,7 +46,7 @@ This is used to enable an accelerator. Depending on the target architecture, kvm, xen, or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. -@item kernel_irqchip=on|off +@item kernel-irqchip=on|off Enables in-kernel irqchip support for the chosen accelerator when available. @item kvm_shadow_mem=size Defines the size of the KVM shadow MMU.