Commit id '5ab746b8' introduced the function as perhaps a copy of storageVolLookupByPath; however, it did not use the @cleanpath variable even though it used the virFileSanitizePath. So in essance the only "check" being done for failure is whether it was possible to strdup the path. Looking at the virStoragePoolDefParseXML one will note that the target.path is stored using the result of virFileSanitizePath. Therefore, this function should sanitize and use the input @path for the argument to storagePoolLookupByTargetPathCallback which is comparing against stored target.path values. Additionally, if there was an error we should use the proper error of VIR_ERR_NO_STORAGE_POOL (instead of VIR_ERR_NO_STORAGE_VOL). Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/storage/storage_driver.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 561ca36f9..699a38281 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1667,7 +1667,7 @@ storagePoolLookupByTargetPath(virConnectPtr conn, storageDriverLock(); if ((obj = virStoragePoolObjListSearch(&driver->pools, storagePoolLookupByTargetPathCallback, - path))) { + cleanpath))) { def = virStoragePoolObjGetDef(obj); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); virStoragePoolObjEndAPI(&obj); @@ -1675,9 +1675,15 @@ storagePoolLookupByTargetPath(virConnectPtr conn, storageDriverUnlock(); if (!pool) { - virReportError(VIR_ERR_NO_STORAGE_VOL, - _("no storage pool with matching target path '%s'"), - path); + if (STREQ(path, cleanpath)) { + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching target path '%s'"), + path); + } else { + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching target path '%s' (%s)"), + path, cleanpath); + } } VIR_FREE(cleanpath); -- 2.13.6

Now that we have a private storage pool list, we can take the next step and convert to using objects. In this case, we're going to use RWLockable objects (just like every other driver) with two hash tables for lookup by UUID or Name. Along the way the ForEach and Search API's will be adjusted to use the related Hash API's and the various FindBy functions altered and augmented to allow for HashLookup w/ and w/o the pool lock already taken. After virStoragePoolObjRemove we will need to virObjectUnref(obj) after to indicate the caller is "done" with it's reference. The Unlock occurs during the Remove. The NumOf, GetNames, and Export functions all have their own callback functions to return the required data and the FindDuplicate code can use the HashSearch function callbacks. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/virstorageobj.c | 638 +++++++++++++++++++++++++++++-------------- src/conf/virstorageobj.h | 3 - src/libvirt_private.syms | 1 - src/storage/storage_driver.c | 8 +- src/test/test_driver.c | 7 +- 5 files changed, 449 insertions(+), 208 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index a48346b24..0e5c98bf7 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -27,6 +27,7 @@ #include "viralloc.h" #include "virerror.h" #include "virfile.h" +#include "virhash.h" #include "virlog.h" #include "virscsihost.h" #include "virstring.h" @@ -37,9 +38,12 @@ VIR_LOG_INIT("conf.virstorageobj"); static virClassPtr virStoragePoolObjClass; +static virClassPtr virStoragePoolObjListClass; static void virStoragePoolObjDispose(void *opaque); +static void +virStoragePoolObjListDispose(void *opaque); struct _virStorageVolDefList { @@ -63,8 +67,15 @@ struct _virStoragePoolObj { }; struct _virStoragePoolObjList { - size_t count; - virStoragePoolObjPtr *objs; + virObjectRWLockable parent; + + /* uuid string -> virStoragePoolObj mapping + * for (1), lockless lookup-by-uuid */ + virHashTable *objs; + + /* name string -> virStoragePoolObj mapping + * for (1), lockless lookup-by-name */ + virHashTable *objsName; }; @@ -77,6 +88,12 @@ virStoragePoolObjOnceInit(void) virStoragePoolObjDispose))) return -1; + if (!(virStoragePoolObjListClass = virClassNew(virClassForObjectRWLockable(), + "virStoragePoolObjList", + sizeof(virStoragePoolObjList), + virStoragePoolObjListDispose))) + return -1; + return 0; } @@ -240,13 +257,15 @@ virStoragePoolObjDispose(void *opaque) void -virStoragePoolObjListFree(virStoragePoolObjListPtr pools) +virStoragePoolObjListDispose(void *opaque) { - size_t i; - for (i = 0; i < pools->count; i++) - virObjectUnref(pools->objs[i]); - VIR_FREE(pools->objs); - VIR_FREE(pools); + virStoragePoolObjListPtr pools = opaque; + + if (!pools) + return; + + virHashFree(pools->objs); + virHashFree(pools->objsName); } @@ -255,13 +274,44 @@ virStoragePoolObjListNew(void) { virStoragePoolObjListPtr pools; - if (VIR_ALLOC(pools) < 0) + if (virStoragePoolObjInitialize() < 0) + return NULL; + + if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass))) + return NULL; + + if (!(pools->objs = virHashCreate(20, virObjectFreeHashData)) || + !(pools->objsName = virHashCreate(20, virObjectFreeHashData))) { + virObjectUnref(pools); return NULL; + } return pools; } +struct _virStoragePoolObjListForEachData { + virStoragePoolObjListIterator iter; + const void *opaque; +}; + +static int +virStoragePoolObjListForEachCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virStoragePoolObjPtr obj = payload; + struct _virStoragePoolObjListForEachData *data = + (struct _virStoragePoolObjListForEachData *)opaque; + + virObjectLock(obj); + data->iter(obj, data->opaque); + virObjectUnlock(obj); + + return 0; +} + + /** * virStoragePoolObjListForEach * @pools: Pointer to pools object @@ -279,15 +329,35 @@ virStoragePoolObjListForEach(virStoragePoolObjListPtr pools, virStoragePoolObjListIterator iter, const void *opaque) { - size_t i; - virStoragePoolObjPtr obj; + struct _virStoragePoolObjListForEachData data = { .iter = iter, + .opaque = opaque }; - for (i = 0; i < pools->count; i++) { - obj = pools->objs[i]; - virObjectLock(obj); - iter(obj, opaque); - virObjectUnlock(obj); - } + virObjectRWLockRead(pools); + virHashForEach(pools->objs, virStoragePoolObjListForEachCb, &data); + virObjectRWUnlock(pools); +} + + +struct _virStoragePoolObjListSearchData { + virStoragePoolObjListSearcher searcher; + const void *opaque; +}; + + +static int +virStoragePoolObjListSearchCb(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *opaque) +{ + virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; + struct _virStoragePoolObjListSearchData *data = + (struct _virStoragePoolObjListSearchData *)opaque; + + virObjectLock(obj); + if (data->searcher(obj, data->opaque)) + return 1; + virObjectUnlock(obj); + return 0; } @@ -308,18 +378,15 @@ virStoragePoolObjListSearch(virStoragePoolObjListPtr pools, virStoragePoolObjListSearcher searcher, const void *opaque) { - size_t i; - virStoragePoolObjPtr obj; + virStoragePoolObjPtr obj = NULL; + struct _virStoragePoolObjListSearchData data = { .searcher = searcher, + .opaque = opaque }; - for (i = 0; i < pools->count; i++) { - obj = pools->objs[i]; - virObjectLock(obj); - if (searcher(obj, opaque)) - return virObjectRef(obj); - virObjectUnlock(obj); - } + virObjectRWLockRead(pools); + obj = virHashSearch(pools->objs, virStoragePoolObjListSearchCb, &data, NULL); + virObjectRWUnlock(pools); - return NULL; + return virObjectRef(obj); } @@ -327,59 +394,88 @@ void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, virStoragePoolObjPtr obj) { - size_t i; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(obj->def->uuid, uuidstr); + virObjectRef(obj); virObjectUnlock(obj); + virObjectRWLockWrite(pools); + virObjectLock(obj); + virHashRemoveEntry(pools->objs, uuidstr); + virHashRemoveEntry(pools->objsName, obj->def->name); + virObjectUnlock(obj); + virObjectUnref(obj); + virObjectRWUnlock(pools); +} - for (i = 0; i < pools->count; i++) { - virObjectLock(pools->objs[i]); - if (pools->objs[i] == obj) { - virObjectUnlock(pools->objs[i]); - virObjectUnref(pools->objs[i]); - VIR_DELETE_ELEMENT(pools->objs, i, pools->count); - break; - } - virObjectUnlock(pools->objs[i]); - } +static virStoragePoolObjPtr +virStoragePoolObjFindByUUIDLocked(virStoragePoolObjListPtr pools, + const unsigned char *uuid) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(uuid, uuidstr); + + return virObjectRef(virHashLookup(pools->objs, uuidstr)); } +/** + * virStoragePoolObjFindByUUID + * @pools: Storage pool object list pointer + * @uuid: Storage object uuid to find + * + * Lock the @pools and lookup the object by @uuid + * + * Returns: Locked and reffed storage pool object or NULL if not found + */ virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, const unsigned char *uuid) { - size_t i; - - for (i = 0; i < pools->count; i++) { - virStoragePoolObjPtr obj = pools->objs[i]; + virStoragePoolObjPtr obj; + virObjectRWLockRead(pools); + obj = virStoragePoolObjFindByUUIDLocked(pools, uuid); + virObjectRWUnlock(pools); + if (obj) virObjectLock(obj); - if (!memcmp(obj->def->uuid, uuid, VIR_UUID_BUFLEN)) - return virObjectRef(obj); - virObjectUnlock(obj); - } - return NULL; + return obj; +} + + +static virStoragePoolObjPtr +virStoragePoolObjFindByNameLocked(virStoragePoolObjListPtr pools, + const char *name) +{ + return virObjectRef(virHashLookup(pools->objsName, name)); } +/** + * virStoragePoolObjFindByName + * @pools: Storage pool object list pointer + * @name: Storage object name to find + * + * Lock the @pools and lookup the object by @name + * + * Returns: Locked and reffed storage pool object or NULL if not found + */ virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name) { - size_t i; - - for (i = 0; i < pools->count; i++) { - virStoragePoolObjPtr obj = pools->objs[i]; + virStoragePoolObjPtr obj; + virObjectRWLockRead(pools); + obj = virStoragePoolObjFindByNameLocked(pools, name); + virObjectRWUnlock(pools); + if (obj) virObjectLock(obj); - if (STREQ(obj->def->name, name)) - return virObjectRef(obj); - virObjectUnlock(obj); - } - return NULL; + return obj; } @@ -623,13 +719,27 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, } +/** + * virStoragePoolObjAssignDef: + * @pools: Storage Pool object list pointer + * @def: Storage pool definition to add or update + * + * Lookup the @def to see if it already exists in the @pools in order + * to either update or add if it does not exist. + * + * Returns locked and reffed object pointer or NULL on error + */ virStoragePoolObjPtr virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def) { virStoragePoolObjPtr obj; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virObjectRWLockWrite(pools); - if ((obj = virStoragePoolObjFindByName(pools, def->name))) { + if ((obj = virStoragePoolObjFindByNameLocked(pools, def->name))) { + virObjectLock(obj); if (!virStoragePoolObjIsActive(obj)) { virStoragePoolDefFree(obj->def); obj->def = def; @@ -637,19 +747,31 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, virStoragePoolDefFree(obj->newDef); obj->newDef = def; } + virObjectRWUnlock(pools); return obj; } if (!(obj = virStoragePoolObjNew())) return NULL; - if (VIR_APPEND_ELEMENT_COPY(pools->objs, pools->count, obj) < 0) { - virStoragePoolObjEndAPI(&obj); - return NULL; + virUUIDFormat(def->uuid, uuidstr); + if (virHashAddEntry(pools->objs, uuidstr, obj) < 0) + goto error; + virObjectRef(obj); + + if (virHashAddEntry(pools->objsName, def->name, obj) < 0) { + virHashRemoveEntry(pools->objs, uuidstr); + goto error; } + virObjectRef(obj); obj->def = def; + virObjectRWUnlock(pools); + return obj; - return virObjectRef(obj); + error: + virStoragePoolObjEndAPI(&obj); + virObjectRWUnlock(pools); + return NULL; } @@ -682,11 +804,13 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, VIR_FREE(obj->configFile); /* for driver reload */ if (VIR_STRDUP(obj->configFile, path) < 0) { virStoragePoolObjRemove(pools, obj); + virObjectUnref(obj); return NULL; } VIR_FREE(obj->autostartLink); /* for driver reload */ if (VIR_STRDUP(obj->autostartLink, autostartLink) < 0) { virStoragePoolObjRemove(pools, obj); + virObjectUnref(obj); return NULL; } @@ -875,26 +999,100 @@ virStoragePoolObjDeleteDef(virStoragePoolObjPtr obj) } +struct _virStoragePoolCountData { + virConnectPtr conn; + virStoragePoolObjListACLFilter filter; + bool wantActive; + int count; +}; + + +static int +virStoragePoolObjNumOfStoragePoolsCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virStoragePoolObjPtr obj = payload; + struct _virStoragePoolCountData *data = opaque; + + virObjectLock(obj); + + if (data->filter && !data->filter(data->conn, obj->def)) + goto cleanup; + + if (data->wantActive != virStoragePoolObjIsActive(obj)) + goto cleanup; + + data->count++; + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virStoragePoolObjNumOfStoragePools(virStoragePoolObjListPtr pools, virConnectPtr conn, bool wantActive, virStoragePoolObjListACLFilter filter) { - int npools = 0; - size_t i; + struct _virStoragePoolCountData data = { + .conn = conn, .filter = filter, .wantActive = wantActive, .count = 0 }; - for (i = 0; i < pools->count; i++) { - virStoragePoolObjPtr obj = pools->objs[i]; - virObjectLock(obj); - if (!filter || filter(conn, obj->def)) { - if (wantActive == virStoragePoolObjIsActive(obj)) - npools++; + virObjectRWLockRead(pools); + virHashForEach(pools->objs, virStoragePoolObjNumOfStoragePoolsCb, &data); + virObjectRWUnlock(pools); + + return data.count; +} + + +struct _virStoragePoolNameData { + virConnectPtr conn; + virStoragePoolObjListACLFilter filter; + bool wantActive; + bool error; + int nnames; + int maxnames; + char **const names; +}; + + +static int +virStoragePoolObjGetNamesCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virStoragePoolObjPtr obj = payload; + struct _virStoragePoolNameData *data = opaque; + + if (data->error) + return 0; + + if (data->maxnames >= 0 && data->nnames == data->maxnames) + return 0; + + virObjectLock(obj); + + if (data->filter && !data->filter(data->conn, obj->def)) + goto cleanup; + + if (data->wantActive != virStoragePoolObjIsActive(obj)) + goto cleanup; + + if (data->names) { + if (VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) { + data->error = true; + goto cleanup; } - virObjectUnlock(obj); } - return npools; + data->nnames++; + + cleanup: + virObjectUnlock(obj); + return 0; } @@ -906,30 +1104,22 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, char **const names, int maxnames) { - int nnames = 0; - size_t i; + struct _virStoragePoolNameData data = { + .conn = conn, .filter = filter, .wantActive = wantActive, + .error = false, .nnames = 0, .maxnames = maxnames, .names = names }; - for (i = 0; i < pools->count && nnames < maxnames; i++) { - virStoragePoolObjPtr obj = pools->objs[i]; - virObjectLock(obj); - if (!filter || filter(conn, obj->def)) { - if (wantActive == virStoragePoolObjIsActive(obj)) { - if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { - virObjectUnlock(obj); - goto failure; - } - nnames++; - } - } - virObjectUnlock(obj); - } + virObjectRWLockRead(pools); + virHashForEach(pools->objs, virStoragePoolObjGetNamesCb, &data); + virObjectRWUnlock(pools); - return nnames; + if (data.error) + goto error; - failure: - while (--nnames >= 0) - VIR_FREE(names[nnames]); + return data.nnames; + error: + while (data.nnames) + VIR_FREE(data.names[--data.nnames]); return -1; } @@ -1288,89 +1478,103 @@ virStoragePoolObjSourceMatchTypeDEVICE(virStoragePoolObjPtr obj, } +struct _virStoragePoolObjFindDuplicateData { + virConnectPtr conn; + virStoragePoolDefPtr def; +}; + +static int +virStoragePoolObjSourceFindDuplicateCb(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *opaque) +{ + virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; + struct _virStoragePoolObjFindDuplicateData *data = + (struct _virStoragePoolObjFindDuplicateData *) opaque; + + /* Don't match against ourself if re-defining existing pool ! */ + if (STREQ(obj->def->name, data->def->name)) + return 0; + + switch ((virStoragePoolType)obj->def->type) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_GLUSTER: + case VIR_STORAGE_POOL_NETFS: + if (data->def->type == obj->def->type && + virStoragePoolObjSourceMatchTypeDIR(obj, data->def)) + return 1; + break; + + case VIR_STORAGE_POOL_SCSI: + if (data->def->type == obj->def->type && + virStoragePoolObjSourceMatchTypeISCSI(obj, data->def, data->conn)) + return 1; + break; + + case VIR_STORAGE_POOL_ISCSI: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + case VIR_STORAGE_POOL_ZFS: + if ((data->def->type == VIR_STORAGE_POOL_ISCSI || + data->def->type == VIR_STORAGE_POOL_FS || + data->def->type == VIR_STORAGE_POOL_LOGICAL || + data->def->type == VIR_STORAGE_POOL_DISK || + data->def->type == VIR_STORAGE_POOL_ZFS) && + virStoragePoolObjSourceMatchTypeDEVICE(obj, data->def)) + return 1; + break; + + case VIR_STORAGE_POOL_SHEEPDOG: + if (data->def->type == obj->def->type && + virStoragePoolSourceMatchSingleHost(&obj->def->source, + &data->def->source)) + return 1; + break; + + case VIR_STORAGE_POOL_MPATH: + /* Only one mpath pool is valid per host */ + if (data->def->type == obj->def->type) + return 1; + break; + + case VIR_STORAGE_POOL_VSTORAGE: + if (data->def->type == obj->def->type && + STREQ(obj->def->source.name, data->def->source.name)) + return 1; + break; + + case VIR_STORAGE_POOL_RBD: + case VIR_STORAGE_POOL_LAST: + break; + } + + return 0; +} + + int virStoragePoolObjSourceFindDuplicate(virConnectPtr conn, virStoragePoolObjListPtr pools, virStoragePoolDefPtr def) { - size_t i; - int ret = 1; + struct _virStoragePoolObjFindDuplicateData data = { .conn = conn, + .def = def }; virStoragePoolObjPtr obj = NULL; - virStoragePoolObjPtr matchobj = NULL; - /* Check the pool list for duplicate underlying storage */ - for (i = 0; i < pools->count; i++) { - obj = pools->objs[i]; + virObjectRWLockRead(pools); + obj = virHashSearch(pools->objs, virStoragePoolObjSourceFindDuplicateCb, + &data, NULL); + virObjectRWUnlock(pools); - /* Don't match against ourself if re-defining existing pool ! */ - if (STREQ(obj->def->name, def->name)) - continue; - - virObjectLock(obj); - - switch ((virStoragePoolType)obj->def->type) { - case VIR_STORAGE_POOL_DIR: - case VIR_STORAGE_POOL_GLUSTER: - case VIR_STORAGE_POOL_NETFS: - if (def->type == obj->def->type) - matchobj = virStoragePoolObjSourceMatchTypeDIR(obj, def); - break; - - case VIR_STORAGE_POOL_SCSI: - if (def->type == obj->def->type) - matchobj = virStoragePoolObjSourceMatchTypeISCSI(obj, def, - conn); - break; - - case VIR_STORAGE_POOL_ISCSI: - case VIR_STORAGE_POOL_FS: - case VIR_STORAGE_POOL_LOGICAL: - case VIR_STORAGE_POOL_DISK: - case VIR_STORAGE_POOL_ZFS: - if (def->type == VIR_STORAGE_POOL_ISCSI || - def->type == VIR_STORAGE_POOL_FS || - def->type == VIR_STORAGE_POOL_LOGICAL || - def->type == VIR_STORAGE_POOL_DISK || - def->type == VIR_STORAGE_POOL_ZFS) - matchobj = virStoragePoolObjSourceMatchTypeDEVICE(obj, def); - break; - - case VIR_STORAGE_POOL_SHEEPDOG: - if (def->type == obj->def->type && - virStoragePoolSourceMatchSingleHost(&obj->def->source, - &def->source)) - matchobj = obj; - break; - - case VIR_STORAGE_POOL_MPATH: - /* Only one mpath pool is valid per host */ - if (def->type == obj->def->type) - matchobj = obj; - break; - - case VIR_STORAGE_POOL_VSTORAGE: - if (def->type == obj->def->type && - STREQ(obj->def->source.name, def->source.name)) - matchobj = obj; - break; - - case VIR_STORAGE_POOL_RBD: - case VIR_STORAGE_POOL_LAST: - break; - } - virObjectUnlock(obj); - - if (matchobj) - break; - } - - if (matchobj) { + if (obj) { virReportError(VIR_ERR_OPERATION_FAILED, _("Storage source conflict with pool: '%s'"), - matchobj->def->name); - ret = -1; + obj->def->name); + return -1; } - return ret; + + return 0; } @@ -1439,6 +1643,56 @@ virStoragePoolMatch(virStoragePoolObjPtr obj, #undef MATCH +struct _virStoragePoolExportData { + virConnectPtr conn; + virStoragePoolObjListACLFilter filter; + bool checkActive; + bool wantActive; + bool checkMatch; + unsigned int flags; + bool error; + int nPools; + virStoragePoolPtr *pools; +}; + + +static int +virStoragePoolObjListExportCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virStoragePoolObjPtr obj = payload; + struct _virStoragePoolExportData *data = opaque; + virStoragePoolPtr pool = NULL; + + if (data->error) + return 0; + + virObjectLock(obj); + + if (data->filter && !data->filter(data->conn, obj->def)) + goto cleanup; + + if (!virStoragePoolMatch(obj, data->flags)) + goto cleanup; + + if (data->pools) { + if (!(pool = virGetStoragePool(data->conn, obj->def->name, + obj->def->uuid, NULL, NULL))) { + data->error = true; + goto cleanup; + } + data->pools[data->nPools] = pool; + } + + data->nPools++; + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjListPtr poolobjs, @@ -1446,50 +1700,30 @@ virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjListFilter filter, unsigned int flags) { - virStoragePoolPtr *tmp_pools = NULL; - virStoragePoolPtr pool = NULL; - int npools = 0; - int ret = -1; - size_t i; + struct _virStoragePoolExportData data = { + .conn = conn, .filter = filter, .flags = flags, .error = false, + .nPools = 0, .pools = NULL }; - if (pools && VIR_ALLOC_N(tmp_pools, poolobjs->count + 1) < 0) - goto cleanup; + virObjectRWLockRead(poolobjs); - for (i = 0; i < poolobjs->count; i++) { - virStoragePoolObjPtr obj = poolobjs->objs[i]; - virObjectLock(obj); - if ((!filter || filter(conn, obj->def)) && - virStoragePoolMatch(obj, flags)) { - if (pools) { - if (!(pool = virGetStoragePool(conn, - obj->def->name, - obj->def->uuid, - NULL, NULL))) { - virObjectUnlock(obj); - goto cleanup; - } - tmp_pools[npools] = pool; - } - npools++; - } - virObjectUnlock(obj); - } + if (pools && VIR_ALLOC_N(data.pools, virHashSize(poolobjs->objs) + 1) < 0) + goto error; - if (tmp_pools) { - /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(tmp_pools, npools + 1)); - *pools = tmp_pools; - tmp_pools = NULL; - } + virHashForEach(poolobjs->objs, virStoragePoolObjListExportCb, &data); + virObjectRWUnlock(poolobjs); - ret = npools; + if (data.error) + goto error; - cleanup: - if (tmp_pools) { - for (i = 0; i < npools; i++) - virObjectUnref(tmp_pools[i]); + if (data.pools) { + /* trim the array to the final size */ + ignore_value(VIR_REALLOC_N(data.pools, data.nPools + 1)); + *pools = data.pools; } - VIR_FREE(tmp_pools); - return ret; + return data.nPools; + + error: + virObjectListFree(data.pools); + return -1; } diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index d4165fbe7..4f372386a 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -219,9 +219,6 @@ virStoragePoolObjGetNames(virStoragePoolObjListPtr pools, void virStoragePoolObjFree(virStoragePoolObjPtr obj); -void -virStoragePoolObjListFree(virStoragePoolObjListPtr pools); - typedef void (*virStoragePoolObjListIterator)(virStoragePoolObjPtr obj, const void *opaque); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e4744378c..e8924c545 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1095,7 +1095,6 @@ virStoragePoolObjIsAutostart; virStoragePoolObjIsDuplicate; virStoragePoolObjListExport; virStoragePoolObjListForEach; -virStoragePoolObjListFree; virStoragePoolObjListNew; virStoragePoolObjListSearch; virStoragePoolObjLoadAllConfigs; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e0748615a..c9d5b60d8 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -94,6 +94,7 @@ virStoragePoolUpdateInactive(virStoragePoolObjPtr *objptr) if (!virStoragePoolObjGetConfigFile(obj)) { virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); *objptr = NULL; } else if (virStoragePoolObjGetNewDef(obj)) { virStoragePoolObjDefUseNewDef(obj); @@ -375,7 +376,7 @@ storageStateCleanup(void) virObjectUnref(driver->storageEventState); /* free inactive pools */ - virStoragePoolObjListFree(driver->pools); + virObjectUnref(driver->pools); VIR_FREE(driver->configDir); VIR_FREE(driver->autostartDir); @@ -713,6 +714,7 @@ storagePoolCreateXML(virConnectPtr conn, (flags & VIR_STORAGE_POOL_CREATE_WITH_BUILD)) { if (backend->buildPool(conn, obj, build_flags) < 0) { virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -722,6 +724,7 @@ storagePoolCreateXML(virConnectPtr conn, if (backend->startPool && backend->startPool(conn, obj) < 0) { virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -736,6 +739,7 @@ storagePoolCreateXML(virConnectPtr conn, if (backend->stopPool) backend->stopPool(conn, obj); virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -799,6 +803,7 @@ storagePoolDefineXML(virConnectPtr conn, if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -868,6 +873,7 @@ storagePoolUndefine(virStoragePoolPtr pool) VIR_INFO("Undefining storage pool '%s'", def->name); virStoragePoolObjRemove(driver->pools, obj); + virObjectUnref(obj); obj = NULL; ret = 0; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 531e2880c..8adc2167b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -155,7 +155,7 @@ testDriverFree(testDriverPtr driver) virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); virObjectUnref(driver->ifaces); - virStoragePoolObjListFree(driver->pools); + virObjectUnref(driver->pools); virObjectUnref(driver->eventState); virMutexUnlock(&driver->lock); virMutexDestroy(&driver->lock); @@ -4463,6 +4463,7 @@ testStoragePoolCreateXML(virConnectPtr conn, def->source.adapter.data.fchost.wwnn, def->source.adapter.data.fchost.wwpn) < 0) { virStoragePoolObjRemove(privconn->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -4470,6 +4471,7 @@ testStoragePoolCreateXML(virConnectPtr conn, if (testStoragePoolObjSetDefaults(obj) == -1) { virStoragePoolObjRemove(privconn->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -4529,6 +4531,7 @@ testStoragePoolDefineXML(virConnectPtr conn, if (testStoragePoolObjSetDefaults(obj) == -1) { virStoragePoolObjRemove(privconn->pools, obj); + virObjectUnref(obj); obj = NULL; goto cleanup; } @@ -4559,6 +4562,7 @@ testStoragePoolUndefine(virStoragePoolPtr pool) 0); virStoragePoolObjRemove(privconn->pools, obj); + virObjectUnref(obj); testObjectEventQueue(privconn, event); return 0; @@ -4652,6 +4656,7 @@ testStoragePoolDestroy(virStoragePoolPtr pool) if (!(virStoragePoolObjGetConfigFile(obj))) { virStoragePoolObjRemove(privconn->pools, obj); + virObjectUnref(obj); obj = NULL; } ret = 0; -- 2.13.6

On 12/13/2017 11:40 AM, Michal Privoznik wrote: Oh right, it's removed... True - it's probably a holdover from undoing something. Been too long to remember though. Consider it gone. I would think taking a lock is considered violation of const-ness. I can certainly see cause for why a Search callback would say don't change something though. Taking a different approach - if the caller knew that the opaque was a LockableObject, then it could do the right thing and keep the const argument. It could probably even be better if it was a RWReadLock. But that's a different rabbit-hole that I'm not sure I want to jump into yet. Although I did dip my toes in that water and got more or less rejected, so this is as close as I think I'm going to get for now. Thanks for the review - John