| Message ID | 1565960976-6693-3-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: Fix "-L" not working for bios image search path | expand |
On Fri, Aug 16, 2019 at 6:11 AM Bin Meng <bmeng.cn@gmail.com> 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 <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> 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 > >
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); } }
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 <bmeng.cn@gmail.com> --- hw/riscv/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)