diff options
| author | Alistair Francis <alistair.francis@wdc.com> | 2019-07-22 13:20:40 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@sifive.com> | 2019-07-26 16:03:48 -0700 |
| commit | 75ea2529cf09aa4630c5357f9814f04b6697e8b7 (patch) | |
| tree | 30ad5ed4beab4d1317ffd7a7ae306c74f4316d4c /hw/riscv/boot.c | |
| parent | bf8b024372bf8abf5a9f40bfa65eeefad23ff988 (diff) | |
| download | focaccia-qemu-75ea2529cf09aa4630c5357f9814f04b6697e8b7.tar.gz focaccia-qemu-75ea2529cf09aa4630c5357f9814f04b6697e8b7.zip | |
riscv/boot: Fixup the RISC-V firmware warning
Fix a typo in the warning message displayed to users, don't print the message when running inside qtest and don't mention a specific QEMU version for the deprecation. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'hw/riscv/boot.c')
| -rw-r--r-- | hw/riscv/boot.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 5dee63011b..6b7d322e85 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -26,6 +26,7 @@ #include "hw/riscv/boot.h" #include "hw/boards.h" #include "elf.h" +#include "sysemu/qtest.h" #if defined(TARGET_RISCV32) # define KERNEL_BOOT_ADDRESS 0x80400000 @@ -46,10 +47,13 @@ void riscv_find_and_load_firmware(MachineState *machine, * In the future this defaul will change to loading the prebuilt * OpenSBI firmware. Let's warn the user and then continue. */ - warn_report("No -bios option specified. Not loading a firmware."); - warn_report("This default will change in QEMU 4.3. Please use the " \ - "-bios option to aviod breakages when this happens."); - warn_report("See QEMU's deprecation documentation for details"); + if (!qtest_enabled()) { + warn_report("No -bios option specified. Not loading a firmware."); + warn_report("This default will change in a future QEMU release. " \ + "Please use the -bios option to avoid breakages when "\ + "this happens."); + warn_report("See QEMU's deprecation documentation for details."); + } return; } |