]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: drop removed SCSI passthrough feature
authorFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 18 Sep 2024 10:54:51 +0000 (12:54 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 18 Sep 2024 23:14:39 +0000 (08:14 +0900)
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] https://github.com/qemu/qemu/commit/a271b8d7b2f39275a05e49deb7c8edc20b7a8279

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

index 6e8e3124ba9b84abd96eb583be4a43bf463095a2..f29677ce663f535c0a178887e6673a0973be2dc6 100755 (executable)
@@ -26,6 +26,6 @@ for bridge in range(1, 26):
         f"pci-bridge,id=pci_bridge{bridge},bus=pci_bridge{bridge - 1},chassis_nr={64 + bridge},addr=1",
     ]
 
-config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,scsi=off,bus=pci_bridge25,addr=1"]
+config["QemuArgs"] += ["-device", f"virtio-blk-pci,drive=drive0,bus=pci_bridge25,addr=1"]
 
 json.dump(config, sys.stdout)
index b5a70cafaf8c642b688075a7b384898373e2679f..2fd7bf2bfb97bca0b518a6b98f60813db064f737 100755 (executable)
@@ -464,7 +464,7 @@ testcase_long_sysfs_path() {
         qemu_opts+=("-device pci-bridge,id=pci_bridge$brid,bus=pci_bridge$((brid-1)),chassis_nr=$((64+brid))")
     done
 
-    qemu_opts+=("-device virtio-blk-pci,drive=drive0,scsi=off,bus=pci_bridge$brid")
+    qemu_opts+=("-device virtio-blk-pci,drive=drive0,bus=pci_bridge$brid")
 
     KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}"
     QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}"