Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_process.c | 6 ++----
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
tests/testutilsqemu.c | 1 -
30 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d660b3b9f0..5ef2997ed4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -595,7 +595,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"intel-iommu.aw-bits", /* QEMU_CAPS_INTEL_IOMMU_AW_BITS */
"spapr-tpm-proxy", /* QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY */
"numa.hmat", /* QEMU_CAPS_NUMA_HMAT */
- "blockdev-hostdev-scsi", /* QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI */
+ "blockdev-hostdev-scsi", /* X_QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI */
/* 380 */
"usb-host.hostdevice", /* QEMU_CAPS_USB_HOST_HOSTDEVICE */
@@ -5228,7 +5228,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
/* While the removal of pre-blockdev code is in progress we always
hard-code
* the support for QEMU_CAPS_BLOCKDEV */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
* should be built with gcrypt to achieve FIPS compliance
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5ca177b599..89aa63cffe 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -574,7 +574,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for
syntax-check */
QEMU_CAPS_INTEL_IOMMU_AW_BITS, /* intel-iommu.aw-bits */
QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY, /* -device spapr-tpm-proxy */
QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
- QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs */
+ X_QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs
*/
/* 380 */
QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 260116dc67..980e06ce79 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5646,8 +5646,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
/* The code is being cleaned up to always assume the support for
* -blockdev thus we must no longer allow users to clear it */
- if (tmp == QEMU_CAPS_BLOCKDEV ||
- tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+ if (tmp == QEMU_CAPS_BLOCKDEV)
continue;
virQEMUCapsClear(priv->qemuCaps, tmp);
@@ -5676,8 +5675,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
/* The code is being cleaned up to always assume the support for
* -blockdev thus we must no longer allow users to clear it */
- if (tmp == QEMU_CAPS_BLOCKDEV ||
- tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+ if (tmp == QEMU_CAPS_BLOCKDEV)
continue;
virQEMUCapsClear(priv->qemuCaps, tmp);
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e1f69fbcde..1d16f61a72 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -138,7 +138,6 @@
<flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index c78ae4ee45..8a64694a8d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -139,7 +139,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='spapr-tpm-proxy'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 8c88873fc5..9b80f2b915 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -105,7 +105,6 @@
<flag name='fsdev.multidevs'/>
<flag name='virtio.packed'/>
<flag name='tcg'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 5fb954a7d2..b8ac4b3799 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -180,7 +180,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c4e2fb70aa..10a3a1024d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -148,7 +148,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 2c10b10122..94cdb860c4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -154,7 +154,6 @@
<flag name='pvscsi'/>
<flag name='spapr-tpm-proxy'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c170036059..49c4021e58 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -141,7 +141,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bf43ded774..2070c01937 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -187,7 +187,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index ce86189e15..b7c835bb14 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -64,7 +64,6 @@
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='ncr53c90'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index ea5df78e4b..b68f5857b4 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 174bd93bf2..e9df6a479e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -148,7 +148,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 61ae1574e4..aa7bd3b392 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -152,7 +152,6 @@
<flag name='pvscsi'/>
<flag name='spapr-tpm-proxy'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 612c73b851..61fbbcfd91 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -139,7 +139,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 2cb60c98c8..3ed4721e55 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -109,7 +109,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 087b721a61..cc5bccabe2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index ca3dca4369..416ed10e6d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -148,7 +148,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 65cb666714..e5d7782874 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -108,7 +108,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index aabcac1f5d..dfb2caa06e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 5d398181c2..161725a1e4 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index ec1a2d9cca..7034e01a3d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -157,7 +157,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 52b0af3d6e..8c1c8e0904 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -151,7 +151,6 @@
<flag name='pvscsi'/>
<flag name='spapr-tpm-proxy'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 243fb41ca8..606eb10e8c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 5700c5e06b..ad4b64f2a8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -158,7 +158,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index b2d48cc081..0bceeba596 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -161,7 +161,6 @@
<flag name='pvscsi'/>
<flag name='spapr-tpm-proxy'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 528be3c459..6ae458e577 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index a9cc271892..69b5ae7958 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -186,7 +186,6 @@
<flag name='cpu.migratable'/>
<flag name='intel-iommu.aw-bits'/>
<flag name='numa.hmat'/>
- <flag name='blockdev-hostdev-scsi'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
<flag name='block-export-add'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index d44dc09219..c34cb878de 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -858,7 +858,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
/* until removal of the flags is completed we force them also in tests */
virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV);
- virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
info->conf = conf;
info->args.newargs = true;
--
2.36.1
