diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-07-04 15:09:22 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-09 13:38:58 -0500 |
| commit | 2ff3de685a875ece3ee21256736c0a9dbf39dc4c (patch) | |
| tree | 4dc758ba80a89c26d47b93b2c5282e27cdacc443 /device_tree.c | |
| parent | 7bccd9402691e712305bc3b5cc6cf2fa1cc27631 (diff) | |
| download | qemu-2ff3de685a875ece3ee21256736c0a9dbf39dc4c.zip qemu-2ff3de685a875ece3ee21256736c0a9dbf39dc4c.tar.gz qemu-2ff3de685a875ece3ee21256736c0a9dbf39dc4c.tar.bz2 | |
Simplify -machine option queries with qemu_get_machine_opts()
The previous two commits fixed bugs in -machine option queries. I
can't find fault with the remaining queries, but let's use
qemu_get_machine_opts() everywhere, for consistency, simplicity and
robustness.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1372943363-24081-7-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'device_tree.c')
| -rw-r--r-- | device_tree.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/device_tree.c b/device_tree.c index 69be9da..0e7fe2d 100644 --- a/device_tree.c +++ b/device_tree.c @@ -21,6 +21,7 @@ #include "config.h" #include "qemu-common.h" #include "sysemu/device_tree.h" +#include "sysemu/sysemu.h" #include "hw/loader.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -239,14 +240,10 @@ uint32_t qemu_devtree_alloc_phandle(void *fdt) * which phandle id to start allocting phandles. */ if (!phandle) { - QemuOpts *machine_opts; - 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"); - if (phandle_start) { - phandle = strtoul(phandle_start, NULL, 0); - } + const char *phandle_start = qemu_opt_get(qemu_get_machine_opts(), + "phandle_start"); + if (phandle_start) { + phandle = strtoul(phandle_start, NULL, 0); } } @@ -307,15 +304,10 @@ int qemu_devtree_add_subnode(void *fdt, const char *name) void qemu_devtree_dumpdtb(void *fdt, int size) { - QemuOpts *machine_opts; - - machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); - if (machine_opts) { - const char *dumpdtb = qemu_opt_get(machine_opts, "dumpdtb"); - if (dumpdtb) { - /* Dump the dtb to a file and quit */ - exit(g_file_set_contents(dumpdtb, fdt, size, NULL) ? 0 : 1); - } - } + const char *dumpdtb = qemu_opt_get(qemu_get_machine_opts(), "dumpdtb"); + if (dumpdtb) { + /* Dump the dtb to a file and quit */ + exit(g_file_set_contents(dumpdtb, fdt, size, NULL) ? 0 : 1); + } } |