From nobody Mon Feb 9 01:21:48 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=1652778456; cv=none; d=zohomail.com; s=zohoarc; b=NNGdD2jK6pwoi1TpYeCxTwf0fytZgcQpVVnkR8k+fUoQVXLYPxBzU0JxaekAwo8kKxkwtUXWQLYlF0QJYKritUYVdVVJNaLBMaSEwakHH8E+3D44F52ZMoM0v528Ua2qeKJIGWcqlTsRF1rZ0OqfrYu8oBjjGSVslM/DlKstEnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652778456; 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=3tmvd/X7f0gPK1uVj1p26nPd9b+CSfXsnHuORcwoQ/k=; b=MjVIxKiVgf/0iuLWsqyN174IGVrXIOxB8Ev2zaK1d71vwkEuI6B1XGq2Ye50aUpIa0vQ+qEWcoZslMcmDYsyycanXK6c/xDlnaTVyU5n4p2ziEZJbgy0IqA73mTjyiUkiP9CGUHaIiTmAqFDXhPLhcuDe17191ImAq2GbgFuWGc= 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 1652778456991513.4905477135726; Tue, 17 May 2022 02:07:36 -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-269-qoMDukDsMt-l5-PGk-1Geg-1; Tue, 17 May 2022 05:07:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08D8C805F71; 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 E8971492C14; Tue, 17 May 2022 09:07:31 +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 E06CD1947056; Tue, 17 May 2022 09:07:30 +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 2C463194705F for ; Tue, 17 May 2022 09:07:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1BA32156D12B; 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 92206156D120 for ; Tue, 17 May 2022 09:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652778455; 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=3tmvd/X7f0gPK1uVj1p26nPd9b+CSfXsnHuORcwoQ/k=; b=ScUEm3GtU4cCoKDTdF3xguTetrm7i5tWz/JTOozVjVNMSOyY/s97HSDIm0rfTL8LzyiwUX ri4I54bpmdqklFEO2JFiglXNUnZofn5gtZZSf5KNs1V55ZOiG3avQaM2TKyVU6Vw7ziJ/w a28ODbE2GE9Ub06mpDscoNc3gBYCOLo= X-MC-Unique: qoMDukDsMt-l5-PGk-1Geg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/9] qemu: Convert passing of 'vhostfd' to 'qemuFDPassDirect' Date: Tue, 17 May 2022 11:07:19 +0200 Message-Id: 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.85 on 10.11.54.10 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: 1652778458221100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 8 +++----- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_interface.c | 8 ++------ tests/qemuxml2argvmock.c | 10 +++------- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a52ba70066..ed7f0eafd2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4260,7 +4260,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) nfds =3D 0; for (n =3D netpriv->vhostfds; n; n =3D n->next) { - virBufferAsprintf(&buf, "%s:", qemuFDPassGetPath(n->data)); + virBufferAsprintf(&buf, "%s:", qemuFDPassDirectGetPath(n->= data)); nfds++; } @@ -8916,10 +8916,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, return -1; } - for (n =3D netpriv->vhostfds; n; n =3D n->next) { - if (qemuFDPassTransferCommand(n->data, cmd) < 0) - return -1; - } + for (n =3D netpriv->vhostfds; n; n =3D n->next) + qemuFDPassDirectTransferCommand(n->data, cmd); if (qemuFDPassTransferCommand(netpriv->slirpfd, cmd) < 0 || qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4305d5db06..eba556a6e7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1053,7 +1053,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= emuFDPassFree); + g_slist_free_full(g_steal_pointer(&priv->vhostfds), (GDestroyNotify) q= emuFDPassDirectFree); g_slist_free_full(g_steal_pointer(&priv->tapfds), (GDestroyNotify) qem= uFDPassFree); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e9eda8903e..9475c30e0c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -405,7 +405,7 @@ struct _qemuDomainNetworkPrivate { /* file descriptor transfer helpers */ qemuFDPass *slirpfd; GSList *tapfds; - GSList *vhostfds; + GSList *vhostfds; /* qemuFDPassDirect */ qemuFDPass *vdpafd; }; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cae7b0dd3b..da0896a671 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1380,7 +1380,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } for (n =3D netpriv->vhostfds; n; n =3D n->next) { - if (qemuFDPassTransferMonitor(n->data, priv->mon) < 0) { + if (qemuFDPassDirectTransferMonitor(n->data, priv->mon) < 0) { qemuDomainObjExitMonitor(vm); goto cleanup; } @@ -1528,7 +1528,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuFDPassTransferMonitorRollback(n->data, priv->mon); for (n =3D netpriv->vhostfds; n; n =3D n->next) - qemuFDPassTransferMonitorRollback(n->data, priv->mon); + qemuFDPassDirectTransferMonitorRollback(n->data, priv->mon); qemuDomainObjExitMonitor(vm); virErrorRestore(&originalError); diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index bda96808eb..ba03277025 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -700,12 +700,10 @@ int qemuInterfaceOpenVhostNet(virDomainObj *vm, virDomainNetDef *net) { - qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); size_t i; const char *vhostnet_path =3D net->backend.vhost; size_t vhostfdSize =3D net->driver.virtio.queues; - g_autofree char *prefix =3D g_strdup_printf("vhostfd-%s", net->info.al= ias); if (!vhostfdSize) vhostfdSize =3D 1; @@ -743,8 +741,7 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm, for (i =3D 0; i < vhostfdSize; i++) { VIR_AUTOCLOSE fd =3D open(vhostnet_path, O_RDWR); - g_autoptr(qemuFDPass) pass =3D qemuFDPassNewDirect(prefix, priv); - g_autofree char *suffix =3D g_strdup_printf("%zu", i); + g_autofree char *name =3D g_strdup_printf("vhostfd-%s%zu", net->in= fo.alias, i); /* If the config says explicitly to use vhost and we couldn't open= it, * report an error. @@ -761,8 +758,7 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm, break; } - qemuFDPassAddFD(pass, &fd, suffix); - netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, g_steal_p= ointer(&pass)); + netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, qemuFDPas= sDirectNew(name, &fd)); } netpriv->vhostfds =3D g_slist_reverse(netpriv->vhostfds); diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index aa82ffa2d6..bb14f775f3 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -226,12 +226,10 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *pa= th G_GNUC_UNUSED, } int -qemuInterfaceOpenVhostNet(virDomainObj *vm, +qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUSED, virDomainNetDef *net) { - qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); - g_autofree char *prefix =3D g_strdup_printf("vhostfd-%s", net->info.al= ias); size_t vhostfdSize =3D net->driver.virtio.queues; size_t i; @@ -242,12 +240,10 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm, return 0; for (i =3D 0; i < vhostfdSize; i++) { - g_autoptr(qemuFDPass) pass =3D qemuFDPassNewDirect(prefix, priv); - g_autofree char *suffix =3D g_strdup_printf("%zu", i); + g_autofree char *name =3D g_strdup_printf("vhostfd-%s%zu", net->in= fo.alias, i); int fd =3D STDERR_FILENO + 42 + i; - qemuFDPassAddFD(pass, &fd, suffix); - netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, g_steal_p= ointer(&pass)); + netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, qemuFDPas= sDirectNew(name, &fd)); } netpriv->vhostfds =3D g_slist_reverse(netpriv->vhostfds); --=20 2.35.3