On 27/10/20 09:38, Christian Borntraeger wrote:
>>
>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>> index e52182f946..a521eba673 100644
>> --- a/hw/s390x/s390-virtio-ccw.c
>> +++ b/hw/s390x/s390-virtio-ccw.c
>> @@ -258,7 +258,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",
> Adding the elvis operator is actually a fix, no?
>
I think it was already doing the equivalent here in s390_ipl_realize
if (bios_name == NULL) {
bios_name = ipl->firmware;
}
bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
so it was just an encapsulation violation on part of the IPL device.
Paolo
