There are couple of functions which get shorter after the
treatment.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/util/virhostdev.c | 105 ++++++++++++++++--------------------------
1 file changed, 39 insertions(+), 66 deletions(-)
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 79a6ec86fe..31ad287866 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -143,49 +143,49 @@ virHostdevManagerDispose(void *obj)
static virHostdevManagerPtr
virHostdevManagerNew(void)
{
- virHostdevManagerPtr hostdevMgr;
+ VIR_AUTOUNREF(virHostdevManagerPtr) hostdevMgr = NULL;
bool privileged = geteuid() == 0;
if (!(hostdevMgr = virObjectNew(virHostdevManagerClass)))
return NULL;
if (!(hostdevMgr->activePCIHostdevs = virPCIDeviceListNew()))
- goto error;
+ return NULL;
if (!(hostdevMgr->activeUSBHostdevs = virUSBDeviceListNew()))
- goto error;
+ return NULL;
if (!(hostdevMgr->inactivePCIHostdevs = virPCIDeviceListNew()))
- goto error;
+ return NULL;
if (!(hostdevMgr->activeSCSIHostdevs = virSCSIDeviceListNew()))
- goto error;
+ return NULL;
if (!(hostdevMgr->activeSCSIVHostHostdevs = virSCSIVHostDeviceListNew()))
- goto error;
+ return NULL;
if (!(hostdevMgr->activeMediatedHostdevs = virMediatedDeviceListNew()))
- goto error;
+ return NULL;
if (privileged) {
if (VIR_STRDUP(hostdevMgr->stateDir, HOSTDEV_STATE_DIR) < 0)
- goto error;
+ return NULL;
if (virFileMakePath(hostdevMgr->stateDir) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("Failed to create state dir '%s'"),
hostdevMgr->stateDir);
- goto error;
+ return NULL;
}
} else {
VIR_AUTOFREE(char *) rundir = NULL;
mode_t old_umask;
if (!(rundir = virGetUserRuntimeDirectory()))
- goto error;
+ return NULL;
if (virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir) < 0)
- goto error;
+ return NULL;
old_umask = umask(077);
@@ -194,16 +194,12 @@ virHostdevManagerNew(void)
virReportError(VIR_ERR_OPERATION_FAILED,
_("Failed to create state dir '%s'"),
hostdevMgr->stateDir);
- goto error;
+ return NULL;
}
umask(old_umask);
}
- return hostdevMgr;
-
- error:
- virObjectUnref(hostdevMgr);
- return NULL;
+ VIR_RETURN_PTR(hostdevMgr);
}
virHostdevManagerPtr
@@ -218,7 +214,7 @@ virHostdevManagerGetDefault(void)
static virPCIDeviceListPtr
virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
{
- virPCIDeviceListPtr pcidevs;
+ VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL;
size_t i;
if (!(pcidevs = virPCIDeviceListNew()))
@@ -236,10 +232,8 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
pci = virPCIDeviceNew(pcisrc->addr.domain, pcisrc->addr.bus,
pcisrc->addr.slot, pcisrc->addr.function);
- if (!pci) {
- virObjectUnref(pcidevs);
+ if (!pci)
return NULL;
- }
virPCIDeviceSetManaged(pci, hostdev->managed);
@@ -250,14 +244,12 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
else
virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_KVM);
- if (virPCIDeviceListAdd(pcidevs, pci) < 0) {
- virObjectUnref(pcidevs);
+ if (virPCIDeviceListAdd(pcidevs, pci) < 0)
return NULL;
- }
pci = NULL;
}
- return pcidevs;
+ VIR_RETURN_PTR(pcidevs);
}
@@ -630,7 +622,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
int nhostdevs,
unsigned int flags)
{
- virPCIDeviceListPtr pcidevs = NULL;
+ VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL;
int last_processed_hostdev_vf = -1;
size_t i;
int ret = -1;
@@ -914,7 +906,6 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
cleanup:
virObjectUnlock(mgr->activePCIHostdevs);
virObjectUnlock(mgr->inactivePCIHostdevs);
- virObjectUnref(pcidevs);
return ret;
}
@@ -957,7 +948,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
int nhostdevs,
const char *oldStateDir)
{
- virPCIDeviceListPtr pcidevs;
+ VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs = NULL;
size_t i;
if (!nhostdevs)
@@ -1088,8 +1079,6 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
virPCIDeviceGetName(actual));
}
- cleanup:
- virObjectUnref(pcidevs);
virObjectUnlock(mgr->activePCIHostdevs);
virObjectUnlock(mgr->inactivePCIHostdevs);
}
@@ -1407,7 +1396,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev,
* automatically found before.
*/
if (vendor) {
- virUSBDeviceListPtr devs;
+ VIR_AUTOUNREF(virUSBDeviceListPtr) devs = NULL;
rc = virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, &devs);
if (rc < 0)
@@ -1417,7 +1406,6 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev,
*usb = virUSBDeviceListGet(devs, 0);
virUSBDeviceListSteal(devs, *usb);
}
- virObjectUnref(devs);
if (rc == 0) {
goto out;
@@ -1467,8 +1455,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr,
unsigned int flags)
{
size_t i;
- int ret = -1;
- virUSBDeviceListPtr list;
+ VIR_AUTOUNREF(virUSBDeviceListPtr) list = NULL;
virUSBDevicePtr tmp;
bool coldBoot = !!(flags & VIR_HOSTDEV_COLD_BOOT);
@@ -1481,7 +1468,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr,
* loop. See virHostdevPreparePCIDevices()
*/
if (!(list = virUSBDeviceListNew()))
- goto cleanup;
+ return -1;
/* Loop 1: build temporary list
*/
@@ -1501,11 +1488,11 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr,
required = false;
if (virHostdevFindUSBDevice(hostdev, required, &usb) < 0)
- goto cleanup;
+ return -1;
if (usb && virUSBDeviceListAdd(list, &usb) < 0) {
virUSBDeviceFree(usb);
- goto cleanup;
+ return -1;
}
}
@@ -1514,7 +1501,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr,
* wrong, perform rollback.
*/
if (virHostdevMarkUSBDevices(mgr, drv_name, dom_name, list) < 0)
- goto cleanup;
+ return -1;
/* Loop 2: Temporary list was successfully merged with
* driver list, so steal all items to avoid freeing them
@@ -1525,11 +1512,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr,
virUSBDeviceListSteal(list, tmp);
}
- ret = 0;
-
- cleanup:
- virObjectUnref(list);
- return ret;
+ return 0;
}
static int
@@ -1569,7 +1552,7 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr,
{
size_t i, j;
int count;
- virSCSIDeviceListPtr list;
+ VIR_AUTOUNREF(virSCSIDeviceListPtr) list = NULL;
virSCSIDevicePtr tmp;
if (!nhostdevs)
@@ -1581,7 +1564,7 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr,
* loop. See virHostdevPreparePCIDevices()
*/
if (!(list = virSCSIDeviceListNew()))
- goto cleanup;
+ return -1;
/* Loop 1: build temporary list */
for (i = 0; i < nhostdevs; i++) {
@@ -1595,7 +1578,7 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr,
continue; /* Not supported for iSCSI */
} else {
if (virHostdevPrepareSCSIHostDevices(hostdev, scsisrc, list) < 0)
- goto cleanup;
+ return -1;
}
}
@@ -1646,7 +1629,6 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr,
virSCSIDeviceListSteal(list, tmp);
}
- virObjectUnref(list);
return 0;
error:
@@ -1655,8 +1637,6 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr,
virSCSIDeviceListSteal(mgr->activeSCSIHostdevs, tmp);
}
virObjectUnlock(mgr->activeSCSIHostdevs);
- cleanup:
- virObjectUnref(list);
return -1;
}
@@ -1669,7 +1649,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
{
size_t i, j;
int count;
- virSCSIVHostDeviceListPtr list;
+ VIR_AUTOUNREF(virSCSIVHostDeviceListPtr) list = NULL;
virSCSIVHostDevicePtr host, tmp;
if (!nhostdevs)
@@ -1681,7 +1661,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
* loop. See virHostdevPreparePCIDevices()
*/
if (!(list = virSCSIVHostDeviceListNew()))
- goto cleanup;
+ return -1;
/* Loop 1: build temporary list */
for (i = 0; i < nhostdevs; i++) {
@@ -1696,11 +1676,11 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
continue; /* Not supported */
if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn)))
- goto cleanup;
+ return -1;
if (virSCSIVHostDeviceListAdd(list, host) < 0) {
virSCSIVHostDeviceFree(host);
- goto cleanup;
+ return -1;
}
}
@@ -1743,7 +1723,6 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
virSCSIVHostDeviceListSteal(list, tmp);
}
- virObjectUnref(list);
return 0;
error:
for (j = 0; j < i; j++) {
@@ -1751,8 +1730,6 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPtr mgr,
virSCSIVHostDeviceListSteal(mgr->activeSCSIVHostHostdevs, tmp);
}
virObjectUnlock(mgr->activeSCSIVHostHostdevs);
- cleanup:
- virObjectUnref(list);
return -1;
}
@@ -1765,8 +1742,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr,
int nhostdevs)
{
size_t i;
- int ret = -1;
- virMediatedDeviceListPtr list;
+ VIR_AUTOUNREF(virMediatedDeviceListPtr) list = NULL;
if (!nhostdevs)
return 0;
@@ -1776,7 +1752,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr,
* A device is appended to the driver list after a series of preparations.
*/
if (!(list = virMediatedDeviceListNew()))
- goto cleanup;
+ return -1;
/* Loop 1: Build a temporary list of ALL mediated devices. */
for (i = 0; i < nhostdevs; i++) {
@@ -1788,11 +1764,11 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr,
continue;
if (!(mdev = virMediatedDeviceNew(src->uuidstr, src->model)))
- goto cleanup;
+ return -1;
if (virMediatedDeviceListAdd(list, &mdev) < 0) {
virMediatedDeviceFree(mdev);
- goto cleanup;
+ return -1;
}
}
@@ -1801,7 +1777,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr,
*/
if (virMediatedDeviceListMarkDevices(mgr->activeMediatedHostdevs,
list, drv_name, dom_name) < 0)
- goto cleanup;
+ return -1;
/* Loop 2: Temporary list was successfully merged with
* driver list, so steal all items to avoid freeing them
@@ -1812,10 +1788,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr mgr,
virMediatedDeviceListSteal(list, tmp);
}
- ret = 0;
- cleanup:
- virObjectUnref(list);
- return ret;
+ return 0;
}
void
--
2.21.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
