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

mips: remove bios_name 

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026143028.3034018-9-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-26 10:30:21 -04:00
parent 1684273ca8
commit 59588bea5e
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/mips/fuloong2e.c
View File

@ -338,7 +338,7 @@ static void mips_fuloong2e_init(MachineState *machine)
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry); write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
} else { } else {
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, filename = qemu_find_file(QEMU_FILE_TYPE_BIOS,
bios_name ?: FULOONG_BIOSNAME); machine->firmware ?: FULOONG_BIOSNAME);
if (filename) { if (filename) {
bios_size = load_image_targphys(filename, 0x1fc00000LL, bios_size = load_image_targphys(filename, 0x1fc00000LL,
BIOS_SIZE); BIOS_SIZE);
@ -348,8 +348,8 @@ static void mips_fuloong2e_init(MachineState *machine)
} }
if ((bios_size < 0 || bios_size > BIOS_SIZE) && if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
bios_name && !qtest_enabled()) { machine->firmware && !qtest_enabled()) {
error_report("Could not load MIPS bios '%s'", bios_name); error_report("Could not load MIPS bios '%s'", machine->firmware);
exit(1); exit(1);
} }
} }

6
hw/mips/jazz.c
View File

@ -218,7 +218,7 @@ static void mips_jazz_init(MachineState *machine,
memory_region_add_subregion(address_space, 0xfff00000LL, bios2); memory_region_add_subregion(address_space, 0xfff00000LL, bios2);
/* load the BIOS image. */ /* load the BIOS image. */
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name ?: BIOS_FILENAME); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: BIOS_FILENAME);
if (filename) { if (filename) {
bios_size = load_image_targphys(filename, 0xfff00000LL, bios_size = load_image_targphys(filename, 0xfff00000LL,
MAGNUM_BIOS_SIZE); MAGNUM_BIOS_SIZE);
@ -227,8 +227,8 @@ static void mips_jazz_init(MachineState *machine,
bios_size = -1; bios_size = -1;
} }
if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE)
&& bios_name && !qtest_enabled()) { && machine->firmware && !qtest_enabled()) {
error_report("Could not load MIPS bios '%s'", bios_name); error_report("Could not load MIPS bios '%s'", machine->firmware);
exit(1); exit(1);
} }

6
hw/mips/malta.c
View File

@ -1333,7 +1333,7 @@ void mips_malta_init(MachineState *machine)
if (!dinfo) { if (!dinfo) {
/* Load a BIOS image. */ /* Load a BIOS image. */
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, filename = qemu_find_file(QEMU_FILE_TYPE_BIOS,
bios_name ?: BIOS_FILENAME); machine->firmware ?: BIOS_FILENAME);
if (filename) { if (filename) {
bios_size = load_image_targphys(filename, FLASH_ADDRESS, bios_size = load_image_targphys(filename, FLASH_ADDRESS,
BIOS_SIZE); BIOS_SIZE);
@ -1342,8 +1342,8 @@ void mips_malta_init(MachineState *machine)
bios_size = -1; bios_size = -1;
} }
if ((bios_size < 0 || bios_size > BIOS_SIZE) && if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
bios_name && !qtest_enabled()) { machine->firmware && !qtest_enabled()) {
error_report("Could not load MIPS bios '%s'", bios_name); error_report("Could not load MIPS bios '%s'", machine->firmware);
exit(1); exit(1);
} }
} }

6
hw/mips/mipssim.c
View File

@ -177,7 +177,7 @@ mips_mipssim_init(MachineState *machine)
/* Map the BIOS / boot exception handler. */ /* Map the BIOS / boot exception handler. */
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
/* Load a BIOS / boot exception handler image. */ /* Load a BIOS / boot exception handler image. */
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name ?: BIOS_FILENAME); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: BIOS_FILENAME);
if (filename) { if (filename) {
bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE); bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE);
g_free(filename); g_free(filename);
@ -185,9 +185,9 @@ mips_mipssim_init(MachineState *machine)
bios_size = -1; bios_size = -1;
} }
if ((bios_size < 0 || bios_size > BIOS_SIZE) && if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
bios_name && !qtest_enabled()) { machine->firmware && !qtest_enabled()) {
/* Bail out if we have neither a kernel image nor boot vector code. */ /* Bail out if we have neither a kernel image nor boot vector code. */
error_report("Could not load MIPS bios '%s'", bios_name); error_report("Could not load MIPS bios '%s'", machine->firmware);
exit(1); exit(1);
} else { } else {
/* We have a boot vector start address. */ /* We have a boot vector start address. */