From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Alistair Francis <alistair.francis@wdc.com>,
qemu-devel@nongnu.org, qemu-riscv@nongnu.org
Cc: alistair23@gmail.com, palmer@sifive.com
Subject: Re: [Qemu-devel] [PATCH v1 1/1] riscv/boot: Fixup the RISC-V firmware warning
Date: Sat, 20 Jul 2019 11:30:16 +0200 [thread overview]
Message-ID: <550d4158-d7dd-c38b-3082-302184a20883@redhat.com> (raw)
In-Reply-To: <edd3c94d357207e3862d1f5fec7e7346e70831f4.1563559494.git.alistair.francis@wdc.com>
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;
> }
>
>
next prev parent reply other threads:[~2019-07-20 9:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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é [this message]
2019-07-22 18:22 ` Alistair Francis
2019-07-22 19:09 ` Palmer Dabbelt
2019-07-22 20:21 ` Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=550d4158-d7dd-c38b-3082-302184a20883@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=palmer@sifive.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).