vhost-user-test: use tmpfs by default

[mirror_qemu.git] / device_tree.c

diff --git a/device_tree.c b/device_tree.c
index 4cb1cd50aac882f889139a5ebe1946ab690f4c18..a9f5f8e598d334f796fe250742e967b6f9b34424 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -18,13 +18,12 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "config.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"
-#include "qemu/option.h"
+#include "hw/boards.h"
 #include "qemu/config-file.h"
 
 #include <libfdt.h>
@@ -242,11 +241,10 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt)
 
     /*
      * We need to find out if the user gave us special instruction at
-     * which phandle id to start allocting phandles.
+     * which phandle id to start allocating phandles.
      */
     if (!phandle) {
-        phandle = qemu_opt_get_number(qemu_get_machine_opts(),
-                                      "phandle_start", 0);
+        phandle = machine_phandle_start(current_machine);
     }
 
     if (!phandle) {