From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Spmic-00039t-7Y for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Spmib-0001tM-8U for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54893) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Spmib-0001tB-0T for qemu-devel@nongnu.org; Fri, 13 Jul 2012 16:44:05 -0400 From: Luiz Capitulino Date: Fri, 13 Jul 2012 17:44:20 -0300 Message-Id: <1342212261-19903-8-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> Subject: [Qemu-devel] [PATCH 7/8] machine: rename phandle_start to phandle-start List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, afaerber@suse.de, armbru@redhat.com QOM conversion wants option names with dashes. This commit does the change for the phandle_start machine type option. The old option name 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", }, { -- 1.7.11.1.116.g8228a23