Merge remote-tracking branch 'spice/spice.v39' into staging

[qemu.git] / device_tree.c

diff --git a/device_tree.c b/device_tree.c
index cc916064357f45005cc7bef5c4f16be3cd9939de..f5d5eb1bca5ecdd5cba9c34935d8901a2d627e1a 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -20,8 +20,8 @@
 
 #include "config.h"
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "device_tree.h"
+#include "hw/loader.h"
 
 #include <libfdt.h>
 
@@ -73,7 +73,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;