Re: [libvirt] [PATCH 22/24] hostdev: Streamline device ownership tracking

>> - /* Step 5: Now mark all the devices as active */ >> + /* Step 5: Move devices from the inactive list to the active list */ >> for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { >> virPCIDevicePtr pci = virPCIDeviceListGet(pcidevs, i); >> + virPCIDevicePtr actual; >> >> - VIR_DEBUG("Adding PCI device %s to active list", >> + VIR_DEBUG("Removing PCI device %s from inactive list", >> virPCIDeviceGetName(pci)); >> - if (virPCIDeviceListAdd(mgr->activePCIHostdevs, pci) < 0) >> - goto inactivedevs; >> - } >> - >> - /* Step 6: Now remove the devices from inactive list. */ >> - for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { >> - virPCIDevicePtr pci = virPCIDeviceListGet(pcidevs, i); >> + actual = virPCIDeviceListSteal(mgr->inactivePCIHostdevs, pci); >> >> - VIR_DEBUG("Removing PCI device %s from inactive list", >> + VIR_DEBUG("Adding PCI device %s to active list", >> virPCIDeviceGetName(pci)); >> - virPCIDeviceListDel(mgr->inactivePCIHostdevs, pci); >> + if (!actual || virPCIDeviceListAdd(mgr->activePCIHostdevs, actual) < 0) >> + goto inactivedevs; >> } > > This is so much more logical to me than the previous code. Yay :)