From patchwork Tue Jul 10 19:50:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 170268 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 571D32C007F for ; Wed, 11 Jul 2012 05:50:59 +1000 (EST) Received: from localhost ([::1]:46792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogSX-0003Qb-7O for incoming@patchwork.ozlabs.org; Tue, 10 Jul 2012 15:50:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogSB-0003Eh-Tt for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SogSA-0002A5-6U for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SogS9-00029q-Ts for qemu-devel@nongnu.org; Tue, 10 Jul 2012 15:50:34 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6AJoWJN029800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 10 Jul 2012 15:50:32 -0400 Received: from localhost (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6AJoUFZ007043; Tue, 10 Jul 2012 15:50:31 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 10 Jul 2012 16:50:30 -0300 Message-Id: <1341949831-13547-5-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.25 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 4/5] machine: rename phandle_start to phandle-start 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 phandle_start machine option. The underscore is still supported through an option alias for backwards compatibility. Signed-off-by: Luiz Capitulino --- device_tree.c | 2 +- qemu-config.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/device_tree.c b/device_tree.c index b366fdd..fe59768 100644 --- a/device_tree.c +++ b/device_tree.c @@ -213,7 +213,7 @@ uint32_t qemu_devtree_alloc_phandle(void *fdt) machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); if (machine_opts) { const char *phandle_start; - phandle_start = qemu_opt_get(machine_opts, "phandle_start"); + phandle_start = qemu_opt_get(machine_opts, "phandle-start"); if (phandle_start) { phandle = strtoul(phandle_start, NULL, 0); } diff --git a/qemu-config.c b/qemu-config.c index 909fae9..d888b5b 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -590,7 +590,8 @@ static QemuOptsList qemu_machine_opts = { .type = QEMU_OPT_STRING, .help = "Dump current dtb to a file and quit", }, { - .name = "phandle_start", + .name = "phandle-start", + .alias= "phandle_start", .type = QEMU_OPT_STRING, .help = "The first phandle ID we may generate dynamically", }, {