Fix this test failure:
$ QTEST_QEMU_BINARY=./build/qemu-system-riscv64 \
./build/tests/qtest/qom-test
(...)
# slow test /riscv64/qom/amd-microblaze-v-generic executed in 2.28 \
secs
# starting QEMU: exec ./build/qemu-system-riscv64 -qtest
unix:/tmp/qtest-1361875.sock -qtest-log /dev/null -chardev \
socket,path=/tmp/qtest-1361875.qmp,id=char0 -mon \
chardev=char0,mode=control -display none -audio none -machine \
microchip-icicle-kit -accel qtest
**
ERROR:../hw/riscv/boot.c:164:riscv_load_firmware: assertion failed: \
(firmware_filename != NULL)
Bail out! ERROR:../hw/riscv/boot.c:164:riscv_load_firmware: \
assertion failed: (firmware_filename != NULL)
Use an approach similar to riscv_find_and_load_firmware().
Reported-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>
Signed-off-by: Sebastian Huber <sebastian.hu...@embedded-brains.de>
---
hw/riscv/microchip_pfsoc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index 9068eed780..616bb63982 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -609,12 +609,14 @@ static void
microchip_icicle_kit_machine_init(MachineState *machine)
}
/* Load the firmware if necessary */
+ firmware_end_addr = firmware_load_addr;
if (firmware_name) {
- const char *filename = riscv_find_firmware(firmware_name, NULL);
- firmware_end_addr = riscv_load_firmware(filename, &firmware_load_addr,
- NULL);
- } else {
- firmware_end_addr = firmware_load_addr;
+ char *filename = riscv_find_firmware(firmware_name, NULL);
+ if (filename) {
+ firmware_end_addr = riscv_load_firmware(filename,
+ &firmware_load_addr, NULL);
+ g_free(filename);
+ }
}
riscv_boot_info_init(&boot_info, &s->soc.u_cpus);
--
2.43.0
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
