[PATCH 26/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_RX_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 1f28c7c772..29a2cf6aaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = { - { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, NULL }, { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d240a0da7d..89f64801f9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -68,7 +68,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index c766c0cf4a..76cd22ca55 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 2bd0530e5e..80845b2eff 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 919f6363ba..773575996f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index e380e137fb..b3a415db32 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 9a689e43f6..5ec1468373 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -65,7 +65,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index b6bf1b0509..cc54899152 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 6fb38e874e..6d07593242 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 3f5577d84f..af6d109c6e 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 1df8f486b2..59412be9f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -69,7 +69,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index ff358bff1e..8071c6f551 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 06691ae0e7..ac0facce09 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -69,7 +69,6 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 06c4107783..69d7a30822 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index eaed31c884..6cd627dafb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index b26666c418..e011b87c17 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index ee3e832914..6ef18440be 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index d8432886a2..4e986cb73a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -88,7 +88,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 2236289dce..8a11065be6 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 954ad8d9c1..65aaeed167 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 9bad8cf7d1..b5a17ece5f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index ce275745f7..f92a93a801 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index dee827f4ff..9c07f29d4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 88171e1312..d7c24dac4d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -70,7 +70,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 6a1116d28b..d6a162c4b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 96a71a19c6..b378c1cd3b 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index e41e456597..b8e7fc5eee 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 7d93fce389..5ff97b088d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> -- 2.37.4