aboutsummaryrefslogtreecommitdiff
path: root/device_tree.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-05-17 11:40:42 +0200
committerAlexander Graf <agraf@suse.de>2012-06-24 01:04:45 +0200
commitc640d088349acaf23161e7afb3dfeb5d6a7007f1 (patch)
tree3735bb38c7157baf59a32c4f4fc874ca4781d483 /device_tree.c
parent94282e714628ee4b130b46f3b06b34da45b2fe6a (diff)
downloadqemu-arm-c640d088349acaf23161e7afb3dfeb5d6a7007f1.tar.gz
dt: allow add_subnode to create root subnodes
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 <agraf@suse.de> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
Diffstat (limited to 'device_tree.c')
-rw-r--r--device_tree.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/device_tree.c b/device_tree.c
index 86a694c955..94a239e987 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));