From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc8ov-0004yd-Sz for qemu-devel@nongnu.org; Wed, 06 Jun 2012 01:30:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc8ou-0003zH-1q for qemu-devel@nongnu.org; Wed, 06 Jun 2012 01:30:13 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:55389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc8ot-0003yP-SG for qemu-devel@nongnu.org; Wed, 06 Jun 2012 01:30:11 -0400 Received: by dadv2 with SMTP id v2so8973627dad.4 for ; Tue, 05 Jun 2012 22:30:09 -0700 (PDT) From: Peter Crosthwaite In-Reply-To: <1338940402-28502-2-git-send-email-agraf@suse.de> References: <1338940402-28502-1-git-send-email-agraf@suse.de> <1338940402-28502-2-git-send-email-agraf@suse.de> Content-Type: text/plain; charset="UTF-8" Date: Wed, 06 Jun 2012 15:30:07 +1000 Message-ID: <1338960607.15420.21.camel@PetaLogix-ws2> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [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: Alexander Graf Cc: qemu-ppc Mailing List , "qemu-devel@nongnu.org Developers" On Wed, 2012-06-06 at 01:52 +0200, Alexander Graf wrote: > 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));