From nobody Mon Feb 9 01:06:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1652778460; cv=none; d=zohomail.com; s=zohoarc; b=mK6onVRpcObUXXxVGFMogKSgL6HGxzifb39WaixRsGQd2yjiKkyYKFkSlXzpEVLoH0UjgWGWhfpvTa1fVqZ7V6wV8jd5Cb/mmDjCyikgCnx5dWjCHEHIouUjBG2NcKrG5QCy2Uxf21YgjVon+M0NGClMATQSRiorVbDbVzt9+5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652778460; 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=i7Ac84Zo30KNd4C+jVHj6MtNWV8kJ4LizUpPnH3pQzs=; b=PTOmvbG3BdVNbYHNdVSmdUJ/ppgZru5ykDyn6YiD3ydc+x0DvCZyKORYypNKiQUeDBssxuC6DRiZneZ41ZcOj28WNzldKEwPVwKf3p4Qkm6yh7cB7e/XAC75G/m/ggqaa7vPWkjmT8OkbUe4d7674ukz5Wllc0qMJ431gDp/feY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 165277846082471.23008156189474; Tue, 17 May 2022 02:07:40 -0700 (PDT) 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-301-4af8IJrROsent2VGcyXg3g-1; Tue, 17 May 2022 05:07:34 -0400 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 7F7E418A0161; Tue, 17 May 2022 09:07:32 +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 68CA940C1421; Tue, 17 May 2022 09:07:32 +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 B3D1119452D2; Tue, 17 May 2022 09:07:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 007F11947B85 for ; Tue, 17 May 2022 09:07:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E6308156D12C; Tue, 17 May 2022 09:07:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68E95156D120 for ; Tue, 17 May 2022 09:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652778459; 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=i7Ac84Zo30KNd4C+jVHj6MtNWV8kJ4LizUpPnH3pQzs=; b=iLEgrOkBg832Cbtwmi6fG1LxW1vQl+ikv1UAM5AJngEKnCy8JFVQsqVbYHmu2NOMvPuDux ViBMEXEWc2bfQcK3SShTR7h0J5V8hurlba5hCqeIzlmeA/y06BIN30YrmL4++onf5PfATZ 52BFB89utyXM27nz3UAaFv0m+1SC1AE= X-MC-Unique: 4af8IJrROsent2VGcyXg3g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/9] qemu: Convert passing of 'tapfds' to 'qemuFDPassDirect' Date: Tue, 17 May 2022 11:07:20 +0200 Message-Id: <75827e3f1f3cb206ecc2a8f839ccc210047a9d44.1652778351.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1652778462210100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 15 +++++---------- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ed7f0eafd2..bab2b0a99b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4244,7 +4244,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) if (netpriv->tapfds) { nfds =3D 0; for (n =3D netpriv->tapfds; n; n =3D n->next) { - virBufferAsprintf(&buf, "%s:", qemuFDPassGetPath(n->data)); + virBufferAsprintf(&buf, "%s:", qemuFDPassDirectGetPath(n->= data)); nfds++; } @@ -8738,16 +8738,13 @@ qemuBuildInterfaceConnect(virDomainObj *vm, /* 'vhostfd' is set to true in all cases when we need to process tapfd= s */ if (vhostfd) { - g_autofree char *prefix =3D g_strdup_printf("tapfd-%s", net->info.= alias); size_t i; for (i =3D 0; i < tapfdSize; i++) { - g_autoptr(qemuFDPass) pass =3D qemuFDPassNewDirect(prefix, pri= v); - g_autofree char *suffix =3D g_strdup_printf("%zu", i); + g_autofree char *name =3D g_strdup_printf("tapfd-%s%zu", net->= info.alias, i); int fd =3D tapfd[i]; /* we want to keep the array intact for s= ecurity labeling*/ - qemuFDPassAddFD(pass, &fd, suffix); - netpriv->tapfds =3D g_slist_prepend(netpriv->tapfds, g_steal_p= ointer(&pass)); + netpriv->tapfds =3D g_slist_prepend(netpriv->tapfds, qemuFDPas= sDirectNew(name, &fd)); } netpriv->tapfds =3D g_slist_reverse(netpriv->tapfds); @@ -8911,10 +8908,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; - for (n =3D netpriv->tapfds; n; n =3D n->next) { - if (qemuFDPassTransferCommand(n->data, cmd) < 0) - return -1; - } + for (n =3D netpriv->tapfds; n; n =3D n->next) + qemuFDPassDirectTransferCommand(n->data, cmd); for (n =3D netpriv->vhostfds; n; n =3D n->next) qemuFDPassDirectTransferCommand(n->data, cmd); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index eba556a6e7..f83ee55246 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1054,7 +1054,7 @@ qemuDomainNetworkPrivateClearFDs(qemuDomainNetworkPri= vate *priv) g_clear_pointer(&priv->slirpfd, qemuFDPassFree); g_clear_pointer(&priv->vdpafd, qemuFDPassFree); g_slist_free_full(g_steal_pointer(&priv->vhostfds), (GDestroyNotify) q= emuFDPassDirectFree); - g_slist_free_full(g_steal_pointer(&priv->tapfds), (GDestroyNotify) qem= uFDPassFree); + g_slist_free_full(g_steal_pointer(&priv->tapfds), (GDestroyNotify) qem= uFDPassDirectFree); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9475c30e0c..521df8ca01 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -404,7 +404,7 @@ struct _qemuDomainNetworkPrivate { /* file descriptor transfer helpers */ qemuFDPass *slirpfd; - GSList *tapfds; + GSList *tapfds; /* qemuFDPassDirect */ GSList *vhostfds; /* qemuFDPassDirect */ qemuFDPass *vdpafd; }; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index da0896a671..4ebb3c5818 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1373,7 +1373,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); for (n =3D netpriv->tapfds; n; n =3D n->next) { - if (qemuFDPassTransferMonitor(n->data, priv->mon) < 0) { + if (qemuFDPassDirectTransferMonitor(n->data, priv->mon) < 0) { qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -1525,7 +1525,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, netdev_name); for (n =3D netpriv->tapfds; n; n =3D n->next) - qemuFDPassTransferMonitorRollback(n->data, priv->mon); + qemuFDPassDirectTransferMonitorRollback(n->data, priv->mon); for (n =3D netpriv->vhostfds; n; n =3D n->next) qemuFDPassDirectTransferMonitorRollback(n->data, priv->mon); --=20 2.35.3