NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix memory (and FD) leak on PCI device detach

Browse Source 
Unmanaged PCI devices were only leaked if pciDeviceListAdd failed but
managed devices were always leaked. And leaking PCI device is likely to
leave PCI config file descriptor open. This patch fixes
qemuReattachPciDevice to either free the PCI device or add it to the
inactivePciHostdevs list.
This commit is contained in:
Jiri Denemark
2012-12-04 09:18:44 +01:00
parent 5eb8a7ac4d
commit 6910318798
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_hostdev.c
View File

@@ -546,10 +546,8 @@ int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
}
/* Loop 9: Now steal all the devices from pcidevs */
while (pciDeviceListCount(pcidevs) > 0) {
pciDevice *dev = pciDeviceListGet(pcidevs, 0);
pciDeviceListSteal(pcidevs, dev);
}
while (pciDeviceListCount(pcidevs) > 0)
pciDeviceListStealIndex(pcidevs, 0);
ret = 0;
goto cleanup;
@@ -818,7 +816,8 @@ void qemuReattachPciDevice(pciDevice *dev, virQEMUDriverPtr driver)
* successfully, it must have been inactive.
*/
if (!pciDeviceGetManaged(dev)) {
pciDeviceListAdd(driver->inactivePciHostdevs, dev);
if (pciDeviceListAdd(driver->inactivePciHostdevs, dev) < 0)
pciFreeDevice(dev);
return;
}
@@ -835,6 +834,7 @@ void qemuReattachPciDevice(pciDevice *dev, virQEMUDriverPtr driver)
err ? err->message : _("unknown error"));
virResetError(err);
}
pciFreeDevice(dev);
}
@@ -905,8 +905,8 @@ void qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
}
}
for (i = 0; i < pciDeviceListCount(pcidevs); i++) {
pciDevice *dev = pciDeviceListGet(pcidevs, i);
while (pciDeviceListCount(pcidevs) > 0) {
pciDevice *dev = pciDeviceListStealIndex(pcidevs, 0);
qemuReattachPciDevice(dev, driver);
}