From patchwork Fri Jul 13 20:44:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 170958 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 501972C0315 for ; Sat, 14 Jul 2012 06:44:53 +1000 (EST) Received: from localhost ([::1]:48429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmjL-0004f3-FF for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 16:44:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Spmib-00037N-7V for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpmiZ-0001st-MZ for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpmiZ-0001se-EL for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6DKi2gn001542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 13 Jul 2012 16:44:02 -0400 Received: from localhost ([10.3.113.3]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6DKi1ir000667; Fri, 13 Jul 2012 16:44:02 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 13 Jul 2012 17:44:19 -0300 Message-Id: <1342212261-19903-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> References: <1342212261-19903-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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, armbru@redhat.com Subject: [Qemu-devel] [PATCH 6/8] machine: rename kvm_shadow_mem to kvm-shadow-mem 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. This commit does the change for the kvm_shadow_mem machine type option. The old option name is still supported through an option alias for backwards compatibility. Signed-off-by: Luiz Capitulino --- qemu-config.c | 3 ++- qemu-options.hx | 4 ++-- target-i386/kvm.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index 3fe91a8..909fae9 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -565,7 +565,8 @@ static QemuOptsList qemu_machine_opts = { .type = QEMU_OPT_BOOL, .help = "use KVM in-kernel irqchip", }, { - .name = "kvm_shadow_mem", + .name = "kvm-shadow-mem", + .alias= "kvm_shadow_mem", .type = QEMU_OPT_SIZE, .help = "KVM shadow MMU size", }, { diff --git a/qemu-options.hx b/qemu-options.hx index b149852..b95438f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -33,7 +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" - " kvm_shadow_mem=size of KVM shadow MMU\n", + " kvm-shadow-mem=size of KVM shadow MMU\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] @@ -48,7 +48,7 @@ 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 kvm_shadow_mem=size +@item kvm-shadow-mem=size Defines the size of the KVM shadow MMU. @end table ETEXI diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0d0d8f6..90bf4d4 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -698,7 +698,7 @@ int kvm_arch_init(KVMState *s) if (!QTAILQ_EMPTY(&list->head)) { shadow_mem = qemu_opt_get_size(QTAILQ_FIRST(&list->head), - "kvm_shadow_mem", -1); + "kvm-shadow-mem", -1); if (shadow_mem != -1) { shadow_mem /= 4096; ret = kvm_vm_ioctl(s, KVM_SET_NR_MMU_PAGES, shadow_mem);