[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/2] riscv: Resolve full path of the given bios
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH 2/2] riscv: Resolve full path of the given bios image |
Date: |
Tue, 20 Aug 2019 11:40:26 -0700 |
On Fri, Aug 16, 2019 at 6:11 AM Bin Meng <address@hidden> wrote:
>
> At present when "-bios image" is supplied, we just use the straight
> path without searching for the configured data directories. Like
> "-bios default", we add the same logic so that "-L" actually works.
>
> Signed-off-by: Bin Meng <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
>
> ---
>
> hw/riscv/boot.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index a122846..15002d3 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -72,14 +72,14 @@ void riscv_find_and_load_firmware(MachineState *machine,
> firmware_filename = riscv_find_firmware(default_machine_firmware);
> } else {
> firmware_filename = machine->firmware;
> + if (strcmp(firmware_filename, "none")) {
> + firmware_filename = riscv_find_firmware(firmware_filename);
> + }
> }
>
> if (strcmp(firmware_filename, "none")) {
> /* If not "none" load the firmware */
> riscv_load_firmware(firmware_filename, firmware_load_addr);
> - }
> -
> - if (!strcmp(machine->firmware, "default")) {
> g_free(firmware_filename);
> }
> }
> --
> 2.7.4
>
>