diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-09-18 12:54:51 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-09-19 01:14:39 +0200 |
| commit | cd57920fbf6a8f7769a82cfc9bebc12965de0199 (patch) | |
| tree | 17f673e23b41d2d8fb7d9c412a76045250523513 | |
| parent | nsresourced: fix build without libbpf (diff) | |
| download | systemd-cd57920fbf6a8f7769a82cfc9bebc12965de0199.tar.xz systemd-cd57920fbf6a8f7769a82cfc9bebc12965de0199.zip | |
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] https://github.com/qemu/qemu/commit/a271b8d7b2f39275a05e49deb7c8edc20b7a8279
| -rwxr-xr-x | test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure | 2 | ||||
| -rwxr-xr-x | test/TEST-64-UDEV-STORAGE/test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure b/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure index 6e8e3124ba..f29677ce66 100755 --- a/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure +++ b/test/TEST-64-UDEV-STORAGE/long_sysfs_path.configure @@ -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) diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh index b5a70cafaf..2fd7bf2bfb 100755 --- a/test/TEST-64-UDEV-STORAGE/test.sh +++ b/test/TEST-64-UDEV-STORAGE/test.sh @@ -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:-}" |