[PATCH 41/48] 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(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - 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.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.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 538ebe0ede..8202e1ecca 100644 --- 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 be96f5e31e..483e1a5d32 100644 --- 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 3210276ed1..a3eabbd66d 100644 --- 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 0503b343d0..8f9b7f8e6c 100644 --- 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 bbf40d403f..9e92ac61d7 100644 --- 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 c47a2f5375..bd8a49c98a 100644 --- 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 c3f4da9f18..3f250c17d9 100644 --- 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 2f34912311..381f2cb84a 100644 --- 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 ba60c52251..d207ed6e30 100644 --- 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 349139c1db..654088af75 100644 --- 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 60c0393b9e..e25b49fa68 100644 --- 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 def3d7f682..63ab249b6d 100644 --- 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 92861e8fa4..de3a91fb58 100644 --- 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 e4d7a0423c..0f18c2b5dd 100644 --- 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 ad5fafb979..d3649604ad 100644 --- 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 d877136199..6ec373e727 100644 --- 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 d5e9c8d04b..7a8ef27b7c 100644 --- 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 38256f4e19..ad5c43ea6f 100644 --- 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 e1890008f5..14e10b2480 100644 --- 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 ccebad1f76..737e3ce902 100644 --- 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 451f40a4cd..8d2d43d916 100644 --- 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 2437b75663..5d1f5dbb5e 100644 --- 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 38535a51c1..89aaf97e01 100644 --- 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 4a47b44060..8a49694013 100644 --- 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 9492ee9c80..b15a52c55a 100644 --- 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 586b702e5c..6c63704b03 100644 --- 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 a28a88998e..8664317266 100644 --- 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 2e96f59313..35b96c2a32 100644 --- 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'/> -- 2.37.4