From 7fd84651871d3cd0e0a0ef0938767623d294a956 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 7 Nov 2022 15:06:49 +0100 Subject: [PATCH] qemu: Assume QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 4 +--- tests/qemuxml2xmltest.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 78c68a99d0..74631378c6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -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) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dd2460bc0b..98ba6633f8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -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); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 45e16ce02d..22397f209f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -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, -- 2.39.5