External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanups

Browse Source 
- Fix documentation for virGetStorageVol: it has 'key' argument instead
  of 'uuid'.
- Remove TODO comment from virReleaseStorageVol: we use volume key as an
  identifier instead of UUID.
- Print human-readable UUID string in debug message in virReleaseSecret.
This commit is contained in:
Jiri Denemark 2010-06-17 16:45:29 +02:00
parent 72a7f8b2a9
commit d147b18de2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/datatypes.c
View File

@ -939,7 +939,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) {
* @conn: the hypervisor connection * @conn: the hypervisor connection
* @pool: pool owning the volume * @pool: pool owning the volume
* @name: pointer to the storage vol name * @name: pointer to the storage vol name
* @uuid: pointer to the uuid * @key: pointer to unique key of the volume
* *
* Lookup if the storage vol is already registered for that connection, * Lookup if the storage vol is already registered for that connection,
* if yes return a new pointer to it, if no allocate a new structure, * if yes return a new pointer to it, if no allocate a new structure,
@ -1025,7 +1025,6 @@ virReleaseStorageVol(virStorageVolPtr vol) {
virConnectPtr conn = vol->conn; virConnectPtr conn = vol->conn;
DEBUG("release vol %p %s", vol, vol->name); DEBUG("release vol %p %s", vol, vol->name);
/* TODO search by UUID first as they are better differentiators */
if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) {
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -1291,9 +1290,10 @@ static void
virReleaseSecret(virSecretPtr secret) { virReleaseSecret(virSecretPtr secret) {
virConnectPtr conn = secret->conn; virConnectPtr conn = secret->conn;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
DEBUG("release secret %p %p", secret, secret->uuid);
virUUIDFormat(secret->uuid, uuidstr); virUUIDFormat(secret->uuid, uuidstr);
DEBUG("release secret %p %s", secret, uuidstr);
if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) { if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) {
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",