Fail early if kernel doesn't support IOMMUFD. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 8 +------- src/qemu/qemu_validate.c | 7 +++++++ src/util/viriommufd.c | 13 +++++++++++++ src/util/viriommufd.h | 2 ++ 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8554191503..2f9fdc04ad 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2649,6 +2649,7 @@ virInitctlSetRunLevel; # util/viriommufd.h virIOMMUFDSetRLimitMode; +virIOMMUFDSupported; # util/viriscsi.h virISCSIConnectionLogin; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c3f681f1dd..fd400ae8a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7694,13 +7694,7 @@ qemuProcessOpenIommuFd(virDomainObj *vm) VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name); if ((fd = open(VIR_IOMMU_DEV_PATH, O_RDWR | O_CLOEXEC)) < 0) { - if (errno == ENOENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOMMU FD support requires /dev/iommu device")); - } else { - virReportSystemError(errno, "%s", - _("cannot open /dev/iommu")); - } + virReportSystemError(errno, "%s", _("cannot open /dev/iommu")); return -1; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 18700b5a9b..16dd5fef1a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -27,6 +27,7 @@ #include "qemu_process.h" #include "domain_conf.h" #include "virbitmap.h" +#include "viriommufd.h" #include "virlog.h" #include "virutil.h" @@ -2729,6 +2730,12 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev, _("IOMMUFD is not supported by this version of qemu")); return -1; } + + if (!virIOMMUFDSupported()) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOMMUFD is not supported by host kernel")); + return -1; + } } } diff --git a/src/util/viriommufd.c b/src/util/viriommufd.c index 5af097683d..44b30029a5 100644 --- a/src/util/viriommufd.c +++ b/src/util/viriommufd.c @@ -88,3 +88,16 @@ int virIOMMUFDSetRLimitMode(int fd G_GNUC_UNUSED, } #endif + +/** + * virIOMMUFDSupported: + * + * Check the presence of IOMMU device. + * + * Retruns: true if it exists, false otherwise + */ +bool +virIOMMUFDSupported(void) +{ + return virFileExists(VIR_IOMMU_DEV_PATH); +} diff --git a/src/util/viriommufd.h b/src/util/viriommufd.h index ebecfe3633..ec6be9fa66 100644 --- a/src/util/viriommufd.h +++ b/src/util/viriommufd.h @@ -23,3 +23,5 @@ #define VIR_IOMMU_DEV_PATH "/dev/iommu" int virIOMMUFDSetRLimitMode(int fd, bool processAccounting); + +bool virIOMMUFDSupported(void); -- 2.53.0

This will allow us reusing same code for hotplug. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_process.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9b459f47ca..d21abb9eb6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7680,24 +7680,23 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm, /** * qemuProcessOpenIommuFd: * @vm: domain object - * @iommuFd: returned file descriptor * * Opens /dev/iommu file descriptor for the VM. * - * Returns: FD on success, -1 on failure + * Returns: 0 on success, -1 on failure */ static int qemuProcessOpenIommuFd(virDomainObj *vm) { - int fd = -1; + qemuDomainObjPrivate *priv = vm->privateData; VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name); - if ((fd = virIOMMUFDOpenDevice()) < 0) + if ((priv->iommufd = virIOMMUFDOpenDevice()) < 0) return -1; - VIR_DEBUG("Opened IOMMU FD %d for domain %s", fd, vm->def->name); - return fd; + VIR_DEBUG("Opened IOMMU FD %d for domain %s", priv->iommufd, vm->def->name); + return 0; } /** @@ -7754,7 +7753,6 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev) static int qemuProcessOpenVfioFds(virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; size_t i; /* Check if we have any hostdevs that need VFIO FDs */ @@ -7772,8 +7770,7 @@ qemuProcessOpenVfioFds(virDomainObj *vm) return -1; /* Open IOMMU FD */ - priv->iommufd = qemuProcessOpenIommuFd(vm); - if (priv->iommufd == -1) + if (qemuProcessOpenIommuFd(vm) < 0) return -1; } } -- 2.53.0

This will allow us reusing same code for hotplug support. As part of refactor remove redundant checks. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- 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 != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VFIO FD only supported for PCI hostdevs")); + qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); + virDomainHostdevSubsysPCI *pci = &hostdev->source.subsys.u.pci; + + if ((hostdevPriv->vfioDeviceFd = virPCIDeviceOpenVfioFd(&pci->addr)) < 0) return -1; - } - return virPCIDeviceOpenVfioFd(&hostdev->source.subsys.u.pci.addr); + return 0; } /** @@ -7737,16 +7735,14 @@ qemuProcessOpenVfioFds(virDomainObj *vm) /* Check if we have any hostdevs that need VFIO FDs */ for (i = 0; i < vm->def->nhostdevs; i++) { virDomainHostdevDef *hostdev = vm->def->hostdevs[i]; - qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); 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) { /* Open VFIO device FD */ - hostdevPriv->vfioDeviceFd = qemuProcessOpenVfioDeviceFd(hostdev); - if (hostdevPriv->vfioDeviceFd == -1) - return -1; + if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + return -1; /* Open IOMMU FD */ if (qemuProcessOpenIommuFd(vm) < 0) -- 2.53.0

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 e3c69aee4d..98d34f408d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -32939,6 +32939,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 be96617981..f98fed650a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4720,6 +4720,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 4d29512e0b..15a56a262a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -813,6 +813,7 @@ virDomainQemuMonitorEventNew; virDomainQemuMonitorEventStateRegisterID; virHostdevIsMdevDevice; virHostdevIsPCIDevice; +virHostdevIsPCIDeviceWithIOMMUFD; virHostdevIsSCSIDevice; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2bab46fca6..cfc30dcbe4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7736,10 +7736,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

If starting VM fails we would leak the FD for IOMMU device. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bdab117e96..64b01e524f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1975,6 +1975,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv) priv->migrationRecoverSetup = false; + VIR_FORCE_CLOSE(priv->iommufd); + g_clear_pointer(&priv->memoryBackingDir, g_free); } -- 2.53.0

Follow our switch pattern to simplify the code logic and rename the function to follow our naming pattern. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_process.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ca0ed1b9b..c5c1ef77ec 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7719,27 +7719,28 @@ qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev) return 0; } -/** - * qemuProcessOpenVfioFds: - * @vm: domain object - * - * Opens all necessary VFIO file descriptors for the domain. - * - * Returns: 0 on success, -1 on failure - */ static int -qemuProcessOpenVfioFds(virDomainObj *vm) +qemuProcessPrepareHostHostdev(virDomainObj *vm) { size_t i; - /* Check if we have any hostdevs that need VFIO FDs */ for (i = 0; i < vm->def->nhostdevs; i++) { virDomainHostdevDef *hostdev = vm->def->hostdevs[i]; - if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { - /* Open VFIO device FD */ - if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) - return -1; + switch (hostdev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { + /* Open VFIO device FD */ + if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + return -1; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: + break; } } @@ -7807,7 +7808,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver, hostdev_flags |= VIR_HOSTDEV_COLD_BOOT; if (qemuHostdevPrepareDomainDevices(driver, vm->def, hostdev_flags) < 0) return -1; - if (qemuProcessOpenVfioFds(vm) < 0) + if (qemuProcessPrepareHostHostdev(vm) < 0) return -1; VIR_DEBUG("Preparing chr device backends"); -- 2.53.0

There is no need to call qemuDomainHostdevPrivateNew() because privateData is allocated on creation by virDomainHostdevDefNew(). Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tests/qemuxmlconftest.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 321c444d77..a04311647e 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -352,28 +352,13 @@ fakeNetworkPortGetXMLDesc(virNetworkPortPtr port, static void -testSetupHostdevPrivateData(virDomainDef *def) +testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev) { - size_t i; + qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); - for (i = 0; i < def->nhostdevs; i++) { - virDomainHostdevDef *hostdev = 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) { - - qemuDomainHostdevPrivate *priv; - - if (!hostdev->privateData) { - hostdev->privateData = qemuDomainHostdevPrivateNew(); - } - - priv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); - /* Use a placeholder FD value for tests */ - priv->vfioDeviceFd = 0; - } + if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { + /* Use a placeholder FD value for tests */ + hostdevPriv->vfioDeviceFd = 0; } } @@ -416,6 +401,8 @@ testQemuPrepareHostdev(virDomainObj *vm) testQemuPrepareHostdevUSB(hostdev); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + testQemuPrepareHostdevPCI(hostdev); + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: @@ -479,8 +466,6 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, if (testQemuPrepareHostBackendChardevOne(NULL, priv->monConfig, vm) < 0) return NULL; - testSetupHostdevPrivateData(vm->def); - for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk = vm->def->disks[i]; virStorageSource *src; -- 2.53.0

This cleans up creating QEMU command line and makes it easier when adding hotplug support. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- 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 = vm->privateData; - g_autofree char *fdstr = g_strdup_printf("%d", priv->iommufd); g_autoptr(virJSONValue) props = NULL; if (!virDomainDefHasPCIHostdevWithIOMMUFD(def)) return 0; - virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - - priv->iommufd = -1; + qemuFDPassDirectTransferCommand(priv->iommufd, cmd); if (qemuMonitorCreateObjectProps(&props, "iommufd", "iommufd0", - "S:fd", fdstr, + "S:fd", qemuFDPassDirectGetPath(priv->iommufd), NULL) < 0) return -1; 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 *priv) priv->migrationRecoverSetup = false; - VIR_FORCE_CLOSE(priv->iommufd); + g_clear_pointer(&priv->iommufd, qemuFDPassDirectFree); g_clear_pointer(&priv->memoryBackingDir, g_free); } @@ -2044,7 +2044,7 @@ qemuDomainObjPrivateAlloc(void *opaque) priv->blockjobs = virHashNew(virObjectUnref); priv->fds = virHashNew(g_object_unref); - priv->iommufd = -1; + priv->iommufd = NULL; priv->pidMonitored = -1; /* 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; - int iommufd; + qemuFDPassDirect *iommufd; 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 = vm->privateData; + int iommufd; VIR_DEBUG("Opening IOMMU FD for domain %s", vm->def->name); - if ((priv->iommufd = virIOMMUFDOpenDevice()) < 0) + if ((iommufd = virIOMMUFDOpenDevice()) < 0) return -1; - VIR_DEBUG("Opened IOMMU FD %d for domain %s", priv->iommufd, vm->def->name); + priv->iommufd = qemuFDPassDirectNew("iommufd", &iommufd); + return 0; } 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) } } - if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) - priv->iommufd = 0; + if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) { + int iommufd = 0; + priv->iommufd = qemuFDPassDirectNew("iommufd", &iommufd); + } } -- 2.53.0

They should not be used at the same time. Fixes: f6230804727df834da27370e835204672218ab23 Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_command.c | 24 +++++++++---------- .../iommufd-q35.x86_64-latest.args | 2 +- ...fd-virt-pci-bus-single.aarch64-latest.args | 2 +- .../iommufd-virt.aarch64-latest.args | 4 ++-- .../iommufd.x86_64-latest.args | 2 +- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 91eb3cb27d..724f0cd8eb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4762,10 +4762,11 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, g_autoptr(virJSONValue) props = NULL; virDomainHostdevSubsysPCI *pcisrc = &dev->source.subsys.u.pci; virDomainNetTeamingInfo *teaming; - g_autofree char *host = virPCIDeviceAddressAsString(&pcisrc->addr); + g_autofree char *host = NULL; const char *failover_pair_id = NULL; const char *driver = NULL; const char *iommufdId = NULL; + const char *fdstr = NULL; /* 'ramfb' property must be omitted unless it's to be enabled */ bool ramfb = pcisrc->ramfb == VIR_TRISTATE_SWITCH_ON; @@ -4799,31 +4800,28 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, teaming->persistent) failover_pair_id = teaming->persistent; - if (pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES) + if (virHostdevIsPCIDeviceWithIOMMUFD(dev)) { + qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev); + + fdstr = qemuFDPassDirectGetPath(hostdevPriv->vfioDeviceFd); iommufdId = "iommufd0"; + } else { + host = virPCIDeviceAddressAsString(&pcisrc->addr); + } if (virJSONValueObjectAdd(&props, "s:driver", driver, - "s:host", host, + "S:host", host, "s:id", dev->info->alias, "p:bootindex", dev->info->effectiveBootIndex, "S:failover_pair_id", failover_pair_id, "S:display", qemuOnOffAuto(pcisrc->display), "B:ramfb", ramfb, "S:iommufd", iommufdId, + "S:fd", fdstr, NULL) < 0) return NULL; - if (pcisrc->driver.name == VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO && - pcisrc->driver.iommufd == VIR_TRISTATE_BOOL_YES) { - qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(dev); - - if (virJSONValueObjectAdd(&props, - "S:fd", qemuFDPassDirectGetPath(hostdevPriv->vfioDeviceFd), - NULL) < 0) - return NULL; - } - if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) return NULL; diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args index d5fe704021..f886c488e1 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -global ICH9-LPC.noreboot=off \ -watchdog-action reset \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ --device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args index 303cfa922b..543e976c58 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ --device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pcie.0","addr":"0x1"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args index 6a62b08e8a..e1a4c4bb9a 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ --device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"vfio-pci","host":"0000:07:12.5","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"0","bus":"pci.2","addr":"0x0"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args index 15dabe197c..b9aefda39d 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ --device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on -- 2.53.0

When removing last host device using IOMMUFD remove the iommufd object as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_hotplug.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d17370b582..24fbccccf0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4997,6 +4997,14 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver, } } + if (priv->iommufdState && + !virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) { + qemuDomainObjEnterMonitor(vm); + ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false)); + qemuDomainObjExitMonitor(vm); + priv->iommufdState = false; + } + virDomainAuditHostdev(vm, hostdev, "detach", true); if (!virHostdevIsPCIDevice(hostdev) && -- 2.53.0

For first host device we need to add iommufd object as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_hotplug.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_process.h | 3 +++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 24fbccccf0..bede4e3ccd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1553,13 +1553,16 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV, { .hostdev = hostdev } }; virDomainDeviceInfo *info = hostdev->info; + qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); int ret; g_autoptr(virJSONValue) devprops = NULL; + g_autoptr(virJSONValue) objprops = NULL; bool releaseaddr = false; bool teardowncgroup = false; bool teardownlabel = false; bool teardowndevice = false; bool teardownmemlock = false; + bool removeiommufd = false; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned int flags = 0; @@ -1609,11 +1612,38 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, goto error; } + if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { + if (qemuProcessOpenVfioDeviceFd(hostdev) < 0) + goto error; + + if (!priv->iommufdState) { + if (qemuProcessOpenIommuFd(vm) < 0) + goto error; + + if (!(objprops = qemuBuildIOMMUFDProps(priv->iommufd))) + goto error; + } + } + if (!(devprops = qemuBuildPCIHostdevDevProps(vm->def, hostdev))) goto error; qemuDomainObjEnterMonitor(vm); + if (objprops) { + if ((ret = qemuFDPassDirectTransferMonitor(priv->iommufd, priv->mon)) < 0) + goto exit_monitor; + + if ((ret = qemuMonitorAddObject(priv->mon, &objprops, NULL)) < 0) + goto exit_monitor; + + priv->iommufdState = true; + removeiommufd = true; + } + + if ((ret = qemuFDPassDirectTransferMonitor(hostdevPriv->vfioDeviceFd, priv->mon)) < 0) + goto exit_monitor; + if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0) goto exit_monitor; @@ -1644,6 +1674,15 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm) < 0) VIR_WARN("Unable to reset maximum locked memory on hotplug fail"); + if (removeiommufd) { + qemuDomainObjEnterMonitor(vm); + ignore_value(qemuMonitorDelObject(priv->mon, "iommufd0", false)); + qemuDomainObjExitMonitor(vm); + } + + qemuFDPassDirectTransferMonitorRollback(hostdevPriv->vfioDeviceFd, priv->mon); + qemuFDPassDirectTransferMonitorRollback(priv->iommufd, priv->mon); + if (releaseaddr) qemuDomainReleaseDeviceAddress(vm, info); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fc7e7bc980..371b64faac 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7685,7 +7685,7 @@ qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm, * * Returns: 0 on success, -1 on failure */ -static int +int qemuProcessOpenIommuFd(virDomainObj *vm) { qemuDomainObjPrivate *priv = vm->privateData; @@ -7709,7 +7709,7 @@ qemuProcessOpenIommuFd(virDomainObj *vm) * * Returns: 0 on success, -1 on failure */ -static int +int qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev) { qemuDomainHostdevPrivate *hostdevPriv = QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 6ba846b7b1..fccd41e1a6 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -134,6 +134,9 @@ int qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm, virDomainDeviceDef *dev) ATTRIBUTE_MOCKABLE; +int qemuProcessOpenIommuFd(virDomainObj *vm); + +int qemuProcessOpenVfioDeviceFd(virDomainHostdevDef *hostdev); int qemuProcessPrepareHost(virQEMUDriver *driver, virDomainObj *vm, -- 2.53.0

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_capabilities.c | 21 ++++++++++++++----- .../qemu_10.0.0-q35.x86_64+amdsev.xml | 4 ++++ .../domaincapsdata/qemu_10.0.0-q35.x86_64.xml | 4 ++++ .../qemu_10.0.0-tcg.x86_64+amdsev.xml | 4 ++++ .../domaincapsdata/qemu_10.0.0-tcg.x86_64.xml | 4 ++++ .../qemu_10.0.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_10.0.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_10.0.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_10.0.0.s390x.xml | 4 ++++ .../qemu_10.0.0.x86_64+amdsev.xml | 4 ++++ tests/domaincapsdata/qemu_10.0.0.x86_64.xml | 4 ++++ .../qemu_10.1.0-q35.x86_64+inteltdx.xml | 4 ++++ .../domaincapsdata/qemu_10.1.0-q35.x86_64.xml | 4 ++++ .../qemu_10.1.0-tcg.x86_64+inteltdx.xml | 4 ++++ .../domaincapsdata/qemu_10.1.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_10.1.0.s390x.xml | 4 ++++ .../qemu_10.1.0.x86_64+inteltdx.xml | 4 ++++ tests/domaincapsdata/qemu_10.1.0.x86_64.xml | 4 ++++ .../qemu_10.2.0-q35.x86_64+mshv.xml | 4 ++++ .../domaincapsdata/qemu_10.2.0-q35.x86_64.xml | 4 ++++ .../qemu_10.2.0-tcg.x86_64+mshv.xml | 4 ++++ .../domaincapsdata/qemu_10.2.0-tcg.x86_64.xml | 4 ++++ .../qemu_10.2.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_10.2.0.aarch64.xml | 4 ++++ .../qemu_10.2.0.x86_64+mshv.xml | 4 ++++ tests/domaincapsdata/qemu_10.2.0.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_11.0.0-q35.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_11.0.0-tcg.x86_64.xml | 4 ++++ .../qemu_11.0.0-virt.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_11.0.0.aarch64.xml | 4 ++++ tests/domaincapsdata/qemu_11.0.0.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 +++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 +++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 +++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 3 +++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 +++ .../qemu_7.2.0-hvf.x86_64+hvf.xml | 3 +++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 +++ .../qemu_7.2.0-tcg.x86_64+hvf.xml | 3 +++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_7.2.0.ppc.xml | 3 +++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 +++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 +++ .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 +++ tests/domaincapsdata/qemu_8.1.0.s390x.xml | 3 +++ tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 +++ .../qemu_8.2.0-tcg-virt.loongarch64.xml | 3 +++ .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 +++ .../qemu_8.2.0-virt.aarch64.xml | 3 +++ .../qemu_8.2.0-virt.loongarch64.xml | 3 +++ tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 3 +++ tests/domaincapsdata/qemu_8.2.0.armv7l.xml | 3 +++ tests/domaincapsdata/qemu_8.2.0.s390x.xml | 3 +++ tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 +++ .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_9.0.0.sparc.xml | 3 +++ tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 4 ++++ .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 4 ++++ .../qemu_9.1.0-tcg-virt.riscv64.xml | 3 +++ .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 4 ++++ .../qemu_9.1.0-virt.riscv64.xml | 3 +++ tests/domaincapsdata/qemu_9.1.0.s390x.xml | 4 ++++ tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 4 ++++ .../qemu_9.2.0-hvf.aarch64+hvf.xml | 3 +++ .../qemu_9.2.0-q35.x86_64+amdsev.xml | 4 ++++ .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 4 ++++ .../qemu_9.2.0-tcg.x86_64+amdsev.xml | 4 ++++ .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 4 ++++ tests/domaincapsdata/qemu_9.2.0.s390x.xml | 4 ++++ .../qemu_9.2.0.x86_64+amdsev.xml | 4 ++++ tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 4 ++++ tests/domaincapsmock.c | 17 ++++++++++++++- 84 files changed, 321 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a1545c727..f35c3e1903 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -45,6 +45,7 @@ #include "qemu_firmware.h" #include "virutil.h" #include "virtpm.h" +#include "viriommufd.h" #include <fcntl.h> #include <sys/stat.h> @@ -6779,6 +6780,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCaps *qemuCaps, hostdev->subsysType.report = true; hostdev->capsType.report = true; hostdev->pciBackend.report = true; + hostdev->iommufd.report = true; /* VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES is for containers only */ VIR_DOMAIN_CAPS_ENUM_SET(hostdev->mode, @@ -6810,11 +6812,20 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCaps *qemuCaps, virDomainCapsEnumClear(&hostdev->capsType); virDomainCapsEnumClear(&hostdev->pciBackend); - if (supportsPassthroughVFIO && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { - VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend, - VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT, - VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO); + + VIR_DOMAIN_CAPS_ENUM_SET(hostdev->iommufd, VIR_TRISTATE_BOOL_NO); + + if (supportsPassthroughVFIO) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { + VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend, + VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_DEFAULT, + VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_VFIO); + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_IOMMUFD) && + virIOMMUFDSupported()) { + VIR_DOMAIN_CAPS_ENUM_SET(hostdev->iommufd, VIR_TRISTATE_BOOL_YES); + } } } diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml index 8cb51d795c..aeccdf612d 100644 --- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64+amdsev.xml @@ -856,6 +856,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml index 56192354ac..86a740099b 100644 --- a/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-q35.x86_64.xml @@ -1755,6 +1755,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml index 4242f2fe9c..5d9ce948f8 100644 --- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64+amdsev.xml @@ -1840,6 +1840,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml index 76d5fdd0d9..3915ec38cf 100644 --- a/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-tcg.x86_64.xml @@ -1840,6 +1840,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml index 30863d3d6b..058bd84a33 100644 --- a/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0-virt.aarch64.xml @@ -154,6 +154,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml index 30863d3d6b..058bd84a33 100644 --- a/tests/domaincapsdata/qemu_10.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.aarch64.xml @@ -154,6 +154,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml index 5136e7a20d..f3ff165aa1 100644 --- a/tests/domaincapsdata/qemu_10.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.ppc64.xml @@ -107,6 +107,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0.s390x.xml b/tests/domaincapsdata/qemu_10.0.0.s390x.xml index 3bbdbd68d0..220afb9d7d 100644 --- a/tests/domaincapsdata/qemu_10.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.0.0.s390x.xml @@ -283,6 +283,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml index 8b02db8802..9dcc7f2e44 100644 --- a/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_10.0.0.x86_64+amdsev.xml @@ -856,6 +856,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml index 6dac17808c..c0c3a2e6db 100644 --- a/tests/domaincapsdata/qemu_10.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.0.0.x86_64.xml @@ -1755,6 +1755,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml index 31d4fab043..5f6ee44ac7 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml @@ -909,6 +909,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml index 6213908152..fc82987630 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml @@ -2100,6 +2100,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml index cace9f109a..e30b20e31e 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml @@ -2222,6 +2222,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml index 804848b8a7..34e5812613 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml @@ -2226,6 +2226,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0.s390x.xml b/tests/domaincapsdata/qemu_10.1.0.s390x.xml index 9d773385c4..373b9f1f59 100644 --- a/tests/domaincapsdata/qemu_10.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_10.1.0.s390x.xml @@ -351,6 +351,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml index 6320200c20..1d5a1b5404 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml @@ -909,6 +909,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml index 35c9b8c6d3..3be5e34fe6 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml @@ -2100,6 +2100,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml index ebba8fd49f..6914726a8b 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64+mshv.xml @@ -110,6 +110,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml index 5ce911d62f..cfa51195ba 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml @@ -1206,6 +1206,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml index 6c6f1e84c3..35331dc4d4 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64+mshv.xml @@ -2223,6 +2223,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml index 14e8e30f1c..7fba7f45f3 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml @@ -2226,6 +2226,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml index 84d3022006..1613b28b71 100644 --- a/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-virt.aarch64.xml @@ -144,6 +144,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0.aarch64.xml b/tests/domaincapsdata/qemu_10.2.0.aarch64.xml index 84d3022006..1613b28b71 100644 --- a/tests/domaincapsdata/qemu_10.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.aarch64.xml @@ -144,6 +144,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml index c8f2585d7d..faf9b15e0d 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64+mshv.xml @@ -110,6 +110,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml index 333bbaa698..811951cde5 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml @@ -1206,6 +1206,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml index be89b0a4f2..1e1b6b723e 100644 --- a/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-q35.x86_64.xml @@ -1206,6 +1206,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml index bb611142b3..d87c1277d3 100644 --- a/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-tcg.x86_64.xml @@ -2226,6 +2226,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml index 906e3c1e68..d0245d0837 100644 --- a/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_11.0.0-virt.aarch64.xml @@ -144,6 +144,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_11.0.0.aarch64.xml b/tests/domaincapsdata/qemu_11.0.0.aarch64.xml index 906e3c1e68..d0245d0837 100644 --- a/tests/domaincapsdata/qemu_11.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.aarch64.xml @@ -144,6 +144,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml index 956d59f877..58d5093886 100644 --- a/tests/domaincapsdata/qemu_11.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_11.0.0.x86_64.xml @@ -1206,6 +1206,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index b14cbddc59..0b66b77e73 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -1060,6 +1060,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 51547bf505..ce4b14f28c 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -1862,6 +1862,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 411925ad66..fb8361ae97 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -108,6 +108,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index ab387c862e..33b2e4905e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -1060,6 +1060,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 4bbcb516ec..2d7519ae94 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -1089,6 +1089,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 839f0600c2..01975a5e34 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -1888,6 +1888,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 147d1bf7fb..03bbe16497 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -110,6 +110,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 612b5a44cc..8fa3d3e0f4 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -1089,6 +1089,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index a031b673dd..1991133a62 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -1056,6 +1056,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index 9360f8fadf..41bfdbecb6 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -1836,6 +1836,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index f3a2dfe6ff..03d6b23a45 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -103,6 +103,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 6738d8f852..54e8e9d87a 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -1056,6 +1056,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index b338bcc470..58ef1bde99 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -1061,6 +1061,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index 39eb10dc7a..7c325b52aa 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -1061,6 +1061,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index 77fce0eb95..27ecea6fe0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -1541,6 +1541,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index 77fce0eb95..27ecea6fe0 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -1541,6 +1541,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 8bda6af431..7cbde763ef 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -102,6 +102,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index 16708c3d85..b9a174368a 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -1061,6 +1061,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index 4acd9b76b2..60893adebf 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -1143,6 +1143,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index c8efc8f183..23e41eb13c 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -1636,6 +1636,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index cfa00f3150..daa91d428f 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -1143,6 +1143,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index 83a703da52..df003825ea 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -1402,6 +1402,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index 725002966d..10330281bd 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -1658,6 +1658,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 0872931dd7..c86f0113f3 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -371,6 +371,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 6a3cb84342..205334e84b 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -1402,6 +1402,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml index a25cf01799..bd9dbf8cba 100644 --- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml @@ -1403,6 +1403,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml index eead5ff076..10e514dd45 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml @@ -106,6 +106,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml index 3b986eb386..60e5cb8632 100644 --- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml @@ -1624,6 +1624,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml index bb563d6e6c..f67204a14c 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.aarch64.xml @@ -154,6 +154,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml index 4d441289a4..6e05a09abb 100644 --- a/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml @@ -110,6 +110,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml index bb563d6e6c..f67204a14c 100644 --- a/tests/domaincapsdata/qemu_8.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.aarch64.xml @@ -154,6 +154,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml index 5c467d4a14..7a537a1abc 100644 --- a/tests/domaincapsdata/qemu_8.2.0.armv7l.xml +++ b/tests/domaincapsdata/qemu_8.2.0.armv7l.xml @@ -104,6 +104,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml index 5126dd4d00..ad80492e30 100644 --- a/tests/domaincapsdata/qemu_8.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml @@ -372,6 +372,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml index 57cd4d63de..c6558915c1 100644 --- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml @@ -1403,6 +1403,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml index c7932014ad..930014727d 100644 --- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml @@ -1403,6 +1403,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml index 3593d70166..19adcfe249 100644 --- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml @@ -1553,6 +1553,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.0.0.sparc.xml b/tests/domaincapsdata/qemu_9.0.0.sparc.xml index 6b4dd3c3b5..062e55718b 100644 --- a/tests/domaincapsdata/qemu_9.0.0.sparc.xml +++ b/tests/domaincapsdata/qemu_9.0.0.sparc.xml @@ -90,6 +90,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'/> diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml index 96303a31cd..bc4e7fa1ee 100644 --- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml @@ -1403,6 +1403,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml index 518a6811fe..927c1b4fab 100644 --- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml @@ -1539,6 +1539,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml index ce7fe71141..cb519f348c 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg-virt.riscv64.xml @@ -117,6 +117,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml index 70928471b3..a8b1bfed73 100644 --- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml @@ -1658,6 +1658,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml index fabb09bf72..8e9bd3a15b 100644 --- a/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_9.1.0-virt.riscv64.xml @@ -106,6 +106,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsdata/qemu_9.1.0.s390x.xml index d4649de513..2854713ca3 100644 --- a/tests/domaincapsdata/qemu_9.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -235,6 +235,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml index ee101364cc..e4d36b95ac 100644 --- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml @@ -1539,6 +1539,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml index ae657c7f72..db51e7b120 100644 --- a/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_9.2.0-hvf.aarch64+hvf.xml @@ -151,6 +151,9 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml index 35dc5785bc..39bdb2615b 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64+amdsev.xml @@ -736,6 +736,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml index baaaf4f91c..cc31c01dee 100644 --- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml @@ -1597,6 +1597,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml index 033004a1f4..d01e029394 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64+amdsev.xml @@ -1705,6 +1705,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml index f20fe882c6..6088c4b905 100644 --- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml @@ -1705,6 +1705,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0.s390x.xml b/tests/domaincapsdata/qemu_9.2.0.s390x.xml index 21a1b4f5a9..ef379afe69 100644 --- a/tests/domaincapsdata/qemu_9.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_9.2.0.s390x.xml @@ -235,6 +235,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml index 39390d2ab6..c0485f8ffa 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64+amdsev.xml @@ -736,6 +736,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml index c477a1d2c4..dcb78a93c6 100644 --- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml @@ -1597,6 +1597,10 @@ <value>default</value> <value>vfio</value> </enum> + <enum name='iommufd'> + <value>yes</value> + <value>no</value> + </enum> </hostdev> <rng supported='yes'> <enum name='model'> diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index 7bece6c8c1..370ce35709 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -16,11 +16,13 @@ #include <config.h> +#include "virfile.h" #include "virhostcpu.h" #include "virhostmem.h" +#include "viriommufd.h" +#include "virmock.h" #if WITH_QEMU -# include "virmock.h" # include "qemu/qemu_capabilities.h" #endif @@ -78,3 +80,16 @@ virHostMemGetTHPSize(unsigned long long *size) *size = 2048; return 0; } + +static bool (*real_virFileExists)(const char *path); + +bool +virFileExists(const char *path) +{ + VIR_MOCK_REAL_INIT(virFileExists); + + if (STREQ(path, VIR_IOMMU_DEV_PATH)) + return true; + + return real_virFileExists(path); +} -- 2.53.0