From: Alistair Francis <alistair23@gmail.com>
To: Bin Meng <bmeng.cn@gmail.com>
Cc: Bin Meng <bin.meng@windriver.com>,
"open list:RISC-V" <qemu-riscv@nongnu.org>,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Palmer Dabbelt <palmerdabbelt@google.com>,
"qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
Alistair Francis <Alistair.Francis@wdc.com>
Subject: Re: [PATCH] riscv: Change the default behavior if no -bios option is specified
Date: Tue, 5 May 2020 15:28:35 -0700 [thread overview]
Message-ID: <CAKmqyKO6HGQrMxsNovPkoB4TncEmeD=uFV_oXEpQ0t+=g20Wfw@mail.gmail.com> (raw)
In-Reply-To: <CAKmqyKMdmVrvYDNVtm6_iviDT_mofGZO9DC2vtZdZaHN31T07A@mail.gmail.com>
On Tue, May 5, 2020 at 1:34 PM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Fri, May 1, 2020 at 5:21 AM Bin Meng <bmeng.cn@gmail.com> wrote:
> >
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios
> > option in QEMU for RISC-V for the virt machine and sifive_u machine.
> > The default behavior has been that QEMU does not automatically load
> > any firmware if no -bios option is included.
> >
> > Now 2 releases passed, it's time to change the default behavior to
> > load the default OpenSBI firmware automatically. The firmware is
> > included with the QEMU release and no user interaction is required.
> > All a user needs to do is specify the kernel they want to boot with
> > the -kernel option.
> >
> > Signed-off-by: Bin Meng <bin.meng@windriver.com>
>
> Thanks!
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
>
> Applied to the RISC-V tree.
This fails `make check`
qemu-system-riscv64: Unable to load the RISC-V firmware
"opensbi-riscv64-spike-fw_jump.elf"
Broken pipe
/scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit
status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1
Alistair
>
> Alistair
>
> > ---
> >
> > hw/riscv/boot.c | 31 ++++---------------------------
> > 1 file changed, 4 insertions(+), 27 deletions(-)
> >
> > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> > index 726300a..b76b2f3 100644
> > --- a/hw/riscv/boot.c
> > +++ b/hw/riscv/boot.c
> > @@ -41,34 +41,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
> > {
> > char *firmware_filename = NULL;
> >
> > - if (!machine->firmware) {
> > + if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) {
> > /*
> > - * The user didn't specify -bios.
> > - * At the moment we default to loading nothing when this hapens.
> > - * 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 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;
> > - }
> > -
> > - if (!strcmp(machine->firmware, "default")) {
> > - /*
> > - * The user has specified "-bios default". That means we are going to
> > - * load the OpenSBI binary included in the QEMU source.
> > - *
> > - * We can't load the binary by default as it will break existing users
> > - * as users are already loading their own firmware.
> > - *
> > - * Let's try to get everyone to specify the -bios option at all times,
> > - * so then in the future we can make "-bios default" the default option
> > - * if no -bios option is set without breaking anything.
> > + * The user didn't specify -bios, or has specified "-bios default".
> > + * That means we are going to load the OpenSBI binary included in
> > + * the QEMU source.
> > */
> > firmware_filename = riscv_find_firmware(default_machine_firmware);
> > } else if (strcmp(machine->firmware, "none")) {
> > --
> > 2.7.4
> >
> >
next prev parent reply other threads:[~2020-05-05 22:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 12:19 [PATCH] riscv: Change the default behavior if no -bios option is specified Bin Meng
2020-05-05 20:34 ` Alistair Francis
2020-05-05 22:28 ` Alistair Francis [this message]
2020-05-06 1:34 ` Bin Meng
2020-05-06 20:53 ` Alistair Francis
2020-05-21 1:37 ` Bin Meng
2020-05-21 15:52 ` 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='CAKmqyKO6HGQrMxsNovPkoB4TncEmeD=uFV_oXEpQ0t+=g20Wfw@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=Alistair.Francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=bmeng.cn@gmail.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmerdabbelt@google.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/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).