From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 19 Jan 2021 06:22:11 +0000 (+0300)
Subject: vstorage: remove build time checks for runtime binaries
X-Git-Tag: v7.1.0-rc1~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6503e1a0ee686792d1f9d01a45556a6cf17bf975;p=thirdparty%2Flibvirt.git

vstorage: remove build time checks for runtime binaries

Accoring to current agreement mentioned in list recently [1]. Now
vstorage driver will be build in default devs environment and also can
be included into CI. This also closes quite old abandoned thread on
alternative checks for binaries in case of this same driver [2].

[1] https://www.redhat.com/archives/libvir-list/2021-January/msg00750.html
[2] https://www.redhat.com/archives/libvir-list/2020-July/msg00697.html

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/meson.build b/meson.build
index b5277b4cba..e3e7ff758f 100644
--- a/meson.build
+++ b/meson.build
@@ -1957,26 +1957,8 @@ if conf.has('WITH_LIBVIRTD')
   endif
 
   if not get_option('storage_vstorage').disabled()
-    vstorage_enable = true
-
-    foreach name : ['vstorage', 'vstorage-mount', 'umount']
-      set_variable(
-        '@0@_prog'.format(name.underscorify()),
-        find_program(name, required: get_option('storage_vstorage'), dirs: libvirt_sbin_path)
-      )
-      if not get_variable('@0@_prog'.format(name.underscorify())).found()
-        vstorage_enable = false
-      endif
-    endforeach
-
-    if vstorage_enable
-      use_storage = true
-      conf.set('WITH_STORAGE_VSTORAGE', 1)
-      foreach name : ['vstorage', 'vstorage-mount', 'umount']
-        path = get_variable('@0@_prog'.format(name.underscorify())).path()
-        conf.set_quoted(name.to_upper(), path)
-      endforeach
-    endif
+    use_storage = true
+    conf.set('WITH_STORAGE_VSTORAGE', 1)
   endif
 
   if not get_option('storage_zfs').disabled()
diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c
index 6cff9f1bfe..7c67407bce 100644
--- a/src/storage/storage_backend_vstorage.c
+++ b/src/storage/storage_backend_vstorage.c
@@ -65,7 +65,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool)
 
     mode = g_strdup_printf("%o", def->target.perms.mode);
 
-    cmd = virCommandNewArgList(VSTORAGE_MOUNT,
+    cmd = virCommandNewArgList("vstorage-mount",
                                "-c", def->source.name,
                                def->target.path,
                                "-m", mode,
@@ -129,7 +129,7 @@ virStorageBackendVzPoolStop(virStoragePoolObjPtr pool)
     if ((rc = virStorageBackendVzIsMounted(pool)) != 1)
         return rc;
 
-    cmd = virCommandNewArgList(UMOUNT, def->target.path, NULL);
+    cmd = virCommandNewArgList("umount", def->target.path, NULL);
     return virCommandRun(cmd, NULL);
 }