qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

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 */
@@ -5227,7 +5227,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

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 */

src/qemu/qemu_process.c

@@ -5625,8 +5625,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 ||
+            if (tmp == QEMU_CAPS_BLOCKDEV)
-                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
                 continue;
 
             virQEMUCapsClear(priv->qemuCaps, tmp);
@@ -5655,8 +5654,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 ||
+            if (tmp == QEMU_CAPS_BLOCKDEV)
-                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
                 continue;
 
             virQEMUCapsClear(priv->qemuCaps, tmp);

tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml

@@ -137,7 +137,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'/>

tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml

@@ -138,7 +138,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'/>

tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml

@@ -104,7 +104,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'/>

tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml

@@ -179,7 +179,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'/>

tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml

@@ -147,7 +147,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'/>

tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml

@@ -153,7 +153,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'/>

tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml

@@ -140,7 +140,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'/>

tests/qemucapabilitiesdata/caps_5.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='dc390'/>
   <flag name='am53c974'/>
   <flag name='virtio-pmem-pci'/>

tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml

@@ -63,7 +63,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'/>

tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml

@@ -147,7 +147,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'/>

tests/qemucapabilitiesdata/caps_5.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='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>

tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml

@@ -138,7 +138,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'/>

tests/qemucapabilitiesdata/caps_5.2.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'/>

tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml

@@ -147,7 +147,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'/>

tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml

@@ -107,7 +107,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'/>

tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml

@@ -156,7 +156,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'/>

tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml

@@ -150,7 +150,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'/>

tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_7.0.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'/>

tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml

@@ -160,7 +160,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'/>

tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml

@@ -185,7 +185,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'/>

tests/testutilsqemu.c

@@ -885,7 +885,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;