External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstorage: remove build time checks for runtime binaries

Browse Source 
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>
This commit is contained in:
Nikolay Shirokovskiy 2021-01-19 09:22:11 +03:00
parent b5f15b9db1
commit 6503e1a0ee
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meson.build
View File

@ -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()

4
src/storage/storage_backend_vstorage.c
View File

@ -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);
}