arm: remove bios_name
Get the firmware name from the MachineState object. Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20201026143028.3034018-4-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
2c4a83eb82
commit
0ad3b5d3ee
|
@ -40,7 +40,7 @@ static void cubieboard_init(MachineState *machine)
|
||||||
DeviceState *carddev;
|
DeviceState *carddev;
|
||||||
|
|
||||||
/* BIOS is not supported by this board */
|
/* BIOS is not supported by this board */
|
||||||
if (bios_name) {
|
if (machine->firmware) {
|
||||||
error_report("BIOS not supported for this machine");
|
error_report("BIOS not supported for this machine");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -297,16 +297,16 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
||||||
memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000,
|
memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000,
|
||||||
&error_fatal);
|
&error_fatal);
|
||||||
memory_region_add_subregion(sysmem, 0xfff88000, sysram);
|
memory_region_add_subregion(sysmem, 0xfff88000, sysram);
|
||||||
if (bios_name != NULL) {
|
if (machine->firmware != NULL) {
|
||||||
sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware);
|
||||||
if (sysboot_filename != NULL) {
|
if (sysboot_filename != NULL) {
|
||||||
if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) < 0) {
|
if (load_image_targphys(sysboot_filename, 0xfff88000, 0x8000) < 0) {
|
||||||
error_report("Unable to load %s", bios_name);
|
error_report("Unable to load %s", machine->firmware);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
g_free(sysboot_filename);
|
g_free(sysboot_filename);
|
||||||
} else {
|
} else {
|
||||||
error_report("Unable to find %s", bios_name);
|
error_report("Unable to find %s", machine->firmware);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,13 +33,10 @@ static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin";
|
||||||
|
|
||||||
static void npcm7xx_load_bootrom(MachineState *machine, NPCM7xxState *soc)
|
static void npcm7xx_load_bootrom(MachineState *machine, NPCM7xxState *soc)
|
||||||
{
|
{
|
||||||
|
const char *bios_name = machine->firmware ?: npcm7xx_default_bootrom;
|
||||||
g_autofree char *filename = NULL;
|
g_autofree char *filename = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!bios_name) {
|
|
||||||
bios_name = npcm7xx_default_bootrom;
|
|
||||||
}
|
|
||||||
|
|
||||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
||||||
if (!filename) {
|
if (!filename) {
|
||||||
error_report("Could not find ROM image '%s'", bios_name);
|
error_report("Could not find ROM image '%s'", bios_name);
|
||||||
|
|
|
@ -41,7 +41,7 @@ static void orangepi_init(MachineState *machine)
|
||||||
DeviceState *carddev;
|
DeviceState *carddev;
|
||||||
|
|
||||||
/* BIOS is not supported by this board */
|
/* BIOS is not supported by this board */
|
||||||
if (bios_name) {
|
if (machine->firmware) {
|
||||||
error_report("BIOS not supported for this machine");
|
error_report("BIOS not supported for this machine");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -319,6 +319,7 @@ static bool sbsa_firmware_init(SBSAMachineState *sms,
|
||||||
MemoryRegion *sysmem,
|
MemoryRegion *sysmem,
|
||||||
MemoryRegion *secure_sysmem)
|
MemoryRegion *secure_sysmem)
|
||||||
{
|
{
|
||||||
|
const char *bios_name;
|
||||||
int i;
|
int i;
|
||||||
BlockBackend *pflash_blk0;
|
BlockBackend *pflash_blk0;
|
||||||
|
|
||||||
|
@ -332,6 +333,7 @@ static bool sbsa_firmware_init(SBSAMachineState *sms,
|
||||||
|
|
||||||
pflash_blk0 = pflash_cfi01_get_blk(sms->flash[0]);
|
pflash_blk0 = pflash_cfi01_get_blk(sms->flash[0]);
|
||||||
|
|
||||||
|
bios_name = MACHINE(sms)->firmware;
|
||||||
if (bios_name) {
|
if (bios_name) {
|
||||||
char *fname;
|
char *fname;
|
||||||
MemoryRegion *mr;
|
MemoryRegion *mr;
|
||||||
|
|
|
@ -560,7 +560,7 @@ static void vexpress_common_init(MachineState *machine)
|
||||||
/*
|
/*
|
||||||
* If a bios file was provided, attempt to map it into memory
|
* If a bios file was provided, attempt to map it into memory
|
||||||
*/
|
*/
|
||||||
if (bios_name) {
|
if (machine->firmware) {
|
||||||
char *fn;
|
char *fn;
|
||||||
int image_size;
|
int image_size;
|
||||||
|
|
||||||
|
@ -570,16 +570,16 @@ static void vexpress_common_init(MachineState *machine)
|
||||||
"but you cannot use both options at once");
|
"but you cannot use both options at once");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware);
|
||||||
if (!fn) {
|
if (!fn) {
|
||||||
error_report("Could not find ROM image '%s'", bios_name);
|
error_report("Could not find ROM image '%s'", machine->firmware);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
image_size = load_image_targphys(fn, map[VE_NORFLASH0],
|
image_size = load_image_targphys(fn, map[VE_NORFLASH0],
|
||||||
VEXPRESS_FLASH_SIZE);
|
VEXPRESS_FLASH_SIZE);
|
||||||
g_free(fn);
|
g_free(fn);
|
||||||
if (image_size < 0) {
|
if (image_size < 0) {
|
||||||
error_report("Could not load ROM image '%s'", bios_name);
|
error_report("Could not load ROM image '%s'", machine->firmware);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1047,6 +1047,7 @@ static bool virt_firmware_init(VirtMachineState *vms,
|
||||||
MemoryRegion *secure_sysmem)
|
MemoryRegion *secure_sysmem)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
const char *bios_name;
|
||||||
BlockBackend *pflash_blk0;
|
BlockBackend *pflash_blk0;
|
||||||
|
|
||||||
/* Map legacy -drive if=pflash to machine properties */
|
/* Map legacy -drive if=pflash to machine properties */
|
||||||
|
@ -1059,6 +1060,7 @@ static bool virt_firmware_init(VirtMachineState *vms,
|
||||||
|
|
||||||
pflash_blk0 = pflash_cfi01_get_blk(vms->flash[0]);
|
pflash_blk0 = pflash_cfi01_get_blk(vms->flash[0]);
|
||||||
|
|
||||||
|
bios_name = MACHINE(vms)->firmware;
|
||||||
if (bios_name) {
|
if (bios_name) {
|
||||||
char *fname;
|
char *fname;
|
||||||
MemoryRegion *mr;
|
MemoryRegion *mr;
|
||||||
|
|
Loading…
Reference in New Issue