* [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
@ 2019-07-19 18:05 Alistair Francis
2019-07-20 9:30 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Alistair Francis @ 2019-07-19 18:05 UTC (permalink / raw)
To: qemu-devel, qemu-riscv; +Cc: alistair23, palmer, alistair.francis
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>
---
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");
+ }
return;
}
--
2.22.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
2019-07-19 18:05 [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning Alistair Francis
@ 2019-07-20 9:30 ` Philippe Mathieu-Daudé
2019-07-22 18:22 ` Alistair Francis
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-20 9:30 UTC (permalink / raw)
To: Alistair Francis, qemu-devel, qemu-riscv; +Cc: alistair23, palmer
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.francis@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é <philmd@redhat.com>
> + }
> return;
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
2019-07-20 9:30 ` Philippe Mathieu-Daudé
@ 2019-07-22 18:22 ` Alistair Francis
2019-07-22 19:09 ` Palmer Dabbelt
0 siblings, 1 reply; 5+ messages in thread
From: Alistair Francis @ 2019-07-22 18:22 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: open list:RISC-V, Palmer Dabbelt, Alistair Francis,
qemu-devel@nongnu.org Developers
On Sat, Jul 20, 2019 at 2:30 AM Philippe Mathieu-Daudé
<philmd@redhat.com> 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 <alistair.francis@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?
Done in v2.
>
> Regardless:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks!
Alistair
>
> > + }
> > return;
> > }
> >
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
2019-07-22 18:22 ` Alistair Francis
@ 2019-07-22 19:09 ` Palmer Dabbelt
2019-07-22 20:21 ` Alistair Francis
0 siblings, 1 reply; 5+ messages in thread
From: Palmer Dabbelt @ 2019-07-22 19:09 UTC (permalink / raw)
To: alistair23; +Cc: Alistair Francis, philmd, qemu-devel, qemu-riscv
On Mon, 22 Jul 2019 11:22:43 PDT (-0700), alistair23@gmail.com wrote:
> On Sat, Jul 20, 2019 at 2:30 AM Philippe Mathieu-Daudé
> <philmd@redhat.com> 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 <alistair.francis@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?
>
> Done in v2.
I don't see a v2, did I miss it?
>> Regardless:
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Thanks!
>
> Alistair
>
>>
>> > + }
>> > return;
>> > }
>> >
>> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
2019-07-22 19:09 ` Palmer Dabbelt
@ 2019-07-22 20:21 ` Alistair Francis
0 siblings, 0 replies; 5+ messages in thread
From: Alistair Francis @ 2019-07-22 20:21 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Alistair Francis, Philippe Mathieu-Daudé,
qemu-devel@nongnu.org Developers, open list:RISC-V
On Mon, Jul 22, 2019 at 12:09 PM Palmer Dabbelt <palmer@sifive.com> wrote:
>
> On Mon, 22 Jul 2019 11:22:43 PDT (-0700), alistair23@gmail.com wrote:
> > On Sat, Jul 20, 2019 at 2:30 AM Philippe Mathieu-Daudé
> > <philmd@redhat.com> 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 <alistair.francis@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?
> >
> > Done in v2.
>
> I don't see a v2, did I miss it?
Just sent it.
Alistair
>
> >> Regardless:
> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >
> > Thanks!
> >
> > Alistair
> >
> >>
> >> > + }
> >> > return;
> >> > }
> >> >
> >> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-22 20:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-19 18:05 [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning Alistair Francis
2019-07-20 9:30 ` Philippe Mathieu-Daudé
2019-07-22 18:22 ` Alistair Francis
2019-07-22 19:09 ` Palmer Dabbelt
2019-07-22 20:21 ` Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).