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

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>

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 74a9c67fb8929e4a62fe6aa47accd616202a2f36..23346f3de9246779ad9f03ab87c11db82df0d673 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -196,11 +196,12 @@ virStorageVolDefFindByName(virStoragePoolObjPtr obj,
 
 
 int
-virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes,
+virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
                               virConnectPtr conn,
-                              virStoragePoolDefPtr pooldef,
                               virStoragePoolVolumeACLFilter aclfilter)
 {
+    virStoragePoolDefPtr pooldef = obj->def;
+    virStorageVolDefListPtr volumes = &obj->volumes;
     int nvolumes = 0;
     size_t i;
 
@@ -216,13 +217,14 @@ virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes,
 
 
 int
-virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
+virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
                                 virConnectPtr conn,
-                                virStoragePoolDefPtr pooldef,
                                 virStoragePoolVolumeACLFilter aclfilter,
                                 char **const names,
                                 int maxnames)
 {
+    virStoragePoolDefPtr pooldef = obj->def;
+    virStorageVolDefListPtr volumes = &obj->volumes;
     int nnames = 0;
     size_t i;
 
@@ -247,11 +249,12 @@ virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
 
 int
 virStoragePoolObjVolumeListExport(virConnectPtr conn,
-                                  virStorageVolDefListPtr volumes,
-                                  virStoragePoolDefPtr pooldef,
+                                  virStoragePoolObjPtr obj,
                                   virStorageVolPtr **vols,
                                   virStoragePoolVolumeACLFilter aclfilter)
 {
+    virStoragePoolDefPtr pooldef = obj->def;
+    virStorageVolDefListPtr volumes = &obj->volumes;
     int ret = -1;
     size_t i;
     virStorageVolPtr *tmp_vols = NULL;

diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index 494b88836a6e04ad36dccb8059d9c41b42afaa26..5a61b2aa60f80e9ebccce64e25ce4bf6e0bf2868 100644 (file)
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -114,23 +114,20 @@ typedef bool
                                  virStorageVolDefPtr def);
 
 int
-virStoragePoolObjNumOfVolumes(virStorageVolDefListPtr volumes,
+virStoragePoolObjNumOfVolumes(virStoragePoolObjPtr obj,
                               virConnectPtr conn,
-                              virStoragePoolDefPtr pooldef,
                               virStoragePoolVolumeACLFilter aclfilter);
 
 int
-virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
+virStoragePoolObjVolumeGetNames(virStoragePoolObjPtr obj,
                                 virConnectPtr conn,
-                                virStoragePoolDefPtr pooldef,
                                 virStoragePoolVolumeACLFilter aclfilter,
                                 char **const names,
                                 int maxnames);
 
 int
 virStoragePoolObjVolumeListExport(virConnectPtr conn,
-                                  virStorageVolDefListPtr volumes,
-                                  virStoragePoolDefPtr pooldef,
+                                  virStoragePoolObjPtr obj,
                                   virStorageVolPtr **vols,
                                   virStoragePoolVolumeACLFilter aclfilter);
 

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 1a5921cf877dcbce1bd992652f118690fef461e1..df563f1bda3acd9bdefa290c54fa9c5d1a891b5c 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1339,7 +1339,7 @@ storagePoolNumOfVolumes(virStoragePoolPtr pool)
         goto cleanup;
     }
 
-    ret = virStoragePoolObjNumOfVolumes(&obj->volumes, pool->conn, obj->def,
+    ret = virStoragePoolObjNumOfVolumes(obj, pool->conn,
                                         virStoragePoolNumOfVolumesCheckACL);
 
  cleanup:
@@ -1368,7 +1368,7 @@ storagePoolListVolumes(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-    n = virStoragePoolObjVolumeGetNames(&obj->volumes, pool->conn, obj->def,
+    n = virStoragePoolObjVolumeGetNames(obj, pool->conn,
                                         virStoragePoolListVolumesCheckACL,
                                         names, maxnames);
  cleanup:
@@ -1399,8 +1399,7 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-    ret = virStoragePoolObjVolumeListExport(pool->conn, &obj->volumes,
-                                            obj->def, vols,
+    ret = virStoragePoolObjVolumeListExport(pool->conn, obj, vols,
                                             virStoragePoolListAllVolumesCheckACL);
 
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 0fefa89764ce331316efc0ae3c2ea754d3d8ce20..447cdd44a1482da7908c3400ae05682431a28b44 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -4771,8 +4771,7 @@ testStoragePoolNumOfVolumes(virStoragePoolPtr pool)
     if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name)))
         return -1;
 
-    ret = virStoragePoolObjNumOfVolumes(&obj->volumes, pool->conn,
-                                        obj->def, NULL);
+    ret = virStoragePoolObjNumOfVolumes(obj, pool->conn, NULL);
 
     virStoragePoolObjUnlock(obj);
     return ret;
@@ -4791,8 +4790,7 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
     if (!(obj = testStoragePoolObjFindActiveByName(privconn, pool->name)))
         return -1;
 
-    n = virStoragePoolObjVolumeGetNames(&obj->volumes, pool->conn,
-                                        obj->def, NULL, names, maxnames);
+    n = virStoragePoolObjVolumeGetNames(obj, pool->conn, NULL, names, maxnames);
 
     virStoragePoolObjUnlock(obj);
     return n;
@@ -4819,8 +4817,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-    ret = virStoragePoolObjVolumeListExport(pool->conn, &obj->volumes,
-                                            obj->def, vols, NULL);
+    ret = virStoragePoolObjVolumeListExport(pool->conn, obj, vols, NULL);
 
  cleanup:
     virStoragePoolObjUnlock(obj);