openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Create local virStoragePoolObjPtr VolLookup APIs 

Rather than accessing privconn->pools.objs[i] in the for loop,
let's use an @obj variable to make it easier to read the code.
This commit is contained in:
John Ferlan 2017-07-26 13:38:45 -04:00
parent 3a867d9e52
commit bb34b61bdf
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/test_driver.c
View File

@ -4905,27 +4905,28 @@ testStorageVolLookupByKey(virConnectPtr conn,
const char *key) const char *key)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virStoragePoolObjPtr obj;
size_t i; size_t i;
virStorageVolPtr ret = NULL; virStorageVolPtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
for (i = 0; i < privconn->pools.count; i++) { for (i = 0; i < privconn->pools.count; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]); obj = privconn->pools.objs[i];
if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { virStoragePoolObjLock(obj);
virStorageVolDefPtr privvol = if (virStoragePoolObjIsActive(obj)) {
virStorageVolDefFindByKey(privconn->pools.objs[i], key); virStorageVolDefPtr privvol = virStorageVolDefFindByKey(obj, key);
if (privvol) { if (privvol) {
ret = virGetStorageVol(conn, ret = virGetStorageVol(conn,
privconn->pools.objs[i]->def->name, obj->def->name,
privvol->name, privvol->name,
privvol->key, privvol->key,
NULL, NULL); NULL, NULL);
virStoragePoolObjUnlock(privconn->pools.objs[i]); virStoragePoolObjUnlock(obj);
break; break;
} }
} }
virStoragePoolObjUnlock(privconn->pools.objs[i]); virStoragePoolObjUnlock(obj);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -4942,27 +4943,28 @@ testStorageVolLookupByPath(virConnectPtr conn,
const char *path) const char *path)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virStoragePoolObjPtr obj;
size_t i; size_t i;
virStorageVolPtr ret = NULL; virStorageVolPtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
for (i = 0; i < privconn->pools.count; i++) { for (i = 0; i < privconn->pools.count; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]); obj = privconn->pools.objs[i];
if (virStoragePoolObjIsActive(privconn->pools.objs[i])) { virStoragePoolObjLock(obj);
virStorageVolDefPtr privvol = if (virStoragePoolObjIsActive(obj)) {
virStorageVolDefFindByPath(privconn->pools.objs[i], path); virStorageVolDefPtr privvol = virStorageVolDefFindByPath(obj, path);
if (privvol) { if (privvol) {
ret = virGetStorageVol(conn, ret = virGetStorageVol(conn,
privconn->pools.objs[i]->def->name, obj->def->name,
privvol->name, privvol->name,
privvol->key, privvol->key,
NULL, NULL); NULL, NULL);
virStoragePoolObjUnlock(privconn->pools.objs[i]); virStoragePoolObjUnlock(obj);
break; break;
} }
} }
virStoragePoolObjUnlock(privconn->pools.objs[i]); virStoragePoolObjUnlock(obj);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);