diff options
| author | Paolo Bonzini | 2020-10-26 15:30:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-12-10 18:15:06 +0100 |
| commit | cd7b94989a468bbdca40f663f35ce954c44a8c3f (patch) | |
| tree | 568b77e814dc8ed05f12e59e7a11a4144aabbe10 /hw/ppc/spapr.c | |
| parent | moxie: remove bios_name (diff) | |
| download | qemu-cd7b94989a468bbdca40f663f35ce954c44a8c3f.tar.gz qemu-cd7b94989a468bbdca40f663f35ce954c44a8c3f.tar.xz qemu-cd7b94989a468bbdca40f663f35ce954c44a8c3f.zip | |
ppc: remove bios_name
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026143028.3034018-11-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/ppc/spapr.c')
| -rw-r--r-- | hw/ppc/spapr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c060702013..e87a3b8557 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2657,6 +2657,7 @@ static void spapr_machine_init(MachineState *machine) SpaprMachineState *spapr = SPAPR_MACHINE(machine); SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine); MachineClass *mc = MACHINE_GET_CLASS(machine); + const char *bios_name = machine->firmware ?: FW_FILE_NAME; const char *kernel_filename = machine->kernel_filename; const char *initrd_filename = machine->initrd_filename; PCIHostState *phb; @@ -2980,9 +2981,6 @@ static void spapr_machine_init(MachineState *machine) } } - if (bios_name == NULL) { - bios_name = FW_FILE_NAME; - } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (!filename) { error_report("Could not find LPAR firmware '%s'", bios_name); |