Patchwork [5/5] machine: rename dt_compatible to dt-compatible

login
register
mail settings
Submitter Luiz Capitulino
Date July 10, 2012, 7:50 p.m.
Message ID <1341949831-13547-6-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/170278/
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 dt_compatible machine option.

The underscore is still supported through an option alias for backwards
compatibility.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hw/ppce500_mpc8544ds.c | 2 +-
 qemu-config.c          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 8b9fd83..7b98011 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -148,7 +148,7 @@  static int mpc8544_load_device_tree(CPUPPCState *env,
         const char *tmp;
         dumpdtb = qemu_opt_get(machine_opts, "dumpdtb");
         dtb_file = qemu_opt_get(machine_opts, "dtb");
-        tmp = qemu_opt_get(machine_opts, "dt_compatible");
+        tmp = qemu_opt_get(machine_opts, "dt-compatible");
         if (tmp) {
             compatible = tmp;
             compatible_len = strlen(compatible) + 1;
diff --git a/qemu-config.c b/qemu-config.c
index d888b5b..9dac3be 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -595,7 +595,8 @@  static QemuOptsList qemu_machine_opts = {
             .type = QEMU_OPT_STRING,
             .help = "The first phandle ID we may generate dynamically",
         }, {
-            .name = "dt_compatible",
+            .name = "dt-compatible",
+            .alias= "dt_compatible",
             .type = QEMU_OPT_STRING,
             .help = "Overrides the \"compatible\" property of the dt root node",
         },