External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Alter volume num, name, and export API's to just take obj

Browse Source 
Alter the virStoragePoolObjNumOfVolumes, virStoragePoolObjVolumeGetNames,
and virStoragePoolObjVolumeListExport APIs to take a virStoragePoolObjPtr
instead of the &obj->volumes and obj->def.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-09 07:00:41 -04:00
parent 905f1024bd
commit 7cc30e0ed7
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/virstorageobj.c
View File

@ -196,11 +196,12 @@ virStorageVolDefFindByName(virStoragePoolObjPtr obj,
int int
virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes, virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolDefPtr pooldef,
virStoragePoolVolumeACLFilter aclfilter) virStoragePoolVolumeACLFilter aclfilter)
{ {
virStoragePoolDefPtr pooldef = obj->def;
virStorageVolDefListPtr volumes = &obj->volumes;
int nvolumes = 0; int nvolumes = 0;
size_t i; size_t i;
@ -216,13 +217,14 @@ virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes,
int int
virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes, virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolDefPtr pooldef,
virStoragePoolVolumeACLFilter aclfilter, virStoragePoolVolumeACLFilter aclfilter,
char **const names, char **const names,
int maxnames) int maxnames)
{ {
virStoragePoolDefPtr pooldef = obj->def;
virStorageVolDefListPtr volumes = &obj->volumes;
int nnames = 0; int nnames = 0;
size_t i; size_t i;
@ -247,11 +249,12 @@ virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
int int
virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjVolumeListExport(virConnectPtr conn,
virStorageVolDefListPtr volumes, virStoragePoolObjPtr obj,
virStoragePoolDefPtr pooldef,
virStorageVolPtr **vols, virStorageVolPtr **vols,
virStoragePoolVolumeACLFilter aclfilter) virStoragePoolVolumeACLFilter aclfilter)
{ {
virStoragePoolDefPtr pooldef = obj->def;
virStorageVolDefListPtr volumes = &obj->volumes;
int ret = -1; int ret = -1;
size_t i; size_t i;
virStorageVolPtr *tmp_vols = NULL; virStorageVolPtr *tmp_vols = NULL;

9
src/conf/virstorageobj.h
View File

@ -114,23 +114,20 @@ typedef bool
virStorageVolDefPtr def); virStorageVolDefPtr def);
int int
virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes, virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolDefPtr pooldef,
virStoragePoolVolumeACLFilter aclfilter); virStoragePoolVolumeACLFilter aclfilter);
int int
virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes, virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
virConnectPtr conn, virConnectPtr conn,
virStoragePoolDefPtr pooldef,
virStoragePoolVolumeACLFilter aclfilter, virStoragePoolVolumeACLFilter aclfilter,
char **const names, char **const names,
int maxnames); int maxnames);
int int
virStoragePoolObjVolumeListExport(virConnectPtr conn, virStoragePoolObjVolumeListExport(virConnectPtr conn,
virStorageVolDefListPtr volumes, virStoragePoolObjPtr obj,
virStoragePoolDefPtr pooldef,
virStorageVolPtr **vols, virStorageVolPtr **vols,
virStoragePoolVolumeACLFilter aclfilter); virStoragePoolVolumeACLFilter aclfilter);

7
src/storage/storage_driver.c
View File

@ -1339,7 +1339,7 @@ storagePoolNumOfVolumes(virStoragePoolPtr pool)
goto cleanup; goto cleanup;
} }
ret = virStoragePoolObjNumOfVolumes(&obj->volumes, pool->conn, obj->def, ret = virStoragePoolObjNumOfVolumes(obj, pool->conn,
virStoragePoolNumOfVolumesCheckACL); virStoragePoolNumOfVolumesCheckACL);
cleanup: cleanup:
@ -1368,7 +1368,7 @@ storagePoolListVolumes(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
n = virStoragePoolObjVolumeGetNames(&obj->volumes, pool->conn, obj->def, n = virStoragePoolObjVolumeGetNames(obj, pool->conn,
virStoragePoolListVolumesCheckACL, virStoragePoolListVolumesCheckACL,
names, maxnames); names, maxnames);
cleanup: cleanup:
@ -1399,8 +1399,7 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
ret = virStoragePoolObjVolumeListExport(pool->conn, &obj->volumes, ret = virStoragePoolObjVolumeListExport(pool->conn, obj, vols,
obj->def, vols,
virStoragePoolListAllVolumesCheckACL); virStoragePoolListAllVolumesCheckACL);

9
src/test/test_driver.c
View File

@ -4771,8 +4771,7 @@ testStoragePoolNumOfVolumes(virStoragePoolPtr pool)
if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name)))
return -1; return -1;
ret = virStoragePoolObjNumOfVolumes(&obj->volumes, pool->conn, ret = virStoragePoolObjNumOfVolumes(obj, pool->conn, NULL);
obj->def, NULL);
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return ret; return ret;
@ -4791,8 +4790,7 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name))) if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name)))
return -1; return -1;
n = virStoragePoolObjVolumeGetNames(&obj->volumes, pool->conn, n = virStoragePoolObjVolumeGetNames(obj, pool->conn, NULL, names, maxnames);
obj->def, NULL, names, maxnames);
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return n; return n;
@ -4819,8 +4817,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
ret = virStoragePoolObjVolumeListExport(pool->conn, &obj->volumes, ret = virStoragePoolObjVolumeListExport(pool->conn, obj, vols, NULL);
obj->def, vols, NULL);
cleanup: cleanup:
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);