From nobody Mon Feb 9 00:50:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896332; cv=none; d=zohomail.com; s=zohoarc; b=ggRr1+fLHcguST5MZ6NerRstRBQvDZQiIulrRhOeWpwesvzQuz9cuMmNDcyXyaXZXCLOYm3KisMuOQ+/FmxuNdLN8rQcHR+b+TT7Smeuk+Pk5KDSDH02eDt7zVJW5q8d5edMhJmj92fuaVw9DqxifcQfe6Pve0n5Ty26NMMIMCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896332; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bWqMVqTNr/LdDgUzuQVTMDLYAk4sEkaUHH9mOQiCZkI=; b=KqbnhLoPKWA8JAavFcDmd0ozHtSN+MoSIGBu3qTjN7XAy5Xj2AGL62YGABHdHL7q9Q4NhUg1P2lpWWgU3OWHQC7lfGqY/WTq3Xj6E9oa1toK9CXYyy0pjmovS8e4uPrC7NSTnFnSDQnTBgoH2OvMTQJ3M9Qqsktc9P2WAICmsu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1667896332562421.376009530961; Tue, 8 Nov 2022 00:32:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-277-1rtvM_ahNPCUDF7oEryuZw-1; Tue, 08 Nov 2022 03:30:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6A54100F7F5; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C12CE40C94AD; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7842F1946589; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE37C19465A4 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A30524C816; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4795835429 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896331; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bWqMVqTNr/LdDgUzuQVTMDLYAk4sEkaUHH9mOQiCZkI=; b=AbRDv9d5d/2QUU1dmPNg4k7FebchgLlyx8IReGXRqhIPW7eMbr0ox71lrJRK8ZwAFifm9W 9xD6lzJYx+kN2f7nhHAZhascb1M3Zc++pgRa0VXxVh5mrdxVsHAGhHOYD6xHewNy0+hDvf NBKZd6Go+2Jj04H26lvzRfJxf+MILGI= X-MC-Unique: 1rtvM_ahNPCUDF7oEryuZw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 34/48] qemu: Assume QEMU_CAPS_VIRTIO_NET_FAILOVER Date: Tue, 8 Nov 2022 09:29:36 +0100 Message-Id: <8b64c3b625fd092a582a4a5c43834791c21f90a8.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896333344100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v4.2.0-rc0~23^2~4 the .failover 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: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/net-virtio-teaming.err | 1 - tests/qemuxml2argvtest.c | 3 --- tests/qemuxml2xmltest.c | 3 --- 4 files changed, 13 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.err diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c01bc6f8b5..243ec29c71 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1900,12 +1900,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNe= tDef *net, } =20 if (net->teaming) { - if (net->teaming->type !=3D VIR_DOMAIN_NET_TEAMING_TYPE_NONE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_FAILOVER)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-net failover (teaming) is not support= ed with this QEMU binary")); - return -1; - } if (net->teaming->type =3D=3D VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTE= NT && !virDomainNetIsVirtioModel(net)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.err b/tests/qemuxml2= argvdata/net-virtio-teaming.err deleted file mode 100644 index e49a1daa88..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-teaming.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: virtio-net failover (teaming) is not supported = with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 029e60947f..3b25c99639 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1468,11 +1468,8 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); 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); - DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-teaming"); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_NOCAPS("net-eth"); DO_TEST_NOCAPS("net-eth-ifname"); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3a117ff137..1b74a81f26 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -469,13 +469,10 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-network-portgroup"); DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST("net-virtio-teaming", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-network", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-isolated-port"); DO_TEST_NOCAPS("net-hostdev"); --=20 2.37.4