Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning

[Alistair Francis]

On Mon, Jul 22, 2019 at 12:09 PM Palmer Dabbelt <address@hidden> wrote:
>
> On Mon, 22 Jul 2019 11:22:43 PDT (-0700), address@hidden wrote:
> > On Sat, Jul 20, 2019 at 2:30 AM Philippe Mathieu-Daudé
> > <address@hidden> wrote:
> >>
> >> 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 <address@hidden>
> >> > ---
> >> >  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?
> >
> > Done in v2.
>
> I don't see a v2, did I miss it?

Just sent it.

Alistair

>
> >> Regardless:
> >> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> >
> > Thanks!
> >
> > Alistair
> >
> >>
> >> > +        }
> >> >          return;
> >> >      }
> >> >
> >> >