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/mac_oldworld.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/mac_oldworld.c')
| -rw-r--r-- | hw/ppc/mac_oldworld.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 6c59aa5601..11623e8e67 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -83,6 +83,7 @@ static void ppc_heathrow_reset(void *opaque) static void ppc_heathrow_init(MachineState *machine) { ram_addr_t ram_size = machine->ram_size; + const char *bios_name = machine->firmware ?: PROM_FILENAME; const char *boot_device = machine->boot_order; PowerPCCPU *cpu = NULL; CPUPPCState *env = NULL; @@ -130,9 +131,6 @@ static void ppc_heathrow_init(MachineState *machine) &error_fatal); memory_region_add_subregion(get_system_memory(), PROM_BASE, bios); - if (!bios_name) { - bios_name = PROM_FILENAME; - } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { /* Load OpenBIOS (ELF) */ |