From 8a0d84e25b2f38b9ce4464ae4c77e0ecde259a45 Mon Sep 17 00:00:00 2001 From: Ján Tomko Date: Oct 19 2017 12:45:15 +0000 Subject: qemuIsMultiFunctionDevice: return early for non-PCI addresses There is no point in iterating over all devices if none of them could possibly match. --- diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 85faa2a..be5fa86 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3751,6 +3751,9 @@ static int qemuComparePCIDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, static bool qemuIsMultiFunctionDevice(virDomainDefPtr def, virDomainDeviceInfoPtr dev) { + if (dev->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + return false; + if (virDomainDeviceInfoIterate(def, qemuComparePCIDevice, dev) < 0) return true; return false; @@ -4852,8 +4855,7 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, goto cleanup; } - if (detach->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - qemuIsMultiFunctionDevice(vm->def, &detach->info)) { + if (qemuIsMultiFunctionDevice(vm->def, &detach->info)) { virReportError(VIR_ERR_OPERATION_FAILED, _("cannot hot unplug multifunction PCI device: %s"), dev->data.disk->dst);