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>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 538ebe0edeb63d6e1dfb146f798e4febf1588e1f..8202e1eccaa83518f69b07e98c52453afc9368ec 100644 (file)
--- 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 },

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index be96f5e31e256b6097fa6b29518aa1c1c1ee9400..483e1a5d32fa6eb384dc25f4e42ca9fe2e042488 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 3210276ed1ec5e9a9cd3cecf389855faa5455925..a3eabbd66de1f0484662236fd7db964a36517dad 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 0503b343d0902a6f745b0eff6349d04f0f1b79c0..8f9b7f8e6c0221fa65e85639340edc9efdecda3c 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index bbf40d403f300c81b330af5fa38df80c8ec22e9f..9e92ac61d743cb0fb99165f0d17a3edaede6aeba 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c47a2f53750127388c8b6194842401d9a4ea3281..bd8a49c98afd2e3a1ec06394a469e7a7eb69de24 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index c3f4da9f18220e0527fc7c905174ad3e95ffbe91..3f250c17d9d9904be8fcb647e0acfb5aac51af16 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 2f34912311c0798d51a199eda859bbe193f4481d..381f2cb84a224a250b4b61c4d358b744ab0e8ace 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index ba60c522514c1fcaaa01368b105372d36ef9e0a5..d207ed6e301db695b789a7cb36efa5b52cdaf3fd 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 349139c1db926e74a91e43d4159011487ded186c..654088af75d506c6b6feb4f3f8cac3e15aad33be 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 60c0393b9ed0efe91ef680e0bcac1a1430e5e6eb..e25b49fa68a995322d12f4b9ec4b446178716b92 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index def3d7f682624bdcc924aad90114e467630227d5..63ab249b6dac70a68553ac0c2843934025821cd1 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 92861e8fa406702f1ef479244232152c13da1a35..de3a91fb582282f2eaa65608ed15f7b51b310af8 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index e4d7a0423ce382be87b71bc0e775e9257b55744d..0f18c2b5dd32052e155d994101169ebecde0e424 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index ad5fafb97957f4c458a3d8e8b95ce8ab48521f93..d3649604add27d20241d091e64341a5bf9976bf5 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index d8771361993d7654ff30f206158f87e7bae20357..6ec373e727516cb026dff5858886bb6c258041e6 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index d5e9c8d04b9de3745f9ed1b69e75c3d195426db7..7a8ef27b7c20aa4b5ca0243d8bd25c6688acb424 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 38256f4e1966727a3310a1d85b75d40fc1a3a235..ad5c43ea6f8ec158efbcedf515badad46a71074d 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index e1890008f5d34f30a60ca125165f85b3047673de..14e10b248044124037b5ef6737cd0a259d57ac4c 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index ccebad1f76fe84be2dec11ddf5650a1dec932b61..737e3ce902920f341022dba20b746697bfced04d 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 451f40a4cdc16b9960cb71cbef8dec2c15277e3d..8d2d43d9165629e13e0e422cbb28f635bdb265eb 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 2437b75663822106214883b068cf46f1863341d2..5d1f5dbb5e8001d99571205f17afd988aedf6ab1 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 38535a51c1b23ae21e48e0f8c6dc448046578c6d..89aaf97e01fff10248b7cc939297ebf6b1e01ed4 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 4a47b44060a8b838c98911a5e580bb670925ac05..8a496940133ab24ef9ce53ead8a5dd74cf54c182 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 9492ee9c80b13b1c53b579bbd9d4ec0047026b9c..b15a52c55a24a7ffb19dc132aeb2c6de60107218 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index 586b702e5c510f9ddd94dfc17a9e3e2a913e21b0..6c63704b03b78f4a180b884fff4bcb931b6f72c5 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index a28a88998e51976f5e0bac7eaab7a3c54acb744e..86643172668c9a5cc26ab90846ef04b059db9adf 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 2e96f5931332125d976817d50640d91a5a6a7c89..35b96c2a320772c69313110007d1529b307c883f 100644 (file)
--- 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'/>