From nobody Mon Feb 9 14:02:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1770403082; cv=none; d=zohomail.com; s=zohoarc; b=X3JwfK8FcWhn+tumEEL2YJE594ze3N8b65Gf1uihe1MSaINBn0tJkWtHnWLWtQEV3SeCYpfSBvlZWQvjrQVE0HuPj0EGzo4sXqYJqabeCG2+2NJ4sPRnHEcRUen2nDmTA+oyaQ/6q58AoOTN1IMNlhv48VnTTK7qvSrZ0LameLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770403082; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Vi9MtWIIU77ru49ZNNA2apbDMT1IlLZ8vX8ZY3MJbZw=; b=c37nIEEQ58MnNK8YP7+2GDMQl6C8QwMlYW0d9nkbxdUM93O0NsJk+1CTbS/7aoIvDcPKHsDte5vIcr1lhx9SALulR0i4PYiN+Kjvakx2MzJSqWCHwhDesRCVEW60M1wLIHMqlcEaR4Gc/6q1oHKvj0nTwwbs7btNCIt4LZmFEj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1770403082324872.9373977287496; Fri, 6 Feb 2026 10:38:02 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 7685441AA9; Fri, 6 Feb 2026 13:38:01 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7C42543E4F; Fri, 6 Feb 2026 13:33:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 435643FA60; Fri, 6 Feb 2026 13:33:32 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E367B43DB6 for ; Fri, 6 Feb 2026 13:28:17 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-r9RXZAgiNKuN6BlV0cKXxQ-1; Fri, 06 Feb 2026 13:28:16 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CD661955E72 for ; Fri, 6 Feb 2026 18:28:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.3]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 95D8A18003F6 for ; Fri, 6 Feb 2026 18:28:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770402497; h=from:from: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; bh=Vi9MtWIIU77ru49ZNNA2apbDMT1IlLZ8vX8ZY3MJbZw=; b=Q4H1GDPNWY1Ud/7ZtcHIit3Ur/ppMjaI/+HzTAekOoRk6GcuKM6cAdZWFl52dWo0whVdu3 C41xwtpICxYUYayy8xa4i9x6kGChLv0akJfUs2LDfz8mu9ydelw84H2pR1++ot+IisaSmq mqQq+KNOi3G5sa6L5W+/77ksV+m9+mQ= X-MC-Unique: r9RXZAgiNKuN6BlV0cKXxQ-1 X-Mimecast-MFC-AGG-ID: r9RXZAgiNKuN6BlV0cKXxQ_1770402495 To: devel@lists.libvirt.org Subject: [PATCH 4/5] qemuBuildHostNetProps: Use 'fds', 'vhostfds' with QEMU_CAPS_NETDEV_TAP_FD_VHOSTFD_PLURAL Date: Fri, 6 Feb 2026 19:28:06 +0100 Message-ID: <5f66469bfd70a70e853038380ab55b7903de0655.1770397360.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Zj1dsJGxhaPopRbx-Wa71vIUX-rHZWMXdpKfeq44Qck_1770402495 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GC3GHA2LBPWQ2D2IY4K5BHRNGV23BM4R X-Message-ID-Hash: GC3GHA2LBPWQ2D2IY4K5BHRNGV23BM4R X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1770403084527158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa QEMU is going to deprecate the singular spelling for single FDs soon with the guidance to use the plural. Since we can't/are unsure about using that with older QEMUs do the change based on the capability. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 11 +++++++---- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ca6779a6ea..e6ce9492a3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3925,7 +3925,8 @@ qemuBuildHostNetSocketAddr(virDomainNetDef *net) virJSONValue * qemuBuildHostNetProps(virDomainObj *vm, - virDomainNetDef *net) + virDomainNetDef *net, + virQEMUCaps *qemuCaps) { virDomainNetType netType =3D virDomainNetGetActualType(net); size_t i; @@ -3967,7 +3968,8 @@ qemuBuildHostNetProps(virDomainObj *vm, nfds++; } - if (nfds > 1) + if (nfds > 1 || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_TAP_FD_VHOSTFD_P= LURAL)) tapfd_field =3D "s:fds"; } @@ -3983,7 +3985,8 @@ qemuBuildHostNetProps(virDomainObj *vm, nfds++; } - if (nfds > 1) + if (nfds > 1 || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV_TAP_FD_VHOSTFD_P= LURAL)) vhostfd_field =3D "s:vhostfds"; } @@ -9147,7 +9150,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd); qemuFDPassTransferCommand(netpriv->vdpafd, cmd); - if (!(hostnetprops =3D qemuBuildHostNetProps(vm, net))) + if (!(hostnetprops =3D qemuBuildHostNetProps(vm, net, qemuCaps))) goto cleanup; if (qemuBuildNetdevCommandlineFromJSON(cmd, hostnetprops, qemuCaps) < = 0) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index ad068f1f16..12e70bf180 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ qemuBuildChannelGuestfwdNetdevProps(virDomainChrDef *chr); virJSONValue * qemuBuildHostNetProps(virDomainObj *vm, - virDomainNetDef *net); + virDomainNetDef *net, + virQEMUCaps *qemuCaps); int qemuBuildInterfaceConnect(virDomainObj *vm, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f786248e70..2ed7a3b163 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1388,7 +1388,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; - if (!(netprops =3D qemuBuildHostNetProps(vm, net))) + if (!(netprops =3D qemuBuildHostNetProps(vm, net, priv->qemuCaps))) goto cleanup; qemuDomainObjEnterMonitor(vm); --=20 2.53.0