From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJOMP-00080U-DF for qemu-devel@nongnu.org; Tue, 10 Sep 2013 09:52:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJOMH-0003aV-E8 for qemu-devel@nongnu.org; Tue, 10 Sep 2013 09:52:05 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:43702 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJOMH-0003Yv-6Y for qemu-devel@nongnu.org; Tue, 10 Sep 2013 09:51:57 -0400 From: Peter Maydell Date: Tue, 10 Sep 2013 14:51:46 +0100 Message-Id: <1378821106-7563-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] device_tree.c: Terminate the empty reservemap in create_device_tree() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Alexander Graf , patches@linaro.org Device trees created with create_device_tree() may not have any entries in their reservemap, because the FDT API requires that the reservemap is completed before any FDT nodes are added, and create_device_tree() itself creates a node. However we were not calling fdt_finish_reservemap(), which meant that there was no terminator in the reservemap list and whatever happened to be at the start of the FDT data section would end up being interpreted as reservemap entries. Avoid this by calling fdt_finish_reservemap() to add the terminator. Signed-off-by: Peter Maydell --- On ARM this manifested as a DTB with /memreserve/ 0x0000000100000000 0x0000000200000009; and my mach-virt test kernel wasn't booting as a result. device_tree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device_tree.c b/device_tree.c index ffec99a..391da8c 100644 --- a/device_tree.c +++ b/device_tree.c @@ -41,6 +41,10 @@ void *create_device_tree(int *sizep) if (ret < 0) { goto fail; } + ret = fdt_finish_reservemap(fdt); + if (ret < 0) { + goto fail; + } ret = fdt_begin_node(fdt, ""); if (ret < 0) { goto fail; -- 1.7.9.5