motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv: Skip re-generating DT nodes for a given DTB

Browse source 
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: b1f19f238c ("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>
Message-ID: <20230228074522.1845007-1-bmeng@tinylab.org>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Bin Meng 2023-02-28 15:45:21 +08:00 • committed by Palmer Dabbelt
parent b8e1f32cda
commit d43d54ca2b
No known key found for this signature in database
GPG key ID: 2E1319F35FBB1889
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/riscv/sifive_u.c
View file

@ -118,6 +118,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
error_report("load_device_tree() failed"); error_report("load_device_tree() failed");
exit(1); exit(1);
} }
return;
} else { } else {
fdt = ms->fdt = create_device_tree(&fdt_size); fdt = ms->fdt = create_device_tree(&fdt_size);
if (!fdt) { if (!fdt) {

1
hw/riscv/virt.c
View file

@ -1015,6 +1015,7 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap)
error_report("load_device_tree() failed"); error_report("load_device_tree() failed");
exit(1); exit(1);
} }
return;
} else { } else {
ms->fdt = create_device_tree(&s->fdt_size); ms->fdt = create_device_tree(&s->fdt_size);
if (!ms->fdt) { if (!ms->fdt) {