summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-26 15:30:19 +0100
committerPaolo Bonzini2020-12-10 18:15:05 +0100
commita408b81b2c6de437db7d6bd4aa8189185608b705 (patch)
treedd284b22dadbac77ad25c2f1bfcb7e12ed090dcb
parenti386: remove bios_name (diff)
downloadqemu-a408b81b2c6de437db7d6bd4aa8189185608b705.tar.gz
qemu-a408b81b2c6de437db7d6bd4aa8189185608b705.tar.xz
qemu-a408b81b2c6de437db7d6bd4aa8189185608b705.zip
lm32: remove bios_name
Cc: Michael Walle <michael@walle.cc> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20201026143028.3034018-7-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/lm32/milkymist.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 9ef94883d5..93ca8bc2ac 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -108,6 +108,7 @@ static void
milkymist_init(MachineState *machine)
{
MachineClass *mc = MACHINE_GET_CLASS(machine);
+ const char *bios_name = machine->firmware ?: BIOS_FILENAME;
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
@@ -162,9 +163,6 @@ milkymist_init(MachineState *machine)
}
/* load bios rom */
- if (bios_name == NULL) {
- bios_name = BIOS_FILENAME;
- }
bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (bios_filename) {