Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 42 ++++++++++++---------------------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 98d34f408d..453e301041 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -32663,6 +32663,20 @@ virDomainDefHasPCIHostdev(const virDomainDef *def) } +bool +virDomainDefHasPCIHostdevWithIOMMUFD(const virDomainDef *def) +{ + size_t i; + + for (i = 0; i < def->nhostdevs; i++) { + if (virHostdevIsPCIDeviceWithIOMMUFD(def->hostdevs[i])) + return true; + } + + return false; +} + + bool virDomainDefHasMdevHostdev(const virDomainDef *def) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f98fed650a..a13f6d79e9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4662,6 +4662,9 @@ virDomainDefHasNVMeDisk(const virDomainDef *def); bool virDomainDefHasPCIHostdev(const virDomainDef *def); +bool +virDomainDefHasPCIHostdevWithIOMMUFD(const virDomainDef *def); + bool virDomainDefHasMdevHostdev(const virDomainDef *def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 15a56a262a..d8ae4f46cd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -348,6 +348,7 @@ virDomainDefHasNVMeDisk; virDomainDefHasOldStyleROUEFI; virDomainDefHasOldStyleUEFI; virDomainDefHasPCIHostdev; +virDomainDefHasPCIHostdevWithIOMMUFD; virDomainDefHasTimer; virDomainDefHasUSB; virDomainDefHasVcpusOffline; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c09c883a28..f400835332 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5356,43 +5356,25 @@ qemuBuildIOMMUFDCommandLine(virCommand *cmd, const virDomainDef *def, virDomainObj *vm) { - size_t i; qemuDomainObjPrivate *priv = vm->privateData; g_autofree char *fdstr = g_strdup_printf("%d", priv->iommufd); + g_autoptr(virJSONValue) props = NULL; + if (!virDomainDefHasPCIHostdevWithIOMMUFD(def)) + return 0; - for (i = 0; i < def->nhostdevs; i++) { - virDomainHostdevDef *hostdev = def->hostdevs[i]; - virDomainHostdevSubsys *subsys = &hostdev->source.subsys; - g_autoptr(virJSONValue) props = NULL; + virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) - continue; + priv->iommufd = -1; - if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) - continue; + if (qemuMonitorCreateObjectProps(&props, "iommufd", + "iommufd0", + "S:fd", fdstr, + NULL) < 0) + return -1; - if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED) - continue; - - if (subsys->u.pci.driver.iommufd != VIR_TRISTATE_BOOL_YES) - continue; - - virCommandPassFD(cmd, priv->iommufd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - - priv->iommufd = -1; - - if (qemuMonitorCreateObjectProps(&props, "iommufd", - "iommufd0", - "S:fd", fdstr, - NULL) < 0) - return -1; - - if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) - return -1; - - break; - } + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) + return -1; return 0; } -- 2.53.0