summaryrefslogtreecommitdiffstats
path: root/hw/s390x/s390-virtio-ccw.c
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-26 15:30:25 +0100
committerPaolo Bonzini2020-12-10 18:15:06 +0100
commitf03443954b5bab576880e373de8bd221a0818b02 (patch)
tree53eb3cd5f3dc427e55b7937e6f137b5788f73be5 /hw/s390x/s390-virtio-ccw.c
parentrx: move BIOS load from MCU to board (diff)
downloadqemu-f03443954b5bab576880e373de8bd221a0818b02.tar.gz
qemu-f03443954b5bab576880e373de8bd221a0818b02.tar.xz
qemu-f03443954b5bab576880e373de8bd221a0818b02.zip
s390: remove bios_name
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>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
-rw-r--r--hw/s390x/s390-virtio-ccw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index f0ee8dae68..a6324d94f1 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);