storage: Fix build due to recent storage backend code movement

Commit id '5f07c3c07' broke the freebsd build in the libvirt CI test
environment because the UMOUNT was not defined unless WITH_STORAGE_FS
is defined.

So remove the virStorageBackendUmountLocal from storage_util.c,h and
restore the code back in the storage_backend_fs.c and _vstorage.c
modules.

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 971064827aafa20736811b9b9e726bc5327a2d9a..54bcc5777c4bc61e2063cb23493497d8953de0f9 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -452,6 +452,8 @@ static int
 virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED,
                                 virStoragePoolObjPtr pool)
 {
+    virCommandPtr cmd = NULL;
+    int ret = -1;
     int rc;
 
     if (virStorageBackendFileSystemIsValid(pool) < 0)
@@ -461,7 +463,14 @@ virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED,
     if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1)
         return rc;
 
-    return virStorageBackendUmountLocal(pool);
+    cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL);
+    if (virCommandRun(cmd, NULL) < 0)
+        goto cleanup;
+
+    ret = 0;
+ cleanup:
+    virCommandFree(cmd);
+    return ret;
 }
 #endif /* WITH_STORAGE_FS */
 

diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c
index d3a12fbf22ff55efbe9d3db8857331ff98dccf17..0e945af1a5cd05ac964516672bb644c76482b9e6 100644 (file)
--- a/src/storage/storage_backend_vstorage.c
+++ b/src/storage/storage_backend_vstorage.c
@@ -125,13 +125,22 @@ static int
 virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED,
                             virStoragePoolObjPtr pool)
 {
+    virCommandPtr cmd = NULL;
+    int ret = -1;
     int rc;
 
     /* Short-circuit if already unmounted */
     if ((rc = virStorageBackendVzIsMounted(pool)) != 1)
         return rc;
 
-    return virStorageBackendUnmountLocal(pool);
+    cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL);
+    if (virCommandRun(cmd, NULL) < 0)
+        goto cleanup;
+
+    ret = 0;
+ cleanup:
+    virCommandFree(cmd);
+    return ret;
 }
 
 

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index fbe18447e45dbbda3330b181565b7614a8e186f5..a665bac26effc53593e65a0b6d3240413e8b302b 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -2803,24 +2803,6 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool)
 }
 
 
-int
-virStorageBackendUmountLocal(virStoragePoolObjPtr pool)
-{
-    int ret = -1;
-    virCommandPtr cmd = virCommandNewArgList(UMOUNT, pool->def->target.path,
-                                             NULL);
-
-    if (virCommandRun(cmd, NULL) < 0)
-        goto cleanup;
-
-    ret = 0;
-
- cleanup:
-    virCommandFree(cmd);
-    return ret;
-}
-
-
 /**
  * @conn connection to report errors against
  * @pool storage pool to delete

diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
index 49df53069e50fdcdcf076de39ad9aa9922dbb3f1..326d5551a32584d79f0ab6d2d6fcd91a699f386c 100644 (file)
--- a/src/storage/storage_util.h
+++ b/src/storage/storage_util.h
@@ -87,8 +87,6 @@ int virStorageBackendVolWipeLocal(virConnectPtr conn,
 /* Local/Common Storage Pool Backend APIs */
 int virStorageBackendBuildLocal(virStoragePoolObjPtr pool);
 
-int virStorageBackendUmountLocal(virStoragePoolObjPtr pool);
-
 int virStorageBackendDeleteLocal(virConnectPtr conn,
                                  virStoragePoolObjPtr pool,
                                  unsigned int flags);