mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-03 17:54:05 +00:00
hw/ppc/spapr.c: fail early if no firmware found in machine_init()
The firmware check consists on a file search (qemu_find_file) and load it via load_imag_targphys(). This validation is not dependent on any other machine state but it currently being done at the end of spapr_machine_init(). This means that we can do a lot of stuff and end up failing at the end for something that we can verify right out of the gate. Move this validation to the start of spapr_machine_init() to fail earlier. While we're at it, use g_autofree in the 'filename' pointer. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20220228175004.8862-3-danielhb413@gmail.com> Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
aebb9b9cb2
commit
5f2b96b38e
|
@ -2707,15 +2707,25 @@ static void spapr_machine_init(MachineState *machine)
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
const char *bios_default = spapr->vof ? FW_FILE_NAME_VOF : FW_FILE_NAME;
|
const char *bios_default = spapr->vof ? FW_FILE_NAME_VOF : FW_FILE_NAME;
|
||||||
const char *bios_name = machine->firmware ?: bios_default;
|
const char *bios_name = machine->firmware ?: bios_default;
|
||||||
|
g_autofree char *filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
||||||
const char *kernel_filename = machine->kernel_filename;
|
const char *kernel_filename = machine->kernel_filename;
|
||||||
const char *initrd_filename = machine->initrd_filename;
|
const char *initrd_filename = machine->initrd_filename;
|
||||||
PCIHostState *phb;
|
PCIHostState *phb;
|
||||||
int i;
|
int i;
|
||||||
MemoryRegion *sysmem = get_system_memory();
|
MemoryRegion *sysmem = get_system_memory();
|
||||||
long load_limit, fw_size;
|
long load_limit, fw_size;
|
||||||
char *filename;
|
|
||||||
Error *resize_hpt_err = NULL;
|
Error *resize_hpt_err = NULL;
|
||||||
|
|
||||||
|
if (!filename) {
|
||||||
|
error_report("Could not find LPAR firmware '%s'", bios_name);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
|
||||||
|
if (fw_size <= 0) {
|
||||||
|
error_report("Could not load LPAR firmware '%s'", filename);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if Secure VM (PEF) support is configured, then initialize it
|
* if Secure VM (PEF) support is configured, then initialize it
|
||||||
*/
|
*/
|
||||||
|
@ -2996,18 +3006,6 @@ static void spapr_machine_init(MachineState *machine)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
||||||
if (!filename) {
|
|
||||||
error_report("Could not find LPAR firmware '%s'", bios_name);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
|
|
||||||
if (fw_size <= 0) {
|
|
||||||
error_report("Could not load LPAR firmware '%s'", filename);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
g_free(filename);
|
|
||||||
|
|
||||||
/* FIXME: Should register things through the MachineState's qdev
|
/* FIXME: Should register things through the MachineState's qdev
|
||||||
* interface, this is a legacy from the sPAPREnvironment structure
|
* interface, this is a legacy from the sPAPREnvironment structure
|
||||||
* which predated MachineState but had a similar function */
|
* which predated MachineState but had a similar function */
|
||||||
|
|
Loading…
Reference in a new issue