Patchwork [4/5] machine: rename phandle_start to phandle-start

login
register
mail settings
Submitter Luiz Capitulino
Date July 10, 2012, 7:50 p.m.
Message ID <1341949831-13547-5-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/170268/
State New
Headers show

Comments

Luiz Capitulino - July 10, 2012, 7:50 p.m.
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 <lcapitulino@redhat.com>
---
 device_tree.c | 2 +-
 qemu-config.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

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",
         }, {