From: Alistair Francis <alistair23@gmail.com>
To: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
alistair.francis@wdc.com, Bin Meng <bin.meng@windriver.com>
Subject: Re: [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static
Date: Fri, 23 Dec 2022 13:13:08 +1000 [thread overview]
Message-ID: <CAKmqyKMdQFefTHdtKRbTMih8OVq5kHkeYNsGW-iHJCSpkjBX8g@mail.gmail.com> (raw)
In-Reply-To: <20221221182300.307900-5-dbarboza@ventanamicro.com>
On Thu, Dec 22, 2022 at 4:26 AM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> The only caller is riscv_find_and_load_firmware(), which is in the same
> file.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/riscv/boot.c | 44 ++++++++++++++++++++---------------------
> include/hw/riscv/boot.h | 1 -
> 2 files changed, 22 insertions(+), 23 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index ebd351c840..7361d5c0d8 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -75,6 +75,28 @@ target_ulong riscv_calc_kernel_start_addr(RISCVHartArrayState *harts,
> }
> }
>
> +static char *riscv_find_firmware(const char *firmware_filename)
> +{
> + char *filename;
> +
> + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware_filename);
> + if (filename == NULL) {
> + if (!qtest_enabled()) {
> + /*
> + * We only ship OpenSBI binary bios images in the QEMU source.
> + * For machines that use images other than the default bios,
> + * running QEMU test will complain hence let's suppress the error
> + * report for QEMU testing.
> + */
> + error_report("Unable to load the RISC-V firmware \"%s\"",
> + firmware_filename);
> + exit(1);
> + }
> + }
> +
> + return filename;
> +}
> +
> target_ulong riscv_find_and_load_firmware(MachineState *machine,
> const char *default_machine_firmware,
> hwaddr firmware_load_addr,
> @@ -104,28 +126,6 @@ target_ulong riscv_find_and_load_firmware(MachineState *machine,
> return firmware_end_addr;
> }
>
> -char *riscv_find_firmware(const char *firmware_filename)
> -{
> - char *filename;
> -
> - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware_filename);
> - if (filename == NULL) {
> - if (!qtest_enabled()) {
> - /*
> - * We only ship OpenSBI binary bios images in the QEMU source.
> - * For machines that use images other than the default bios,
> - * running QEMU test will complain hence let's suppress the error
> - * report for QEMU testing.
> - */
> - error_report("Unable to load the RISC-V firmware \"%s\"",
> - firmware_filename);
> - exit(1);
> - }
> - }
> -
> - return filename;
> -}
> -
> target_ulong riscv_load_firmware(const char *firmware_filename,
> hwaddr firmware_load_addr,
> symbol_fn_t sym_cb)
> diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
> index 93e5f8760d..c03e4e74c5 100644
> --- a/include/hw/riscv/boot.h
> +++ b/include/hw/riscv/boot.h
> @@ -37,7 +37,6 @@ target_ulong riscv_find_and_load_firmware(MachineState *machine,
> const char *default_machine_firmware,
> hwaddr firmware_load_addr,
> symbol_fn_t sym_cb);
> -char *riscv_find_firmware(const char *firmware_filename);
> target_ulong riscv_load_firmware(const char *firmware_filename,
> hwaddr firmware_load_addr,
> symbol_fn_t sym_cb);
> --
> 2.38.1
>
>
next prev parent reply other threads:[~2022-12-23 3:14 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 18:22 [PATCH 00/15] riscv: opensbi boot test and cleanups Daniel Henrique Barboza
2022-12-21 18:22 ` [PATCH 01/15] tests/avocado: add RISC-V opensbi boot test Daniel Henrique Barboza
2022-12-22 10:24 ` Bin Meng
2022-12-22 10:47 ` Daniel Henrique Barboza
2022-12-22 12:56 ` Bin Meng
2022-12-22 16:56 ` Anup Patel
2022-12-22 20:58 ` Daniel Henrique Barboza
2022-12-23 6:25 ` Bin Meng
2022-12-24 3:52 ` Bin Meng
2022-12-26 13:56 ` Bin Meng
2022-12-26 14:00 ` Daniel Henrique Barboza
2022-12-27 18:02 ` Daniel Henrique Barboza
2022-12-23 2:40 ` Alistair Francis
2022-12-27 23:04 ` Wainer dos Santos Moschetta
2022-12-21 18:22 ` [PATCH 02/15] hw/riscv/spike: use 'fdt' from MachineState Daniel Henrique Barboza
2022-12-22 14:25 ` Philippe Mathieu-Daudé
2022-12-22 16:43 ` Daniel Henrique Barboza
2022-12-23 3:10 ` Alistair Francis
2022-12-23 9:09 ` Bin Meng
2022-12-21 18:22 ` [PATCH 03/15] hw/riscv/sifive_u: " Daniel Henrique Barboza
2022-12-22 14:25 ` Philippe Mathieu-Daudé
2022-12-23 3:12 ` Alistair Francis
2022-12-23 9:10 ` Bin Meng
2022-12-21 18:22 ` [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static Daniel Henrique Barboza
2022-12-22 14:26 ` Philippe Mathieu-Daudé
2022-12-23 3:13 ` Alistair Francis [this message]
2022-12-23 9:13 ` Bin Meng
2022-12-21 18:22 ` [PATCH 05/15] hw/riscv/boot.c: introduce riscv_default_firmware_name() Daniel Henrique Barboza
2022-12-23 3:17 ` Alistair Francis
2022-12-23 9:20 ` Bin Meng
2022-12-21 18:22 ` [PATCH 06/15] hw/riscv/spike.c: load initrd right after riscv_load_kernel() Daniel Henrique Barboza
2022-12-22 14:27 ` Philippe Mathieu-Daudé
2022-12-23 3:19 ` Alistair Francis
2022-12-23 10:04 ` Bin Meng
2022-12-26 13:49 ` Bin Meng
2022-12-26 13:52 ` Daniel Henrique Barboza
2022-12-21 18:22 ` [PATCH 07/15] hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd() Daniel Henrique Barboza
2022-12-23 10:15 ` Bin Meng
2022-12-21 18:22 ` [PATCH 08/15] hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel() Daniel Henrique Barboza
2022-12-23 10:32 ` Bin Meng
2022-12-21 18:22 ` [PATCH 09/15] hw/riscv/boot.c: use MachineState in riscv_load_initrd() Daniel Henrique Barboza
2022-12-22 14:27 ` Philippe Mathieu-Daudé
2022-12-23 10:47 ` Bin Meng
2022-12-21 18:22 ` [PATCH 10/15] hw/riscv/boot.c: use MachineState in riscv_load_kernel() Daniel Henrique Barboza
2022-12-22 14:28 ` Philippe Mathieu-Daudé
2022-12-23 10:55 ` Bin Meng
2022-12-21 18:22 ` [PATCH 11/15] hw/riscv/boot.c: consolidate all kernel init " Daniel Henrique Barboza
2022-12-23 12:55 ` Bin Meng
2022-12-21 18:22 ` [PATCH 12/15] hw/riscv/boot.c: make riscv_load_initrd() static Daniel Henrique Barboza
2022-12-22 14:29 ` Philippe Mathieu-Daudé
2022-12-23 12:56 ` Bin Meng
2022-12-21 18:22 ` [PATCH 13/15] hw/riscv/spike.c: simplify create_fdt() Daniel Henrique Barboza
2022-12-23 13:06 ` Bin Meng
2022-12-26 14:18 ` Daniel Henrique Barboza
2022-12-21 18:22 ` [PATCH 14/15] hw/riscv/virt.c: " Daniel Henrique Barboza
2022-12-21 18:23 ` [PATCH 15/15] hw/riscv/sifive_u: " Daniel Henrique Barboza
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=CAKmqyKMdQFefTHdtKRbTMih8OVq5kHkeYNsGW-iHJCSpkjBX8g@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.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).