Loading tests should conflict with the opensbi ROM, however the generic loader writes through the CPU address space which bypasses the ROM overlap check.
Instead of depending on this happy accident, set -bios none to skip loading opensbi. This frees up the address space to load the test with -kernel, required by a future change that uses the same rules to run the multiarch tests for riscv64. Signed-off-by: Joel Stanley <[email protected]> --- tests/tcg/riscv64/Makefile.softmmu-target | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/Makefile.softmmu-target index 6a219c306c43..562ac9b0e0fb 100644 --- a/tests/tcg/riscv64/Makefile.softmmu-target +++ b/tests/tcg/riscv64/Makefile.softmmu-target @@ -14,36 +14,36 @@ CFLAGS += -g -Og %: %.o $(LINK_SCRIPT) $(LD) $(LDFLAGS) $< -o $@ -QEMU_OPTS += -M virt -display none -semihosting -device loader,file= +QEMU_OPTS += -M virt -display none -bios none -semihosting -kernel EXTRA_RUNS += run-issue1060 run-issue1060: issue1060 - $(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) EXTRA_RUNS += run-test-mepc-masking run-test-mepc-masking: test-mepc-masking - $(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) EXTRA_RUNS += run-test-minstret-ecall run-test-minstret-ecall: test-minstret-ecall - $(call run-test, $<, $(QEMU) -icount shift=1 $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) -icount shift=1 $(QEMU_OPTS) $<) EXTRA_RUNS += run-plugin-doubletrap run-plugin-doubletrap: doubletrap $(call run-test, $<, \ $(QEMU) -plugin ../plugins/libdiscons.so -d plugin -D $<.pout \ - $(QEMU_OPTS)$<) + $(QEMU_OPTS) $<) EXTRA_RUNS += run-plugin-interruptedmemory run-plugin-interruptedmemory: interruptedmemory $(call run-test, $<, \ $(QEMU) -plugin ../plugins/libdiscons.so -d plugin -D $<.pout \ - $(QEMU_OPTS)$<) + $(QEMU_OPTS) $<) EXTRA_RUNS += run-test-crc32 comma:= , run-test-crc32: test-crc32 - $(call run-test, $<, $(QEMU) -cpu rv64$(comma)xlrbr=true $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) -cpu rv64$(comma)xlrbr=true $(QEMU_OPTS) $<) # Zicclsm: misaligned load/store support. Assemble one source twice: the # default build expects every misaligned access to succeed (zicclsm=true), @@ -61,11 +61,11 @@ test-zicclsm-off: test-zicclsm.S $(LINK_SCRIPT) EXTRA_RUNS += run-test-zicclsm run-test-zicclsm: test-zicclsm - $(call run-test, $<, $(QEMU) -cpu rv64$(comma)v=true$(comma)zfh=true$(comma)zicclsm=true $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) -cpu rv64$(comma)v=true$(comma)zfh=true$(comma)zicclsm=true $(QEMU_OPTS) $<) EXTRA_RUNS += run-test-zicclsm-off run-test-zicclsm-off: test-zicclsm-off - $(call run-test, $<, $(QEMU) -cpu rv64$(comma)v=true$(comma)zfh=true$(comma)zicclsm=false $(QEMU_OPTS)$<) + $(call run-test, $<, $(QEMU) -cpu rv64$(comma)v=true$(comma)zfh=true$(comma)zicclsm=false $(QEMU_OPTS) $<) EXTRA_RUNS += run-test-misa-w run-test-misa-w: test-misa-w -- 2.47.3
