From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 26 Oct 2020 14:30:17 +0000 (-0400)
Subject: hppa: remove bios_name
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b57e3e9785271a20b00f43d469b3011d0127e565;p=qemu.git

hppa: remove bios_name

Cc: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201026143028.3034018-5-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index d5164457ee..5e745d5ea9 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -213,8 +213,7 @@ static void machine_hppa_init(MachineState *machine)
        but one explicitly written for the emulation, we might as
        well load it directly from an ELF image.  */
     firmware_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS,
-                                       bios_name ? bios_name :
-                                       "hppa-firmware.img");
+                                       machine->firmware ?: "hppa-firmware.img");
     if (firmware_filename == NULL) {
         error_report("no firmware provided");
         exit(1);