diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-26 10:30:20 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:05 -0500 |
| commit | 1684273ca8144d8f7dc9c8e9fea17753a9c09fd8 (patch) | |
| tree | abca010f68c5fb5c2ad52c63a986068b1c3c3ae7 /hw/m68k/q800.c | |
| parent | a408b81b2c6de437db7d6bd4aa8189185608b705 (diff) | |
| download | qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.zip qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.tar.gz qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.tar.bz2 | |
m68k: remove bios_name
Cc: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201026143028.3034018-8-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/m68k/q800.c')
| -rw-r--r-- | hw/m68k/q800.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index ce4b47c..6ebcddc 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -167,6 +167,7 @@ static void q800_init(MachineState *machine) const char *kernel_filename = machine->kernel_filename; const char *initrd_filename = machine->initrd_filename; const char *kernel_cmdline = machine->kernel_cmdline; + const char *bios_name = machine->firmware ?: MACROM_FILENAME; hwaddr parameters_base; CPUState *cs; DeviceState *dev; @@ -400,9 +401,6 @@ static void q800_init(MachineState *machine) rom = g_malloc(sizeof(*rom)); memory_region_init_rom(rom, NULL, "m68k_mac.rom", MACROM_SIZE, &error_abort); - if (bios_name == NULL) { - bios_name = MACROM_FILENAME; - } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); memory_region_add_subregion(get_system_memory(), MACROM_ADDR, rom); |