From nobody Wed May 15 09:20:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676960486362972.9990142066985; Mon, 20 Feb 2023 22:21:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUM0m-0006Ku-4f; Tue, 21 Feb 2023 01:20:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUM0j-0006K0-Ng; Tue, 21 Feb 2023 01:20:21 -0500 Received: from bg4.exmail.qq.com ([43.154.221.58]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUM0f-0002Pr-RZ; Tue, 21 Feb 2023 01:20:21 -0500 Received: from pek-vx-bsp2.wrs.com ( [60.247.85.88]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 21 Feb 2023 14:12:05 +0800 (CST) X-QQ-mid: bizesmtp67t1676959939t5j5jyir X-QQ-SSF: 01200000000000C0D000000A0000000 X-QQ-FEAT: 6c27PqfzmO6dGBzi62XBvY/6S0ZgFVVIwmGSHRerIeu0qs5kz16OK0jItTwyF 4TE76gM3Yt+KtcXeD90fj0rdLsB4wicpmvxZ5IgtkuzMoh9mpWCCI0kvrG+EHCzRkU0fFac nbMzieSI0TJKyTfCOFlAwS/EGA04AOvn2AG5TGODjXBgq+L57jlIPxQMiLy/nFFh7OFZXtR vW981ZUqmsi1WH6udqgY3a9GR7v2WIA4Av79fWKKu+fRQABlCvqm7cJuLBRa9dSAeK9/dFz 90UghiE3MOQeAOaMfw3dv9ypKk2zYDwBVMrSTldiPDN6o7RcKjr3gFSZkNxQLSL+jqmwZ3K vj47ediagFB+yZrx9U= X-QQ-GoodBg: 0 From: Bin Meng To: qemu-devel@nongnu.org Cc: Alistair Francis , Bin Meng , Daniel Henrique Barboza , Liu Zhiwei , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org Subject: [PATCH] hw/riscv: Skip re-generating DT nodes for a given DTB Date: Tue, 21 Feb 2023 14:12:03 +0800 Message-Id: <20230221061204.1658306-1-bmeng@tinylab.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvr:qybglogicsvr3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=43.154.221.58; envelope-from=bmeng@tinylab.org; helo=bg4.exmail.qq.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1676960488559100003 Content-Type: text/plain; charset="utf-8" Lanuch qemu-system-riscv64 with a given dtb for 'sifive_u' and 'virt' machines, QEMU complains: qemu_fdt_add_subnode: Failed to create subnode /soc: FDT_ERR_EXISTS The whole DT generation logic should be skipped when a given DTB is present. Fixes: b1f19f238cae ("hw/riscv: write bootargs 'chosen' FDT after riscv_loa= d_kernel()") Signed-off-by: Bin Meng Reviewed-by: Daniel Henrique Barboza --- hw/riscv/sifive_u.c | 1 + hw/riscv/virt.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index ad3bb35b34..76db5ed3dd 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -118,6 +118,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEnt= ry *memmap, error_report("load_device_tree() failed"); exit(1); } + return; } else { fdt =3D ms->fdt =3D create_device_tree(&fdt_size); if (!fdt) { diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 86c4adc0c9..0c7b4a1e46 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1014,6 +1014,7 @@ static void create_fdt(RISCVVirtState *s, const MemMa= pEntry *memmap) error_report("load_device_tree() failed"); exit(1); } + return; } else { ms->fdt =3D create_device_tree(&s->fdt_size); if (!ms->fdt) { --=20 2.25.1