diff mbox series

[04/15] hppa: remove bios_name

Message ID 20201026143028.3034018-5-pbonzini@redhat.com
State Accepted
Commit b57e3e9785271a20b00f43d469b3011d0127e565
Headers show
Series remove bios_name variable | expand

Commit Message

Paolo Bonzini Oct. 26, 2020, 2:30 p.m. UTC 
Cc: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/hppa/machine.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Alex Bennée Oct. 26, 2020, 5:12 p.m. UTC | #1 
Paolo Bonzini <pbonzini@redhat.com> writes:

> Cc: Richard Henderson <richard.henderson@linaro.org>

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


-- 
Alex Bennée
Philippe Mathieu-Daudé Oct. 26, 2020, 6:11 p.m. UTC | #2 
On 10/26/20 3:30 PM, Paolo Bonzini wrote:
> Cc: Richard Henderson <richard.henderson@linaro.org>

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

> ---

>   hw/hppa/machine.c | 3 +--

>   1 file changed, 1 insertion(+), 2 deletions(-)

> 


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff mbox series

Patch

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);