From d0249ce5a8d11564958262fd567d1ea770358134 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 22 Apr 2013 16:52:53 +0200 Subject: S390: IPL: Use different firmware for different machines We have a virtio-s390 and a virtio-ccw machine in QEMU. Both use vastly different ways to do I/O. Having the same firmware blob for both doesn't really make any sense. Instead, let's parametrize the firmware file name, so that we can have different blobs for different machines. Signed-off-by: Alexander Graf --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/s390x/s390-virtio-ccw.c') diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a49e4401cd..8ea193e244 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -83,7 +83,7 @@ static void ccw_init(QEMUMachineInitArgs *args) css_bus = virtual_css_bus_init(); s390_sclp_init(); s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline, - args->initrd_filename); + args->initrd_filename, "s390-zipl.rom"); /* register hypercalls */ virtio_ccw_register_hcalls(); -- cgit v1.2.3