From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60C72C433DB for ; Thu, 25 Feb 2021 11:18:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC71964F0A for ; Thu, 25 Feb 2021 11:18:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC71964F0A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFEfI-0000bm-Q8 for qemu-devel@archiver.kernel.org; Thu, 25 Feb 2021 06:18:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFEQb-000387-OW for qemu-devel@nongnu.org; Thu, 25 Feb 2021 06:03:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lFEQZ-00010m-V8 for qemu-devel@nongnu.org; Thu, 25 Feb 2021 06:03:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614251006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qFJv2BJP3bdfcBM2Q+30gmjNRheti8JdPTSqyNddEaQ=; b=MEiwEBp3lM3jL/pJEL+cuaqxScpDJLhvO1pNAdLI6y6nX9tI286X2VAwPX4R9SCSrxLEtR 4xtSDU6jBz/oXfKsW7Mj73crrOooLZpynFTHYKDnogiShB0jFj40/dt+HOlJMtCH3zlhra l2fw6FW2tzmwaTubsfhP08/esXO7hCE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-FBze5yr7PSCCQpK9Aon6QA-1; Thu, 25 Feb 2021 06:03:22 -0500 X-MC-Unique: FBze5yr7PSCCQpK9Aon6QA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5BD191052BA1; Thu, 25 Feb 2021 11:03:21 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.40.194.200]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D43F19C79; Thu, 25 Feb 2021 11:03:14 +0000 (UTC) Date: Thu, 25 Feb 2021 12:03:11 +0100 From: Andrew Jones To: Ying Fang Subject: Re: [RFC PATCH 1/5] device_tree: Add qemu_fdt_add_path Message-ID: <20210225110311.quvchs32o4n6iqpt@kamzik.brq.redhat.com> References: <20210225085627.2263-1-fangying1@huawei.com> <20210225085627.2263-2-fangying1@huawei.com> MIME-Version: 1.0 In-Reply-To: <20210225085627.2263-2-fangying1@huawei.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=drjones@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, salil.mehta@huawei.com, zhang.zhanghailiang@huawei.com, mst@redhat.com, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, alistair.francis@wdc.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Ying Fang, I don't see any change in this patch from what I have in my tree, so this should be From: Andrew Jones Thanks, drew On Thu, Feb 25, 2021 at 04:56:23PM +0800, Ying Fang wrote: > qemu_fdt_add_path() works like qemu_fdt_add_subnode(), except > it also adds any missing parent nodes. We also tweak an error > message of qemu_fdt_add_subnode(). > > Signed-off-by: Andrew Jones > Signed-off-by: Ying Fang > --- > include/sysemu/device_tree.h | 1 + > softmmu/device_tree.c | 45 ++++++++++++++++++++++++++++++++++-- > 2 files changed, 44 insertions(+), 2 deletions(-) > > diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h > index 982c89345f..15fb98af98 100644 > --- a/include/sysemu/device_tree.h > +++ b/include/sysemu/device_tree.h > @@ -104,6 +104,7 @@ uint32_t qemu_fdt_get_phandle(void *fdt, const char *path); > uint32_t qemu_fdt_alloc_phandle(void *fdt); > int qemu_fdt_nop_node(void *fdt, const char *node_path); > int qemu_fdt_add_subnode(void *fdt, const char *name); > +int qemu_fdt_add_path(void *fdt, const char *path); > > #define qemu_fdt_setprop_cells(fdt, node_path, property, ...) \ > do { \ > diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c > index b9a3ddc518..1e3857ca0c 100644 > --- a/softmmu/device_tree.c > +++ b/softmmu/device_tree.c > @@ -515,8 +515,8 @@ int qemu_fdt_add_subnode(void *fdt, const char *name) > > retval = fdt_add_subnode(fdt, parent, basename); > if (retval < 0) { > - error_report("FDT: Failed to create subnode %s: %s", name, > - fdt_strerror(retval)); > + error_report("%s: Failed to create subnode %s: %s", > + __func__, name, fdt_strerror(retval)); > exit(1); > } > > @@ -524,6 +524,47 @@ int qemu_fdt_add_subnode(void *fdt, const char *name) > return retval; > } > > +/* > + * Like qemu_fdt_add_subnode(), but will add all missing > + * subnodes in the path. > + */ > +int qemu_fdt_add_path(void *fdt, const char *path) > +{ > + char *dupname, *basename, *p; > + int parent, retval = -1; > + > + if (path[0] != '/') { > + return retval; > + } > + > + parent = fdt_path_offset(fdt, "/"); > + p = dupname = g_strdup(path); > + > + while (p) { > + *p = '/'; > + basename = p + 1; > + p = strchr(p + 1, '/'); > + if (p) { > + *p = '\0'; > + } > + retval = fdt_path_offset(fdt, dupname); > + if (retval < 0 && retval != -FDT_ERR_NOTFOUND) { > + error_report("%s: Invalid path %s: %s", > + __func__, path, fdt_strerror(retval)); > + exit(1); > + } else if (retval == -FDT_ERR_NOTFOUND) { > + retval = fdt_add_subnode(fdt, parent, basename); > + if (retval < 0) { > + break; > + } > + } > + parent = retval; > + } > + > + g_free(dupname); > + return retval; > +} > + > void qemu_fdt_dumpdtb(void *fdt, int size) > { > const char *dumpdtb = current_machine->dumpdtb; > -- > 2.23.0 > >