[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 028/113] moxie: remove bios_name
From: |
Paolo Bonzini |
Subject: |
[PULL 028/113] moxie: remove bios_name |
Date: |
Wed, 2 Dec 2020 03:07:24 -0500 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026143028.3034018-10-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/moxie/moxiesim.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index a765e9f6be..d07d504c0d 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -133,9 +133,9 @@ static void moxiesim_init(MachineState *machine)
loader_params.initrd_filename = initrd_filename;
load_kernel(cpu, &loader_params);
}
- if (bios_name) {
- if (load_image_targphys(bios_name, FIRMWARE_BASE, FIRMWARE_SIZE) < 0) {
- error_report("Failed to load firmware '%s'", bios_name);
+ if (machine->firmware) {
+ if (load_image_targphys(machine->firmware, FIRMWARE_BASE,
FIRMWARE_SIZE) < 0) {
+ error_report("Failed to load firmware '%s'", machine->firmware);
}
}
--
2.26.2
- [PULL 015/113] hw/ssi/aspeed_smc: Rename 'max_slaves' variable as 'max_peripherals', (continued)
- [PULL 015/113] hw/ssi/aspeed_smc: Rename 'max_slaves' variable as 'max_peripherals', Paolo Bonzini, 2020/12/02
- [PULL 019/113] hw/dma/xilinx_axidma: Rename StreamSlave as StreamSink, Paolo Bonzini, 2020/12/02
- [PULL 022/113] arm: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 021/113] alpha: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 024/113] i386: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 025/113] lm32: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 020/113] hw/net/xilinx_axienet: Rename StreamSlave as StreamSink, Paolo Bonzini, 2020/12/02
- [PULL 027/113] mips: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 018/113] hw/core/stream: Rename StreamSlave as StreamSink, Paolo Bonzini, 2020/12/02
- [PULL 016/113] hw/ssi: Update coding style to make checkpatch.pl happy, Paolo Bonzini, 2020/12/02
- [PULL 028/113] moxie: remove bios_name,
Paolo Bonzini <=
- [PULL 017/113] hw/ssi: Rename SSI 'slave' as 'peripheral', Paolo Bonzini, 2020/12/02
- [PULL 023/113] hppa: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 026/113] m68k: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 030/113] rx: move BIOS load from MCU to board, Paolo Bonzini, 2020/12/02
- [PULL 037/113] cris: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 031/113] s390: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 038/113] hppa: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 036/113] arm: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 029/113] ppc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 032/113] sh4: remove bios_name, Paolo Bonzini, 2020/12/02