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=-20.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 2D359C433E0 for ; Thu, 25 Feb 2021 12:56:21 +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 22DB364EB7 for ; Thu, 25 Feb 2021 12:56:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22DB364EB7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFGBm-0007gq-S7 for qemu-devel@archiver.kernel.org; Thu, 25 Feb 2021 07:56:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFGAV-0006bU-WC; Thu, 25 Feb 2021 07:55:00 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFGAS-00026M-Eh; Thu, 25 Feb 2021 07:54:59 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DmXlF6TrFzjRrM; Thu, 25 Feb 2021 20:53:13 +0800 (CST) Received: from [10.174.186.67] (10.174.186.67) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.498.0; Thu, 25 Feb 2021 20:54:41 +0800 Subject: Re: [RFC PATCH 1/5] device_tree: Add qemu_fdt_add_path To: Andrew Jones References: <20210225085627.2263-1-fangying1@huawei.com> <20210225085627.2263-2-fangying1@huawei.com> <20210225110311.quvchs32o4n6iqpt@kamzik.brq.redhat.com> From: Ying Fang Message-ID: <278b7b03-f463-61b6-111d-1e840df22eae@huawei.com> Date: Thu, 25 Feb 2021 20:54:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210225110311.quvchs32o4n6iqpt@kamzik.brq.redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.186.67] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=fangying1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.435, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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" On 2/25/2021 7:03 PM, Andrew Jones wrote: > 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 > Yes, I picked it from your qemu branch: https://github.com/rhdrjones/qemu/commit/ecfc1565f22187d2c715a99bbcd35cf3a7e428fa So what can I do to make it "From: Andrew Jones " ? Can I made it by using git commit --amend like below ? git commit --amend --author "Andrew Jones " > 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 >> >> > > . >