[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static
|
From: |
Alistair Francis |
|
Subject: |
Re: [PATCH 04/15] hw/riscv/boot.c: make riscv_find_firmware() static |
|
Date: |
Fri, 23 Dec 2022 13:13:08 +1000 |
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
>
>