From nobody Tue Mar 3 04:52:44 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=1771245371; cv=none; d=zohomail.com; s=zohoarc; b=k9NmoLMfWP/5hsMmJwIVDB2P+/vKrtuw7iuBUE74PiIaA9J8kKa1mdCUDMk2JehcWJFS0VE6/LDF2nW0X8a3+dgQK0knTE7iWd+2zKpDp7PKdLzYs3DNvazvKZIAa8kzVPU80gYp9cRn/LYVHHg+NjqO3aNlT/qBonbsKxALAd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771245371; 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=bcfz21P4JUInoO+/E4MBzZHvp3hdnSug4dQVGV5oZ+s=; b=FYGGsgkOxS97jcEO1FYgolHaFfQmcayp4PMKAGWw6Mmy49XvIWTkQp4rrpq6N29C6QkbsGOdDB3K/5NcciONbCaS1i34LYpez9jnlZO0jeC/XTOZ9SlHXOPRd/YAh/8VMQKMUJvlS7whOMNTdCIoBgSzcMQJ+378PeNsO7zEpKc= 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 177124537132945.94805208860373; Mon, 16 Feb 2026 04:36:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8BEC53F8B3; Mon, 16 Feb 2026 07:36:10 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id ACE973F9B4; Mon, 16 Feb 2026 07:29:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id EBB583F8A8; Mon, 16 Feb 2026 07:29:03 -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 70D933F9B4 for ; Mon, 16 Feb 2026 07:28:27 -0500 (EST) Received: from mx-prod-mc-01.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-629-NpFJUzboO9mMXRt1ec7KtA-1; Mon, 16 Feb 2026 07:28:25 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0CED61956089 for ; Mon, 16 Feb 2026 12:28:25 +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 5E86F30001A5 for ; Mon, 16 Feb 2026 12:28:24 +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=1771244907; 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=bcfz21P4JUInoO+/E4MBzZHvp3hdnSug4dQVGV5oZ+s=; b=PZmQ+BR9T1cV7BnvOmyRCk2Mm2irSBl4dUIiDsP60wlhRNwqYeDQu7liAOCpCVbXl23Emr 4XJ6FIyFZ20jwj8/1MwOL8VMC7N1d8DzAYXHqi4wvz2JtIqgt5qJw+rK1j/yctnxaJhZLw jnk9Bz6ukS+1Knq7ORlHfURRCU6K2xs= X-MC-Unique: NpFJUzboO9mMXRt1ec7KtA-1 X-Mimecast-MFC-AGG-ID: NpFJUzboO9mMXRt1ec7KtA_1771244905 To: devel@lists.libvirt.org Subject: [libvirt PATCH 06/24] qemu_process: Refactor qemuProcessOpenVfioDeviceFd Date: Mon, 16 Feb 2026 13:27:58 +0100 Message-ID: <4ec32498a6a019abc36dfa954336f5325b3484fa.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: -_JLKkyi_Aum5atP5zQHF6yF6AptT5bZoL8yp2RgCfY_1771244905 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OIMHH54AHHQFSG2LU7MEOPAIAFSNWLSN X-Message-ID-Hash: OIMHH54AHHQFSG2LU7MEOPAIAFSNWLSN 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: 1771245373187158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This will allow us reusing same code for hotplug support. As part of refactor remove redundant checks. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_process.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cc2a9c8abc..2bab46fca6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7702,23 +7702,21 @@ qemuProcessOpenIommuFd(virDomainObj *vm) /** * qemuProcessOpenVfioDeviceFd: * @hostdev: host device definition - * @vfioFd: returned file descriptor * * Opens the VFIO device file descriptor for a hostdev. * - * Returns: FD on success, -1 on failure + * Returns: 0 on success, -1 on failure */ static int qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev) { - if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PC= I) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VFIO FD only supported for PCI hostdevs")); + qemuDomainHostdevPrivate *hostdevPriv =3D QEMU_DOMAIN_HOSTDEV_PRIVATE(= hostdev); + virDomainHostdevSubsysPCI *pci =3D &hostdev->source.subsys.u.pci; + + if ((hostdevPriv->vfioDeviceFd =3D virPCIDeviceOpenVfioFd(&pci->addr))= < 0) return -1; - } =20 - return virPCIDeviceOpenVfioFd(&hostdev->source.subsys.u.pci.addr); + return 0; } =20 /** @@ -7737,16 +7735,14 @@ qemuProcessOpenVfioFds(virDomainObj *vm) /* Check if we have any hostdevs that need VFIO FDs */ for (i =3D 0; i < vm->def->nhostdevs; i++) { virDomainHostdevDef *hostdev =3D vm->def->hostdevs[i]; - qemuDomainHostdevPrivate *hostdevPriv =3D QEMU_DOMAIN_HOSTDEV_PRIV= ATE(hostdev); =20 if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_T= YPE_PCI && hostdev->source.subsys.u.pci.driver.name =3D=3D VIR_DEVICE_HOS= TDEV_PCI_DRIVER_NAME_VFIO && hostdev->source.subsys.u.pci.driver.iommufd =3D=3D VIR_TRISTAT= E_BOOL_YES) { /* Open VFIO device FD */ - hostdevPriv->vfioDeviceFd =3D qemuProcessOpenVfioDeviceFd(host= dev); - if (hostdevPriv->vfioDeviceFd =3D=3D -1) - return -1; + if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + return -1; =20 /* Open IOMMU FD */ if (qemuProcessOpenIommuFd(vm) < 0) --=20 2.53.0