[libvirt] [PATCH 1/8] virHostdevGetPCIHostDeviceList: Add @pci a bit later
This function is a good candidate for VIR_AUTOPTR() conversion.
But things conversion will be easier if we only add @pci device
onto @pcidevs list after it was all set up.
This is no functional change.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/util/virhostdev.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index fe176f35e4..9c63d0aebd 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -240,11 +240,6 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int
nhostdevs)
virObjectUnref(pcidevs);
return NULL;
}
- if (virPCIDeviceListAdd(pcidevs, pci) < 0) {
- virPCIDeviceFree(pci);
- virObjectUnref(pcidevs);
- return NULL;
- }
virPCIDeviceSetManaged(pci, hostdev->managed);
@@ -254,6 +249,12 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int
nhostdevs)
virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_XEN);
else
virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_KVM);
+
+ if (virPCIDeviceListAdd(pcidevs, pci) < 0) {
+ virPCIDeviceFree(pci);
+ virObjectUnref(pcidevs);
+ return NULL;
+ }
}
return pcidevs;
--
2.21.0