From cc7e069760c0fb5205b525f77bad3cba60ba2120 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 16 Aug 2026 12:12:44 +0200 Subject: Testsuite: T9217: use separate SCSI controller for RAID-1 UEFI testcase "make testraid -- --uefi" fails. Install and first boot succeed normally under UEFI, but the test then simulates a failed RAID-1 member by wiping the primary disk and rebooting off the surviving mirror disk. That reboot never reaches a login prompt. OVMF only honors QEMU's per-device "bootindex" when disks sit behind separate PCI controllers; sharing one virtio-scsi-pci controller via SCSI LUN makes it always boot LUN 0 regardless of bootindex. --- scripts/check-qemu-install | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 49699a8f..e4ab6587 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -302,8 +302,14 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False -device scsi-hd,bus=scsi0.0,drive=drive-hd1,id=hd1,bootindex=1' if raid: - cmd += f' -drive format={disk_format},file={raid},if=none,media=disk,id=drive-hd2,readonly=off' \ - f' -device scsi-hd,bus=scsi0.0,drive=drive-hd2,id=hd2,bootindex=2' + # RAID member disks each get their own virtio-scsi-pci controller. + # OVMF only appears to honor QEMU's per-device "bootindex" when disks + # sit behind separate PCI controllers - sharing one controller via + # SCSI LUN makes it always boot LUN 0 regardless of bootindex, which + # breaks the RAID-failure simulation's boot-priority swap under UEFI. + cmd += f' -device virtio-scsi-pci,id=scsi1' \ + f' -drive format={disk_format},file={raid},if=none,media=disk,id=drive-hd2,readonly=off' \ + f' -device scsi-hd,bus=scsi1.0,drive=drive-hd2,id=hd2,bootindex=2' if tpm: cmd += f' -chardev socket,id=chrtpm,path={tpm_sock}' \ -- cgit v1.2.3