linux-user: move tilegx signal.c parts to tilegx directory

[qemu.git] / device_tree.c

diff --git a/device_tree.c b/device_tree.c
index ccba1fd4a4a15f7e729d795e222a576d3283c696..52c3358a55838d3388708e0b9a6fd8089c8efeb3 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -18,8 +18,9 @@
 #endif
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/option.h"
+#include "qemu/bswap.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"
@@ -28,7 +29,7 @@
 
 #include <libfdt.h>
 
-#define FDT_MAX_SIZE  0x10000
+#define FDT_MAX_SIZE  0x100000
 
 void *create_device_tree(int *sizep)
 {
@@ -147,6 +148,7 @@ static void read_fstree(void *fdt, const char *dirname)
     d = opendir(dirname);
     if (!d) {
         error_setg(&error_fatal, "%s cannot open %s", __func__, dirname);
+        return;
     }
 
     while ((de = readdir(d)) != NULL) {