From nobody Tue Mar 3 04:53:03 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=1771246124; cv=none; d=zohomail.com; s=zohoarc; b=VN+6A8nhMWzxjdn6KfOEZDH6D3SkONHxVgrgIJH/XG7Pc23qR2Vh8cBleaSmKaxmjnvj24l9adiom9cYj7TDsiFZqxcFMnvZwEwEl8hgIuCBryhdqlGX2Z48mFDomikFDWfRSCUHcjEXX+e+unYOCjtAOdYTscH+JCe5d+0l5D8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771246124; 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=2tYG8oujScE4ZSITG08DWgkrIz9Waa8v2aQ0MrHlWHE=; b=VUHAqICt/1MfjZ/vlKK23J0Cuzm5Y/JIgRkU0ID4ldWT+n8Ub8ATZ/c1S6YaRv4LCMp10V4RV56D0X2i3TiiB0cunnfPytuRlP5HoiqCf1r0NFTEJ8276Qbf3gvT11hIxy/SHK8O4E1K8f3HLexFRziNhQPB29Votv1FOBMPVsY= 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 1771246124610745.8390535236704; Mon, 16 Feb 2026 04:48:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id BE5EF41813; Mon, 16 Feb 2026 07:48:43 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0870D41E56; Mon, 16 Feb 2026 07:35:25 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 65C14417E6; Mon, 16 Feb 2026 07:35:15 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 CC49B417E6 for ; Mon, 16 Feb 2026 07:28:49 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-22-p-Af9HU4NXCCUpMWp60XgA-1; Mon, 16 Feb 2026 07:28:37 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4E2571800366 for ; Mon, 16 Feb 2026 12:28:36 +0000 (UTC) Received: from antique-laptop.rosnicka.net (unknown [10.45.242.10]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 96F2A30001A5 for ; Mon, 16 Feb 2026 12:28:35 +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=1771244929; 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=2tYG8oujScE4ZSITG08DWgkrIz9Waa8v2aQ0MrHlWHE=; b=CSKSA0yGmpjYY3HFgIDFdQFDOcXD6T6osqUTYH3UyRnyd6vkeZnz2qOMdzlNyWYqEyh/BN Y8XKXZw+B594geGMDFKf9RyORMDTlAxRWFQJ8uPQWYlb1L2Jl9DfhrqTdWex+WSO0c5m6e MfBNIP+Fv3ComMg560sIP52lsNC9VmI= X-MC-Unique: p-Af9HU4NXCCUpMWp60XgA-1 X-Mimecast-MFC-AGG-ID: p-Af9HU4NXCCUpMWp60XgA_1771244916 To: devel@lists.libvirt.org Subject: [libvirt PATCH 16/24] qemu: Convert IOMMUFD to qemuFDPassDirect Date: Mon, 16 Feb 2026 13:28:08 +0100 Message-ID: <29835da194b9610c1e8c60fcc298c8eecd0bb49b.1771244723.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LkXgmZVd3i7MgB8KM1RyFawzV2Ts8Uu2SPFUpce3FYs_1771244916 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2ZBJUPETAGVSDYTPOG4ZOU6ZVW7DKGMA X-Message-ID-Hash: 2ZBJUPETAGVSDYTPOG4ZOU6ZVW7DKGMA X-MailFrom: phrdina@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: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1771246124995158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This cleans up creating QEMU command line and makes it easier when adding hotplug support. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_command.c | 7 ++----- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_process.c | 6 ++++-- tests/qemuxmlconftest.c | 6 ++++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f400835332..204fdf152b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5357,19 +5357,16 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd, virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; - g_autofree char *fdstr =3D g_strdup_printf("%d", priv->iommufd); g_autoptr(virJSONValue) props =3D NULL; =20 if (!virDomainDefHasPCIHostdevWithIOMMUFD(def)) return 0; =20 - virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - - priv->iommufd =3D -1; + qemuFDPassDirectTransferCommand(priv->iommufd, cmd); =20 if (qemuMonitorCreateObjectProps(&props, "iommufd", "iommufd0", - "S:fd", fdstr, + "S:fd", qemuFDPassDirectGetPath(priv-= >iommufd), NULL) < 0) return -1; =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 64b01e524f..d9cd9324e0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1975,7 +1975,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *p= riv) =20 priv->migrationRecoverSetup =3D false; =20 - VIR_FORCE_CLOSE(priv->iommufd); + g_clear_pointer(&priv->iommufd, qemuFDPassDirectFree); =20 g_clear_pointer(&priv->memoryBackingDir, g_free); } @@ -2044,7 +2044,7 @@ qemuDomainObjPrivateAlloc(void *opaque) priv->blockjobs =3D virHashNew(virObjectUnref); priv->fds =3D virHashNew(g_object_unref); =20 - priv->iommufd =3D -1; + priv->iommufd =3D NULL; priv->pidMonitored =3D -1; =20 /* agent commands block by default, user can choose different behavior= */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 510a8339b0..c6430b1bfb 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -264,7 +264,7 @@ struct _qemuDomainObjPrivate { /* named file descriptor groups associated with the VM */ GHashTable *fds; =20 - int iommufd; + qemuFDPassDirect *iommufd; =20 char *memoryBackingDir; }; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c5c1ef77ec..c814f992bb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7689,13 +7689,15 @@ static int qemuProcessOpenIommuFd(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; + int iommufd; =20 VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name); =20 - if ((priv->iommufd =3D virIOMMUFDOpenDevice()) < 0) + if ((iommufd =3D virIOMMUFDOpenDevice()) < 0) return -1; =20 - VIR_DEBUG("Opened IOMMU FD %d for domain %s", priv->iommufd, vm->def->= name); + priv->iommufd =3D qemuFDPassDirectNew("iommufd", &iommufd); + return 0; } =20 diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 4ab004a954..13055eef84 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -412,8 +412,10 @@ testQemuPrepareHostdev(virDomainObj *vm) } } =20 - if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) - priv->iommufd =3D 0; + if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) { + int iommufd =3D 0; + priv->iommufd =3D qemuFDPassDirectNew("iommufd", &iommufd); + } } =20 =20 --=20 2.53.0