Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 4 ---- m4/virt-storage-iscsi.m4 | 44 ---------------------------------------- meson.build | 8 ++++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-storage-iscsi.m4 diff --git a/configure.ac b/configure.ac index 73c0f85ac74..ba2b247b926 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,6 @@ dnl Storage driver checks dnl LIBVIRT_STORAGE_ARG_LVM -LIBVIRT_STORAGE_ARG_ISCSI LIBVIRT_STORAGE_ARG_ISCSI_DIRECT LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH @@ -148,7 +147,6 @@ LIBVIRT_STORAGE_ARG_VSTORAGE if test "$with_libvirtd" = "no"; then with_storage_lvm=no - with_storage_iscsi=no with_storage_iscsi_direct=no with_storage_scsi=no with_storage_mpath=no @@ -159,7 +157,6 @@ if test "$with_libvirtd" = "no"; then fi LIBVIRT_STORAGE_CHECK_LVM -LIBVIRT_STORAGE_CHECK_ISCSI LIBVIRT_STORAGE_CHECK_ISCSI_DIRECT LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH @@ -225,7 +222,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_LVM -LIBVIRT_STORAGE_RESULT_ISCSI LIBVIRT_STORAGE_RESULT_ISCSI_DIRECT LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH diff --git a/m4/virt-storage-iscsi.m4 b/m4/virt-storage-iscsi.m4 deleted file mode 100644 index 0e04079a1cc..00000000000 --- a/m4/virt-storage-iscsi.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl The storage iSCSI 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_ISCSI], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_ISCSI], [iSCSI backend for the storage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_ISCSI], [ - if test "$with_storage_iscsi" = "yes" || test "$with_storage_iscsi" = "check"; then - if test "$with_storage_iscsi" = "yes" ; then - if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSCSI storage driver]) ; fi - else - if test -z "$ISCSIADM" ; then with_storage_iscsi=no ; fi - - if test "$with_storage_iscsi" = "check" ; then with_storage_iscsi=yes ; fi - fi - - if test "$with_storage_iscsi" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend for storage driver is enabled]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_ISCSI], [ - LIBVIRT_RESULT([iSCSI], [$with_storage_iscsi]) -]) diff --git a/meson.build b/meson.build index 5678038c5e8..2066c537d73 100644 --- a/meson.build +++ b/meson.build @@ -1927,6 +1927,13 @@ if conf.has('WITH_LIBVIRTD') elif get_option('storage_gluster').enabled() error('Need glusterfs (libgfapi) for gluster storage driver') endif + + if not get_option('storage_iscsi').disabled() and iscsiadm_prog.found() + use_storage = true + conf.set('WITH_STORAGE_ISCSI', 1) + elif get_option('storage_iscsi').enabled() + error('We need iscsiadm for iSCSI storage driver') + endif endif if use_storage @@ -1975,6 +1982,7 @@ storagedriver_summary = { 'Dir': conf.has('WITH_STORAGE_DIR'), 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), + 'iSCSI': conf.has('WITH_STORAGE_ISCSI'), 'Disk': conf.has('WITH_STORAGE_DISK'), 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } diff --git a/meson_options.txt b/meson_options.txt index fe41c2671c2..cff49277ea1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -78,3 +78,4 @@ option('storage_dir', type: 'feature', value: 'auto', description: 'directory ba option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver') +option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscsi backend for the storage driver') -- 2.26.2
