Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 4 --- m4/virt-storage-disk.m4 | 58 ----------------------------------------- meson.build | 8 ++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 m4/virt-storage-disk.m4 diff --git a/configure.ac b/configure.ac index 1edec551fbe..36bcc8a39a6 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,6 @@ LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH -LIBVIRT_STORAGE_ARG_DISK LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG LIBVIRT_STORAGE_ARG_GLUSTER @@ -156,7 +155,6 @@ if test "$with_libvirtd" = "no"; then with_storage_iscsi_direct=no with_storage_scsi=no with_storage_mpath=no - with_storage_disk=no with_storage_rbd=no with_storage_sheepdog=no with_storage_gluster=no @@ -176,7 +174,6 @@ LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH -LIBVIRT_STORAGE_CHECK_DISK LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER @@ -245,7 +242,6 @@ LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH -LIBVIRT_STORAGE_RESULT_DISK LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG LIBVIRT_STORAGE_RESULT_GLUSTER diff --git a/m4/virt-storage-disk.m4 b/m4/virt-storage-disk.m4 deleted file mode 100644 index 7429688f4eb..00000000000 --- a/m4/virt-storage-disk.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The storage disk check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_DISK], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_DISK], [GPartd Disk backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_DISK], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - AC_REQUIRE([LIBVIRT_CHECK_LIBPARTED]) - - if test "$with_storage_disk" = "yes" || - test "$with_storage_disk" = "check"; then - - if test "$with_storage_disk" = "yes" && - test "$with_libparted" != "yes"; then - AC_MSG_ERROR([Need parted for disk storage driver]) - fi - - if test "$with_storage_disk" = "check"; then - with_storage_disk="$with_libparted" - fi - - if test "$with_storage_disk" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, - [whether Disk backend for storage driver is enabled]) - fi - fi - - if test "x$with_storage_disk" = "xyes"; then - if test "x$with_devmapper" = "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to compile libvirt with disk storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_DISK], [ - LIBVIRT_RESULT([Disk], [$with_storage_disk]) -]) diff --git a/meson.build b/meson.build index 1791e09bfa4..df105176b05 100644 --- a/meson.build +++ b/meson.build @@ -1870,6 +1870,13 @@ if conf.has('WITH_LIBVIRTD') use_storage = true conf.set('WITH_STORAGE_DIR', 1) endif + + if not get_option('storage_disk').disabled() and devmapper_dep.found() and libparted_dep.found() + use_storage = true + conf.set('WITH_STORAGE_DISK', 1) + elif get_option('storage_disk').enabled() + error('You must install libparted and libdevmapper to compile libvirt with disk storage driver') + endif endif if use_storage @@ -1916,6 +1923,7 @@ summary(driver_summary, section: 'Drivers', bool_yn: true) storagedriver_summary = { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'Disk': conf.has('WITH_STORAGE_DISK'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index e840c68b498..9b695cf5ac1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -75,3 +75,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SE # storage driver options option('storage_dir', type: 'feature', value: 'auto', description: 'directory backand for the storage driver') +option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver') -- 2.26.2
