481c875102
- qemu: Introduce QEMU_CAPS_OBJECT_IOMMUFD (RHEL-150351) - qemu: Move IOMMUFD validation to qemu_validate (RHEL-150351) - util: Move openning IOMMU device to viriommufd (RHEL-150351) - qemu_process: Refactor qemuProcessOpenIommuFd (RHEL-150351) - util: Move openning VFIO device to virpci (RHEL-150351) - qemu_process: Refactor qemuProcessOpenVfioDeviceFd (RHEL-150351) - util: Use virPCIDevice as argument in virPCIDeviceGetVfioPath (RHEL-150351) - conf: Introduce virHostdevIsPCIDeviceWithIOMMUFD (RHEL-150351) - conf: Introduce virDomainDefHasPCIHostdevWithIOMMUFD (RHEL-150351) - qemu_domain: Add missing IOMMUFD cleanup (RHEL-150351) - qemu_process: Fix FD leak with multiple host devices using IOMMUFD (RHEL-150351) - qemu_process: Refactor qemuProcessOpenVfioFds (RHEL-150351) - qemuxmlconftest: Refactor host device preparation (RHEL-150351) - qemuxmlconftest: Rename and refactor testSetupHostdevPrivateData (RHEL-150351) - qemuxmlconftest: Set fake FD for IOMMUFD (RHEL-150351) - qemu: Convert IOMMUFD to qemuFDPassDirect (RHEL-150351) - qemu: Convert vfioDeviceFd to qemuFDPassDirect (RHEL-150351) - qemu_command: Don't use host property if IOMMUFD is used (RHEL-150351) - qemu: Save IOMMUFD state into status XML (RHEL-150351) - qemu_hotplug: Remove iommufd object if no longer needed (RHEL-150351) - qemu_command: Extract building IOMMUFD props to function (RHEL-150351) - qemu_hotplug: Add support to hotplug host device with IOMMUFD (RHEL-150351) - conf: Introduce iommufd enum for domaincaps (RHEL-148135) - qemu: Fill iommufd domain capability (RHEL-148135) - tests: properly mock VFIO and IOMMU checks (RHEL-148135) - iommufd: fix FD leak in case of error (RHEL-150351) Resolves: RHEL-148135, RHEL-150351
90 lines
3.3 KiB
Diff
90 lines
3.3 KiB
Diff
From 615f11792c8988cfd6a30717dcc8d5d9174ea508 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <615f11792c8988cfd6a30717dcc8d5d9174ea508.1771423658.git.jdenemar@redhat.com>
|
|
From: Pavel Hrdina <phrdina@redhat.com>
|
|
Date: Sun, 15 Feb 2026 18:19:23 +0100
|
|
Subject: [PATCH] conf: Introduce virHostdevIsPCIDeviceWithIOMMUFD
|
|
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 97eed30948e980be8b7552fff637e828768854e4)
|
|
|
|
Resolves: https://issues.redhat.com/browse/RHEL-150351
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
---
|
|
src/conf/domain_conf.c | 15 +++++++++++++++
|
|
src/conf/domain_conf.h | 3 +++
|
|
src/libvirt_private.syms | 1 +
|
|
src/qemu/qemu_process.c | 5 +----
|
|
4 files changed, 20 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
index 83c58ab5ff..9ae48e9abc 100644
|
|
--- a/src/conf/domain_conf.c
|
|
+++ b/src/conf/domain_conf.c
|
|
@@ -32758,6 +32758,21 @@ virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
|
|
}
|
|
|
|
|
|
+/**
|
|
+ * virHostdevIsPCIDeviceWithIOMMUFD:
|
|
+ * @hostdev: host device to check
|
|
+ *
|
|
+ * Returns true if @hostdev is a PCI device with IOMMUFD enabled, false otherwise.
|
|
+ */
|
|
+bool
|
|
+virHostdevIsPCIDeviceWithIOMMUFD(const virDomainHostdevDef *hostdev)
|
|
+{
|
|
+ return virHostdevIsPCIDevice(hostdev) &&
|
|
+ hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
|
|
+ hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES;
|
|
+}
|
|
+
|
|
+
|
|
static void
|
|
virDomainObjGetMessagesIOErrorsSrc(virStorageSource *src,
|
|
const char *diskdst,
|
|
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
index b120d4a68e..d958ed04f9 100644
|
|
--- a/src/conf/domain_conf.h
|
|
+++ b/src/conf/domain_conf.h
|
|
@@ -4713,6 +4713,9 @@ virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev)
|
|
bool
|
|
virHostdevIsPCIDevice(const virDomainHostdevDef *hostdev)
|
|
ATTRIBUTE_NONNULL(1);
|
|
+bool
|
|
+virHostdevIsPCIDeviceWithIOMMUFD(const virDomainHostdevDef *hostdev)
|
|
+ ATTRIBUTE_NONNULL(1);
|
|
|
|
void
|
|
virDomainObjGetMessagesIOErrorsChain(virStorageSource *src,
|
|
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
index 9ae44e31b8..863e50ec4f 100644
|
|
--- a/src/libvirt_private.syms
|
|
+++ b/src/libvirt_private.syms
|
|
@@ -812,6 +812,7 @@ virDomainQemuMonitorEventNew;
|
|
virDomainQemuMonitorEventStateRegisterID;
|
|
virHostdevIsMdevDevice;
|
|
virHostdevIsPCIDevice;
|
|
+virHostdevIsPCIDeviceWithIOMMUFD;
|
|
virHostdevIsSCSIDevice;
|
|
|
|
|
|
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
index 7e32325fa0..3bd81c55b3 100644
|
|
--- a/src/qemu/qemu_process.c
|
|
+++ b/src/qemu/qemu_process.c
|
|
@@ -7732,10 +7732,7 @@ qemuProcessOpenVfioFds(virDomainObj *vm)
|
|
for (i = 0; i < vm->def->nhostdevs; i++) {
|
|
virDomainHostdevDef *hostdev = vm->def->hostdevs[i];
|
|
|
|
- if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
- hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
|
|
- hostdev->source.subsys.u.pci.driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO &&
|
|
- hostdev->source.subsys.u.pci.driver.iommufd == VIR_TRISTATE_BOOL_YES) {
|
|
+ if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) {
|
|
/* Open VFIO device FD */
|
|
if (qemuProcessOpenVfioDeviceFd(hostdev) < 0)
|
|
return -1;
|
|
--
|
|
2.53.0
|