summary refs log tree commit diff stats
path: root/device_tree.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-07-04 15:09:23 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-09 13:38:58 -0500
commitc1b71b0c03df575c72ea413b2f2c27a7a477c05a (patch)
treebcb7e550f85283e0feaffc8e95df4e51fe3e3998 /device_tree.c
parent2ff3de685a875ece3ee21256736c0a9dbf39dc4c (diff)
downloadfocaccia-qemu-c1b71b0c03df575c72ea413b2f2c27a7a477c05a.tar.gz
focaccia-qemu-c1b71b0c03df575c72ea413b2f2c27a7a477c05a.zip
vl: Tighten parsing of -machine option phandle_start
Make it QEMU_OPT_NUMBER, so it gets parsed by generic code, which
actually bothers to check for errors, rather than its user, which
doesn't.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Message-id: 1372943363-24081-8-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.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/device_tree.c b/device_tree.c
index 0e7fe2dda6..10cf3d0b60 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -240,11 +240,8 @@ uint32_t qemu_devtree_alloc_phandle(void *fdt)
      * which phandle id to start allocting phandles.
      */
     if (!phandle) {
-        const char *phandle_start = qemu_opt_get(qemu_get_machine_opts(),
-                                                 "phandle_start");
-        if (phandle_start) {
-            phandle = strtoul(phandle_start, NULL, 0);
-        }
+        phandle = qemu_opt_get_number(qemu_get_machine_opts(),
+                                      "phandle_start", 0);
     }
 
     if (!phandle) {