Skip to content

Commit 406928f

Browse files
mrc0mmandbluca
authored andcommitted
test: drop removed SCSI passthrough feature
This feature has been deprecated since QEMU 5.0 and finally removed in QEMU 9.1 [0] which now causes issues when running the storage tests on latest Arch: ------ testcase_long_sysfs_path: BEGIN ------ ... qemu-system-x86_64: -device virtio-blk-pci,drive=drive0,scsi=off,bus=pci_bridge25: Property 'virtio-blk-pci.scsi' not found E: qemu failed with exit code 1 [0] qemu/qemu@a271b8d (cherry picked from commit cd57920)
1 parent abd44e2 commit 406928f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ for bridge in range(1, 26):
2626
f"pci-bridge,id=pci_bridge{bridge},bus=pci_bridge{bridge - 1},chassis_nr={64 + bridge},addr=1",
2727
]
2828

29-
config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,scsi=off,bus=pci_bridge25,addr=1"]
29+
config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,bus=pci_bridge25,addr=1"]
3030

3131
json.dump(config, sys.stdout)

test/TEST-64-UDEV-STORAGE/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ testcase_long_sysfs_path() {
464464
qemu_opts+=("-device pci-bridge,id=pci_bridge$brid,bus=pci_bridge$((brid-1)),chassis_nr=$((64+brid))")
465465
done
466466

467-
qemu_opts+=("-device virtio-blk-pci,drive=drive0,scsi=off,bus=pci_bridge$brid")
467+
qemu_opts+=("-device virtio-blk-pci,drive=drive0,bus=pci_bridge$brid")
468468

469469
KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}"
470470
QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}"

0 commit comments

Comments
 (0)