[PATCH 32/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_HOST_MTU

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 33bedbb7e5..c91ffe4936 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[] = { - { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index dee48940c2..0ca14c0c8a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -72,7 +72,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index a3a0cd6f6f..d1f129e082 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 6e93dffe7d..0219143b00 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -38,7 +38,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index fab759da81..5cf91a2e82 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 8eb16fb09f..2e06e7db5e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 2a9d308ede..ca835b9d4f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 8f6bdc9138..c1ffd75173 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 554c04ed11..354a03d898 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index dd5d19f836..3ea4f6bd87 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index b0178d4db0..82f3d77d62 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index d73b839a84..bf5f455bf0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index b7bf347186..ae0b230f89 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -72,7 +72,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 6d310929a5..e61d434026 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index f6f608e6a4..7dc2839c88 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 3cb22c00f1..4fce7293fc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index c13b1fbdb4..c66e92a4ef 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 0ea45334db..1f7dde4ea0 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -93,7 +93,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 61cec49e73..2ae7af59dd 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 546772bb08..1885a7d317 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index a8ec01363d..6a5c8e896c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 70e28a53e0..5a52832a99 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 7b368407ac..c7a2ce50b9 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index fa1ffe3e83..4022323331 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 437fdfde22..2aaf30d4a6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 4779e01b9e..35ab888fe2 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 93315c6f53..71654915c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 49e88a572a..bb4ee25f98 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> -- 2.37.4