From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc3a8-0007wG-64 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc3Z3-0002PP-O2 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:54:35 -0400 From: Alexander Graf Date: Wed, 6 Jun 2012 01:52:52 +0200 Message-Id: <1338940402-28502-2-git-send-email-agraf@suse.de> In-Reply-To: <1338940402-28502-1-git-send-email-agraf@suse.de> References: <1338940402-28502-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 01/31] dt: allow add_subnode to create root subnodes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-devel@nongnu.org Developers" Cc: qemu-ppc Mailing List Our subnode creation helper can't handle creation of root subnodes, like "/memory". Fix this by allowing the parent node to be an empty string, indicating the root node. Signed-off-by: Alexander Graf --- device_tree.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/device_tree.c b/device_tree.c index 86a694c..94a239e 100644 --- a/device_tree.c +++ b/device_tree.c @@ -151,6 +151,7 @@ int qemu_devtree_add_subnode(void *fdt, const char *name) char *dupname = g_strdup(name); char *basename = strrchr(dupname, '/'); int retval; + int parent = 0; if (!basename) { g_free(dupname); @@ -160,7 +161,11 @@ int qemu_devtree_add_subnode(void *fdt, const char *name) basename[0] = '\0'; basename++; - retval = fdt_add_subnode(fdt, findnode_nofail(fdt, dupname), basename); + if (dupname[0]) { + parent = findnode_nofail(fdt, dupname); + } + + retval = fdt_add_subnode(fdt, parent, basename); if (retval < 0) { fprintf(stderr, "FDT: Failed to create subnode %s: %s\n", name, fdt_strerror(retval)); -- 1.6.0.2