From patchwork Tue Jun 5 23:52:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [01/31] dt: allow add_subnode to create root subnodes Date: Tue, 05 Jun 2012 13:52:52 -0000 From: Alexander Graf X-Patchwork-Id: 163228 Message-Id: <1338940402-28502-2-git-send-email-agraf@suse.de> 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 Reviewed-by: Peter Crosthwaite --- 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));