mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-09 11:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

riscv/boot: Fixup the RISC-V firmware warning

Browse Source 
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>
This commit is contained in:
Alistair Francis 2019-07-22 13:20:40 -07:00 committed by Palmer Dabbelt
parent bf8b024372
commit 75ea2529cf
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/riscv/boot.c
View File

@ -26,6 +26,7 @@
#include "hw/riscv/boot.h" #include "hw/riscv/boot.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "elf.h" #include "elf.h"
#include "sysemu/qtest.h"
#if defined(TARGET_RISCV32) #if defined(TARGET_RISCV32)
# define KERNEL_BOOT_ADDRESS 0x80400000 # 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 * In the future this defaul will change to loading the prebuilt
* OpenSBI firmware. Let's warn the user and then continue. * OpenSBI firmware. Let's warn the user and then continue.
*/ */
warn_report("No -bios option specified. Not loading a firmware."); if (!qtest_enabled()) {
warn_report("This default will change in QEMU 4.3. Please use the " \ warn_report("No -bios option specified. Not loading a firmware.");
"-bios option to aviod breakages when this happens."); warn_report("This default will change in a future QEMU release. " \
warn_report("See QEMU's deprecation documentation for details"); "Please use the -bios option to avoid breakages when "\
"this happens.");
warn_report("See QEMU's deprecation documentation for details.");
}
return; return;
} }