qemu: Assume QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE

Introduced in QEMU's commit of v2.8.0-rc0~116^2~26 the
.rx_queue_size attribute of virtio-net device is always available
for all QEMU versions we support (4.2.0, currently). Therefore,
we can assume the capability is always set and thus doesn't need
to be checked for.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-11-07 15:06:49 +01:00
parent 4a7ec2b8d4
commit 7fd8465187
3 changed files with 1 additions and 10 deletions

View File

@ -1866,12 +1866,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net,
_("rx_queue_size has to be a power of two"));
return -1;
}
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("virtio rx_queue_size option is not supported "
"with this QEMU binary"));
return -1;
}
}
if (net->driver.virtio.tx_queue_size) {

View File

@ -1466,10 +1466,8 @@ mymain(void)
DO_TEST_NOCAPS("net-virtio-netdev");
DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x");
DO_TEST("net-virtio-rxtxqueuesize",
QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE,
QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE);
DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size",
QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE);
DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size");
DO_TEST("net-virtio-teaming",
QEMU_CAPS_VIRTIO_NET_FAILOVER,
QEMU_CAPS_DEVICE_VFIO_PCI);

View File

@ -468,7 +468,6 @@ mymain(void)
DO_TEST_NOCAPS("net-eth-unmanaged-tap");
DO_TEST_NOCAPS("net-virtio-network-portgroup");
DO_TEST("net-virtio-rxtxqueuesize",
QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE,
QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE);
DO_TEST("net-virtio-teaming",
QEMU_CAPS_VIRTIO_NET_FAILOVER,