[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 031/113] s390: remove bios_name
From: |
Paolo Bonzini |
Subject: |
[PULL 031/113] s390: remove bios_name |
Date: |
Wed, 2 Dec 2020 03:07:27 -0500 |
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201026143028.3034018-13-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/s390x/ipl.c | 8 ++------
hw/s390x/s390-virtio-ccw.c | 3 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 3d2652d75a..61e8c967d3 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -128,11 +128,7 @@ static void s390_ipl_realize(DeviceState *dev, Error
**errp)
if (!ipl->kernel || ipl->enforce_bios) {
uint64_t fwbase = (MIN(ram_size, 0x80000000U) - 0x200000) & ~0xffffUL;
- if (bios_name == NULL) {
- bios_name = ipl->firmware;
- }
-
- bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+ bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->firmware);
if (bios_filename == NULL) {
error_setg(errp, "could not find stage1 bootloader");
return;
@@ -154,7 +150,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
g_free(bios_filename);
if (bios_size == -1) {
- error_setg(errp, "could not load bootloader '%s'", bios_name);
+ error_setg(errp, "could not load bootloader '%s'", ipl->firmware);
return;
}
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4e140bbead..538229713a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -259,7 +259,8 @@ static void ccw_init(MachineState *machine)
/* get a BUS */
css_bus = virtual_css_bus_init();
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
- machine->initrd_filename, "s390-ccw.img",
+ machine->initrd_filename,
+ machine->firmware ?: "s390-ccw.img",
"s390-netboot.img", true);
dev = qdev_new(TYPE_S390_PCI_HOST_BRIDGE);
--
2.26.2
- [PULL 020/113] hw/net/xilinx_axienet: Rename StreamSlave as StreamSink, (continued)
- [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, 2020/12/02
- [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 <=
- [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
- [PULL 035/113] vl: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 034/113] digic: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 040/113] m68k: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 033/113] sparc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 041/113] microblaze: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 043/113] moxie: do not use ram_size global, Paolo Bonzini, 2020/12/02