storage: Introduce virStoragePoolObjVolumeListExport

Essentially code motion to move the storage/test driver ListAllVolumes
logic into virstorageobj.c

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 8228a756fea77b478e7d1da6033ae3da76a6e2ba..a4e40f90904957bb5b5c93aff3666b06f1af2699 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -245,6 +245,53 @@ virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
 }
 
 
+int
+virStoragePoolObjVolumeListExport(virConnectPtr conn,
+                                  virStorageVolDefListPtr volumes,
+                                  virStoragePoolDefPtr pooldef,
+                                  virStorageVolPtr **vols,
+                                  virStoragePoolVolumeACLFilter aclfilter)
+{
+    int ret = -1;
+    size_t i;
+    virStorageVolPtr *tmp_vols = NULL;
+    virStorageVolPtr vol = NULL;
+    int nvols = 0;
+
+    /* Just returns the volumes count */
+    if (!vols) {
+        ret = volumes->count;
+        goto cleanup;
+    }
+
+    if (VIR_ALLOC_N(tmp_vols, volumes->count + 1) < 0)
+        goto cleanup;
+
+    for (i = 0; i < volumes->count; i++) {
+        virStorageVolDefPtr def = volumes->objs[i];
+        if (aclfilter && !aclfilter(conn, pooldef, def))
+            continue;
+        if (!(vol = virGetStorageVol(conn, pooldef->name, def->name, def->key,
+                                     NULL, NULL)))
+            goto cleanup;
+        tmp_vols[nvols++] = vol;
+    }
+
+    *vols = tmp_vols;
+    tmp_vols = NULL;
+    ret = nvols;
+
+ cleanup:
+    if (tmp_vols) {
+        for (i = 0; i < nvols; i++)
+            virObjectUnref(tmp_vols[i]);
+        VIR_FREE(tmp_vols);
+    }
+
+    return ret;
+}
+
+
 virStoragePoolObjPtr
 virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools,
                            virStoragePoolDefPtr def)

diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index bf88094f1249d4c68bbdf2044a927800a7f7b51f..72daa5a814357c52bcc21000647805703e565a68 100644 (file)
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -127,6 +127,13 @@ virStoragePoolObjVolumeGetNames(virStorageVolDefListPtr volumes,
                                 char **const names,
                                 int maxnames);
 
+int
+virStoragePoolObjVolumeListExport(virConnectPtr conn,
+                                  virStorageVolDefListPtr volumes,
+                                  virStoragePoolDefPtr pooldef,
+                                  virStorageVolPtr **vols,
+                                  virStoragePoolVolumeACLFilter aclfilter);
+
 virStoragePoolObjPtr
 virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools,
                            virStoragePoolDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d314519e530eabbed8a5849130698ed88f7e576b..8122b9ffda2b1e08b9fff636b9b850291e4e4f31 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1011,6 +1011,7 @@ virStoragePoolObjSaveDef;
 virStoragePoolObjSourceFindDuplicate;
 virStoragePoolObjUnlock;
 virStoragePoolObjVolumeGetNames;
+virStoragePoolObjVolumeListExport;
 
 
 # cpu/cpu.h

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index b996ac4ba306a25814b8661b8a2acfe4b595a517..1b2b9dee522d241fb35d48441c7f72e7b8c9c9dd 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1440,16 +1440,13 @@ storagePoolListVolumes(virStoragePoolPtr obj,
     return n;
 }
 
+
 static int
 storagePoolListAllVolumes(virStoragePoolPtr pool,
                           virStorageVolPtr **vols,
                           unsigned int flags)
 {
     virStoragePoolObjPtr obj;
-    size_t i;
-    virStorageVolPtr *tmp_vols = NULL;
-    virStorageVolPtr vol = NULL;
-    int nvols = 0;
     int ret = -1;
 
     virCheckFlags(0, -1);
@@ -1466,38 +1463,12 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-     /* Just returns the volumes count */
-    if (!vols) {
-        ret = obj->volumes.count;
-        goto cleanup;
-    }
+    ret = virStoragePoolObjVolumeListExport(pool->conn, &obj->volumes,
+                                            obj->def, vols,
+                                            virStoragePoolListAllVolumesCheckACL);
 
-    if (VIR_ALLOC_N(tmp_vols, obj->volumes.count + 1) < 0)
-        goto cleanup;
-
-    for (i = 0; i < obj->volumes.count; i++) {
-        if (!virStoragePoolListAllVolumesCheckACL(pool->conn, obj->def,
-                                                  obj->volumes.objs[i]))
-            continue;
-        if (!(vol = virGetStorageVol(pool->conn, obj->def->name,
-                                     obj->volumes.objs[i]->name,
-                                     obj->volumes.objs[i]->key,
-                                     NULL, NULL)))
-            goto cleanup;
-        tmp_vols[nvols++] = vol;
-    }
-
-    *vols = tmp_vols;
-    tmp_vols = NULL;
-    ret = nvols;
 
  cleanup:
-    if (tmp_vols) {
-        for (i = 0; i < nvols; i++)
-            virObjectUnref(tmp_vols[i]);
-        VIR_FREE(tmp_vols);
-    }
-
     virStoragePoolObjUnlock(obj);
 
     return ret;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index c3294bf9041bd0e7b2042038d70c17990601cbb9..e0a58cc927911dbdf61d37fa8fbb3380fd296a26 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -4852,16 +4852,12 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj,
 {
     testDriverPtr privconn = obj->conn->privateData;
     virStoragePoolObjPtr pool;
-    size_t i;
-    virStorageVolPtr *tmp_vols = NULL;
-    virStorageVolPtr vol = NULL;
-    int nvols = 0;
     int ret = -1;
 
     virCheckFlags(0, -1);
 
     if (!(pool = testStoragePoolObjFindByUUID(privconn, obj->uuid)))
-        goto cleanup;
+        return -1;
 
     if (!virStoragePoolObjIsActive(pool)) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@@ -4869,39 +4865,11 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj,
         goto cleanup;
     }
 
-     /* Just returns the volumes count */
-    if (!vols) {
-        ret = pool->volumes.count;
-        goto cleanup;
-    }
-
-    if (VIR_ALLOC_N(tmp_vols, pool->volumes.count + 1) < 0)
-         goto cleanup;
-
-    for (i = 0; i < pool->volumes.count; i++) {
-        if (!(vol = virGetStorageVol(obj->conn, pool->def->name,
-                                     pool->volumes.objs[i]->name,
-                                     pool->volumes.objs[i]->key,
-                                     NULL, NULL)))
-            goto cleanup;
-        tmp_vols[nvols++] = vol;
-    }
-
-    *vols = tmp_vols;
-    tmp_vols = NULL;
-    ret = nvols;
+    ret = virStoragePoolObjVolumeListExport(obj->conn, &pool->volumes,
+                                            pool->def, vols, NULL);
 
  cleanup:
-    if (tmp_vols) {
-        for (i = 0; i < nvols; i++) {
-            if (tmp_vols[i])
-                virStorageVolFree(tmp_vols[i]);
-        }
-        VIR_FREE(tmp_vols);
-    }
-
-    if (pool)
-        virStoragePoolObjUnlock(pool);
+    virStoragePoolObjUnlock(pool);
 
     return ret;
 }