From nobody Sun Feb 8 21:48:03 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=1652778492; cv=none; d=zohomail.com; s=zohoarc; b=F/q4DyJ6A/dGvNQ+rpoDz4jqHrUNOW870sAS9KVzlnfnxhagAsuuKaBCI7U83RBahR7M6UkRDaz9nK18Cnznp/xJyAxwRtdFVj+EbByU3n+q0iONf21/xtAj2D4jjMZgXaO5ml+Bsh3f4c/eiyQ+Q8cK37P0mD992JF5fG2YSOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652778492; 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=vGl8wxUNLiN90e+8GLMUulXi4HRc73g2gEwuWW7RGbA=; b=L8lGACda4EGxSiqXi6K6AcXrAFDRlQ87dZnUOAUEFokmk/OFpGDLiSHJrswnTXFF3AKWHeUq5Do5ieEIWrnGXO76G0k9Cp7Ab1jNUrwjS5pC9JYJZJuvuiu9gtxcWwcu6XiPnBGFyP5nhXcB5+wXyrhiaNmnK0u4C3SYNfTfQTo= 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 1652778492404521.6431993548111; Tue, 17 May 2022 02:08:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-392-dxvG8Cl3Ojm4GdRO7hfVUA-1; Tue, 17 May 2022 05:07:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6F361D32367; Tue, 17 May 2022 09:07:39 +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 7087740CF8F5; Tue, 17 May 2022 09:07:39 +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 33703194705F; Tue, 17 May 2022 09:07:39 +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 EC35A194706D for ; Tue, 17 May 2022 09:07:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BAB4C156D120; Tue, 17 May 2022 09:07:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49607156D12B for ; Tue, 17 May 2022 09:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652778491; 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=vGl8wxUNLiN90e+8GLMUulXi4HRc73g2gEwuWW7RGbA=; b=aXUSRdUXgUwmC2TpKGsNChN15zt1H+0pFj6Gws9K4OEQ44kcgKlOXJG3moTilNRJoi++Vk 2PT5U9h2E4t0I/cGcbHIxZh9h24C6I6VRAc9UQudewmcOPz+zKO5UqQCFU03g/LPabER5B LvcG8beqD+FR5xRnmLA/HFSJ4w2go3M= X-MC-Unique: dxvG8Cl3Ojm4GdRO7hfVUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/9] qemu: Convert passing of 'slirpfd' to 'qemuFDPassDirect' Date: Tue, 17 May 2022 11:07:21 +0200 Message-Id: <846bade5008e48cc2110adb2b4d8a6e25ea4f79e.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.1 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: 1652778494438100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 7 ++++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_slirp.c | 4 +--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bab2b0a99b..90a4b98e1e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4325,7 +4325,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) if (netpriv->slirpfd) { if (virJSONValueObjectAdd(&netprops, "s:type", "socket", - "s:fd", qemuFDPassGetPath(netpriv->s= lirpfd), + "s:fd", qemuFDPassDirectGetPath(netp= riv->slirpfd), NULL) < 0) return NULL; } else { @@ -8914,8 +8914,9 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, 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) + qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd); + + if (qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0) return -1; if (!(hostnetprops =3D qemuBuildHostNetProps(net))) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f83ee55246..c957b5296a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1051,7 +1051,7 @@ qemuDomainNetworkPrivateClearFDs(qemuDomainNetworkPri= vate *priv) if (!priv) return; - g_clear_pointer(&priv->slirpfd, qemuFDPassFree); + g_clear_pointer(&priv->slirpfd, qemuFDPassDirectFree); 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= uFDPassDirectFree); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 521df8ca01..1547dec668 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -403,7 +403,7 @@ struct _qemuDomainNetworkPrivate { qemuSlirp *slirp; /* file descriptor transfer helpers */ - qemuFDPass *slirpfd; + qemuFDPassDirect *slirpfd; GSList *tapfds; /* qemuFDPassDirect */ GSList *vhostfds; /* qemuFDPassDirect */ qemuFDPass *vdpafd; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4ebb3c5818..3504cd21ff 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1386,7 +1386,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } } - if (qemuFDPassTransferMonitor(netpriv->slirpfd, priv->mon) < 0 || + if (qemuFDPassDirectTransferMonitor(netpriv->slirpfd, priv->mon) < 0 || qemuFDPassTransferMonitor(netpriv->vdpafd, priv->mon) < 0) { qemuDomainObjExitMonitor(vm); goto cleanup; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 618947b6c1..772ea582c5 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -352,9 +352,7 @@ qemuSlirpStart(virDomainObj *vm, slirp->pid =3D pid; - netpriv->slirpfd =3D qemuFDPassNewDirect(fdname, priv); - - qemuFDPassAddFD(netpriv->slirpfd, &slirp->fd[0], NULL); + netpriv->slirpfd =3D qemuFDPassDirectNew(fdname, &slirp->fd[0]); return 0; --=20 2.35.3