net: Improve the warnings for dubious command line option combinations

[qemu.git] / device_tree.c

diff --git a/device_tree.c b/device_tree.c
index e213323dc2c10d72d6e1674cc5c5126c40b25c10..21be07075929a92af80c4a04fd94a22547aaaa22 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -22,6 +22,7 @@
 #include "qemu-common.h"
 #include "sysemu.h"
 #include "device_tree.h"
+#include "hw/loader.h"
 
 #include <libfdt.h>
 
@@ -29,7 +30,6 @@ void *load_device_tree(const char *filename_path, int *sizep)
 {
     int dt_size;
     int dt_file_load_size;
-    int new_dt_size;
     int ret;
     void *fdt = NULL;
 
@@ -74,7 +74,7 @@ fail:
 }
 
 int qemu_devtree_setprop(void *fdt, const char *node_path,
-                         const char *property, uint32_t *val_array, int size)
+                         const char *property, void *val_array, int size)
 {
     int offset;