qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-01 17:35:17 +00:00 · 2022-11-08 08:24:04 +01:00 · 2022-11-08 08:24:04 +01:00 · 7b1d8933de
commit 7b1d8933de
parent f33d9ce977
28 changed files with 0 additions and 28 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -1415,7 +1415,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props,

 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
    { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault },
-    { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL },
    { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
    { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -76,7 +76,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -74,7 +74,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -41,7 +41,6 @@
  <flag name='loadparm'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -78,7 +78,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -76,7 +76,6 @@
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -77,7 +77,6 @@
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
  <flag name='vxhs'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -77,7 +77,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -74,7 +74,6 @@
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -75,7 +75,6 @@
  <flag name='pcie-root-port'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -39,7 +39,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='loadparm'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -78,7 +78,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -39,7 +39,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='loadparm'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
  <flag name='virtio-gpu-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -102,7 +102,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -85,7 +85,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -74,7 +74,6 @@
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -102,7 +102,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -85,7 +85,6 @@
  <flag name='query-cpu-definitions'/>
  <flag name='qemu-xhci'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -80,7 +80,6 @@
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -102,7 +102,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@ -79,7 +79,6 @@
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -102,7 +102,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@ -102,7 +102,6 @@
  <flag name='intel-iommu.eim'/>
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='chardev-reconnect'/>
-  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>