| Message ID | 20230228074522.1845007-1-bmeng@tinylab.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] hw/riscv: Skip re-generating DT nodes for a given DTB | expand |
On Mon, 27 Feb 2023 23:45:21 PST (-0800), bmeng@tinylab.org wrote: > Launch 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_load_kernel()") > Signed-off-by: Bin Meng <bmeng@tinylab.org> > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > > (no changes since v1) > > 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 MemMapEntry *memmap, > error_report("load_device_tree() failed"); > exit(1); > } > + return; > } else { > fdt = ms->fdt = 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 MemMapEntry *memmap) > error_report("load_device_tree() failed"); > exit(1); > } > + return; > } else { > ms->fdt = create_device_tree(&s->fdt_size); > if (!ms->fdt) { Thanks, these two are queued up.
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 MemMapEntry *memmap, error_report("load_device_tree() failed"); exit(1); } + return; } else { fdt = ms->fdt = 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 MemMapEntry *memmap) error_report("load_device_tree() failed"); exit(1); } + return; } else { ms->fdt = create_device_tree(&s->fdt_size); if (!ms->fdt) {
Launch 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_load_kernel()") Signed-off-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- (no changes since v1) hw/riscv/sifive_u.c | 1 + hw/riscv/virt.c | 1 + 2 files changed, 2 insertions(+)