Merge pull request #1271 from c-po/smoketest-raid-uefi

Testsuite: T9217: use separate SCSI controller for RAID-1 UEFI testcase

Author: asklymenko

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}' \