On 7/19/19 8:05 PM, Alistair Francis wrote:
> 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.fran...@wdc.com>
> ---
> hw/riscv/boot.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 5dee63011b..4b32ab1d26 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");
Maybe a final '.' in the last warning to be consistent with the previous
lines?
Regardless:
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> + }
> return;
> }
>
>
