Move into storage_util for reuse by test harness
Signed-off-by: John Ferlan <jfer...@redhat.com>
---
src/storage/storage_backend_fs.c | 33 --------------------------------
src/storage/storage_util.c | 33 ++++++++++++++++++++++++++++++++
src/storage/storage_util.h | 3 +++
3 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index b341ba84fa..c5e75627b5 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -245,39 +245,6 @@ virStorageBackendFileSystemIsValid(virStoragePoolObjPtr
pool)
}
-/**
- * virStorageBackendFileSystemGetPoolSource
- * @pool: storage pool object pointer
- *
- * Allocate/return a string representing the FS storage pool source.
- * It is up to the caller to VIR_FREE the allocated string
- */
-static char *
-virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool)
-{
- virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
- char *src = NULL;
-
- if (def->type == VIR_STORAGE_POOL_NETFS) {
- if (def->source.format == VIR_STORAGE_POOL_NETFS_CIFS) {
- if (virAsprintf(&src, "//%s/%s",
- def->source.hosts[0].name,
- def->source.dir) < 0)
- return NULL;
- } else {
- if (virAsprintf(&src, "%s:%s",
- def->source.hosts[0].name,
- def->source.dir) < 0)
- return NULL;
- }
- } else {
- if (VIR_STRDUP(src, def->source.devices[0].path) < 0)
- return NULL;
- }
- return src;
-}
-
-
/**
* @pool storage pool to check for status
*
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 180d7b1fa3..c9f6096687 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -4228,6 +4228,39 @@ virStorageBackendZeroPartitionTable(const char *path,
}
+/**
+ * virStorageBackendFileSystemGetPoolSource
+ * @pool: storage pool object pointer
+ *
+ * Allocate/return a string representing the FS storage pool source.
+ * It is up to the caller to VIR_FREE the allocated string
+ */
+char *
+virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool)
+{
+ virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
+ char *src = NULL;
+
+ if (def->type == VIR_STORAGE_POOL_NETFS) {
+ if (def->source.format == VIR_STORAGE_POOL_NETFS_CIFS) {
+ if (virAsprintf(&src, "//%s/%s",
+ def->source.hosts[0].name,
+ def->source.dir) < 0)
+ return NULL;
+ } else {
+ if (virAsprintf(&src, "%s:%s",
+ def->source.hosts[0].name,
+ def->source.dir) < 0)
+ return NULL;
+ }
+ } else {
+ if (VIR_STRDUP(src, def->source.devices[0].path) < 0)
+ return NULL;
+ }
+ return src;
+}
+
+
virCommandPtr
virStorageBackendFileSystemMountCmd(virStoragePoolDefPtr def,
const char *src)
diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
index 5b0baf56c4..28b3e0b9c9 100644
--- a/src/storage/storage_util.h
+++ b/src/storage/storage_util.h
@@ -177,6 +177,9 @@ int
virStorageBackendZeroPartitionTable(const char *path,
unsigned long long size);
+char *
+virStorageBackendFileSystemGetPoolSource(virStoragePoolObjPtr pool);
+
virCommandPtr
virStorageBackendFileSystemMountCmd(virStoragePoolDefPtr def,
const char *src);
--
2.17.2
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
