[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] machine: rename phandle_start to phandle-start
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 7/8] machine: rename phandle_start to phandle-start |
Date: |
Fri, 13 Jul 2012 17:44:20 -0300 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/8]: rename machine options to use dashes, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 1/8] qemu-option: qemu_opt_set_bool(): fix code duplication, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 2/8] qemu-option: opt_set(): split it up into more functions, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 3/8] qemu-option: qemu_opts_validate(): fix duplicated code, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 4/8] qemu-option: add alias support, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 5/8] machine: rename kernel_irqchip to kernel-irqchip, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 6/8] machine: rename kvm_shadow_mem to kvm-shadow-mem, Luiz Capitulino, 2012/07/13
- [Qemu-devel] [PATCH 7/8] machine: rename phandle_start to phandle-start,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 8/8] machine: rename dt_compatible to dt-compatible, Luiz Capitulino, 2012/07/13