Unverified Commit 75ea2529 authored by Alistair Francis's avatar Alistair Francis Committed by Palmer Dabbelt
Browse files

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: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent bf8b0243

hw/riscv/boot.c

+8 −4
Original line number Diff line number Diff line
@@ -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.

        */

        if (!qtest_enabled()) {

            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");

            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;

    }