openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

riscv: Resolve full path of the given bios image 

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>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Bin Meng 2019-08-16 06:09:36 -07:00 committed by Palmer Dabbelt
parent 751f8f4133
commit 49dd180e4f
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/riscv/boot.c
View File

@ -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);
}
}