From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
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
Date: Tue, 10 Jul 2012 16:50:30 -0300 [thread overview]
Message-ID: <1341949831-13547-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1341949831-13547-1-git-send-email-lcapitulino@redhat.com>
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(-)
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
next prev parent reply other threads:[~2012-07-10 19:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 19:50 [Qemu-devel] [PATCH 0/5]: rename machine options to use dashes Luiz Capitulino
2012-07-10 19:50 ` [Qemu-devel] [PATCH 1/5] qemu-option: add alias support Luiz Capitulino
2012-07-11 7:00 ` Markus Armbruster
2012-07-11 12:51 ` Luiz Capitulino
2012-07-10 19:50 ` [Qemu-devel] [PATCH 2/5] machine: rename kernel_irqchip to kernel-irqchip Luiz Capitulino
2012-07-10 19:50 ` [Qemu-devel] [PATCH 3/5] machine: rename kvm_shadow_mem to kvm-shadow-mem Luiz Capitulino
2012-07-10 19:50 ` Luiz Capitulino [this message]
2012-07-10 19:50 ` [Qemu-devel] [PATCH 5/5] machine: rename dt_compatible to dt-compatible Luiz Capitulino
2012-07-11 7:08 ` [Qemu-devel] [PATCH 0/5]: rename machine options to use dashes Markus Armbruster
2012-07-11 7:38 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341949831-13547-5-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=afaerber@suse.de \
--cc=aliguori@us.ibm.com \
--cc=jan.kiszka@siemens.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).