On 05/11/2024 17.42, Jared Rossi wrote:
Hi Thomas, Sebastian,It looks like this is simply caused by the "is_cdrom" value only ever being set to true. I think it is a one-line fix that just makes sure to initialize the value to false each time we try a new device: diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index a4d1c05aac..3fdba0bedc 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -214,6 +214,7 @@ static void boot_setup(void) static bool find_boot_device(void) { VDev *vdev = virtio_get_device(); + vdev->is_cdrom = false; bool found = false; switch (iplb.pbt) { I tested it with the two scenarios you mention and with the existing qtests, and it seems to work correctly now.
Agreed, this seems to fix the issue when all devices are properly marked with bootindex properties. But it still persists in case the BIOS has to scan for the boot device, e.g.:
qemu-system-s390x -accel kvm -m 2G -nographic \ -drive if=none,id=d1,file=/tmp/bad.dat,format=raw,media=cdrom \ -device virtio-scsi -device scsi-cd,drive=d1 \ -drive if=none,id=d2,file=good.qcow2 -device virtio-blk,drive=d2 Isn't there a better place to set the is_cdrom variable? Thomas
