External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

test: Cleanup exit/failure paths of some storage pool APIs

Browse Source 
Rework some of the test driver API's to remove the need to return
failure when testStoragePoolObjFindByName returns NULL rather than
going to cleanup. This removes the need for check for "if (obj)" and in
some instances the need to for a cleanup label and a local ret variable.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-05 17:31:36 -04:00
parent 036d9af303
commit b5e0fa41e2
1 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/test/test_driver.c
View File

@ -4099,14 +4099,12 @@ testStoragePoolLookupByUUID(virConnectPtr conn,
virStoragePoolPtr pool = NULL; virStoragePoolPtr pool = NULL;
if (!(obj = testStoragePoolObjFindByUUID(privconn, uuid))) if (!(obj = testStoragePoolObjFindByUUID(privconn, uuid)))
goto cleanup; return NULL;
pool = virGetStoragePool(conn, obj->def->name, obj->def->uuid, pool = virGetStoragePool(conn, obj->def->name, obj->def->uuid,
NULL, NULL); NULL, NULL);
cleanup: virStoragePoolObjUnlock(obj);
if (obj)
virStoragePoolObjUnlock(obj);
return pool; return pool;
} }
@ -4120,14 +4118,12 @@ testStoragePoolLookupByName(virConnectPtr conn,
virStoragePoolPtr pool = NULL; virStoragePoolPtr pool = NULL;
if (!(obj = testStoragePoolObjFindByName(privconn, name))) if (!(obj = testStoragePoolObjFindByName(privconn, name)))
goto cleanup; return NULL;
pool = virGetStoragePool(conn, obj->def->name, obj->def->uuid, pool = virGetStoragePool(conn, obj->def->name, obj->def->uuid,
NULL, NULL); NULL, NULL);
cleanup: virStoragePoolObjUnlock(obj);
if (obj)
virStoragePoolObjUnlock(obj);
return pool; return pool;
} }
@ -4249,13 +4245,11 @@ testStoragePoolIsPersistent(virStoragePoolPtr pool)
int ret = -1; int ret = -1;
if (!(obj = testStoragePoolObjFindByUUID(privconn, pool->uuid))) if (!(obj = testStoragePoolObjFindByUUID(privconn, pool->uuid)))
goto cleanup; return -1;
ret = obj->configFile ? 1 : 0; ret = obj->configFile ? 1 : 0;
cleanup: virStoragePoolObjUnlock(obj);
if (obj)
virStoragePoolObjUnlock(obj);
return ret; return ret;
} }
@ -4701,10 +4695,9 @@ testStoragePoolGetInfo(virStoragePoolPtr pool,
{ {
testDriverPtr privconn = pool->conn->privateData; testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj; virStoragePoolObjPtr obj;
int ret = -1;
if (!(obj = testStoragePoolObjFindByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
goto cleanup; return -1;
memset(info, 0, sizeof(virStoragePoolInfo)); memset(info, 0, sizeof(virStoragePoolInfo));
if (obj->active) if (obj->active)
@ -4714,12 +4707,9 @@ testStoragePoolGetInfo(virStoragePoolPtr pool,
info->capacity = obj->def->capacity; info->capacity = obj->def->capacity;
info->allocation = obj->def->allocation; info->allocation = obj->def->allocation;
info->available = obj->def->available; info->available = obj->def->available;
ret = 0;
cleanup: virStoragePoolObjUnlock(obj);
if (obj) return 0;
virStoragePoolObjUnlock(obj);
return ret;
} }
@ -4734,13 +4724,11 @@ testStoragePoolGetXMLDesc(virStoragePoolPtr pool,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (!(obj = testStoragePoolObjFindByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
goto cleanup; return NULL;
ret = virStoragePoolDefFormat(obj->def); ret = virStoragePoolDefFormat(obj->def);
cleanup: virStoragePoolObjUnlock(obj);
if (obj)
virStoragePoolObjUnlock(obj);
return ret; return ret;
} }
@ -4751,22 +4739,18 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool,
{ {
testDriverPtr privconn = pool->conn->privateData; testDriverPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr obj; virStoragePoolObjPtr obj;
int ret = -1;
if (!(obj = testStoragePoolObjFindByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
goto cleanup; return -1;
if (!obj->configFile) { if (!obj->configFile) {
*autostart = 0; *autostart = 0;
} else { } else {
*autostart = obj->autostart; *autostart = obj->autostart;
} }
ret = 0;
cleanup: virStoragePoolObjUnlock(obj);
if (obj) return 0;
virStoragePoolObjUnlock(obj);
return ret;
} }
@ -4779,7 +4763,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
int ret = -1; int ret = -1;
if (!(obj = testStoragePoolObjFindByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindByName(privconn, pool->name)))
goto cleanup; return -1;
if (!obj->configFile) { if (!obj->configFile) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -4792,8 +4776,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
ret = 0; ret = 0;
cleanup: cleanup:
if (obj) virStoragePoolObjUnlock(obj);
virStoragePoolObjUnlock(obj);
return ret; return ret;
} }