From nobody Sun Feb 8 12:58:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893903; cv=none; d=zohomail.com; s=zohoarc; b=gpX1iXjEsiPStSdgArcDxEDQM3bXrBplbMWvkFdN0ZKmbsaW0vzdvvJRKE/MZ3TQ98JIonXbXBnTXqW+o8Avy9XY6NMBDNZjoXSpybSTivRocIsVnfhVOLOCLwaVxQLdINbbRpRLg1Nz3RJycygAzIEt+Xjb1Ah/qENhyao7/Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893903; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZPzVDSshtWpeDJLpWEsNhB1Xz01c6zXOYsp0SZITM3I=; b=HW8UYrli32Rcu/SzpewJaJk5L7v/ceuTtBqcBD+lMUdtStn0kGcqaDyYsBGvtvodC6tmNTI+Wxz98DPoPvYhu94tOumcpRVf+2ckUwqflWB6IXPI5n3R/hQCCi5anxFLqC2TPhcD5h9YvtrIXtzCGLiaowTQFc6nlRXEv+gRKfU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948939035511019.2482413467912; Thu, 16 Jul 2020 03:05:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-307--HDkPsb9NRykMBqnhz0DNA-1; Thu, 16 Jul 2020 06:03:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CD24855C73; Thu, 16 Jul 2020 10:03:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 184AA6FED1; Thu, 16 Jul 2020 10:03:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D357F96248; Thu, 16 Jul 2020 10:03:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA33hZ016910 for ; Thu, 16 Jul 2020 06:03:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id ABDF62DE71; Thu, 16 Jul 2020 10:03:03 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 248502DE9C for ; Thu, 16 Jul 2020 10:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893902; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZPzVDSshtWpeDJLpWEsNhB1Xz01c6zXOYsp0SZITM3I=; b=FfWhIryowAWo9S6F48s+sfAOyRN5HscIhpFGRNu/oq3j2SsxSKTSFvNcp9Nvv+d8O/WcM7 pwjM+sLPkU4PnekUo+bNu8nN3M5HYoS6JAiJ4pwIQHnyd3QRYsEM3a2vedPcbPtxy2ISLp PVYCDHO0ixl3oYCJPpj9jJGl+1oi6PA= X-MC-Unique: -HDkPsb9NRykMBqnhz0DNA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 103/351] meson: add storage iscsi build option Date: Thu, 16 Jul 2020 11:55:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- 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 =20 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 =20 if test "$with_libvirtd" =3D "no"; then with_storage_lvm=3Dno - with_storage_iscsi=3Dno with_storage_iscsi_direct=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno @@ -159,7 +157,6 @@ if test "$with_libvirtd" =3D "no"; then fi =20 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 . -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" =3D "yes" || test "$with_storage_iscsi" = =3D "check"; then - if test "$with_storage_iscsi" =3D "yes" ; then - if test -z "$ISCSIADM" ; then AC_MSG_ERROR([We need iscsiadm for iSC= SI storage driver]) ; fi - else - if test -z "$ISCSIADM" ; then with_storage_iscsi=3Dno ; fi - - if test "$with_storage_iscsi" =3D "check" ; then with_storage_iscsi= =3Dyes ; fi - fi - - if test "$with_storage_iscsi" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_ISCSI], 1, [whether iSCSI backend f= or storage driver is enabled]) - fi - fi - AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" =3D "ye= s"]) -]) - -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 =3D true + conf.set('WITH_STORAGE_ISCSI', 1) + elif get_option('storage_iscsi').enabled() + error('We need iscsiadm for iSCSI storage driver') + endif endif =20 if use_storage @@ -1975,6 +1982,7 @@ storagedriver_summary =3D { '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', des= cription: 'directory ba option('storage_disk', type: 'feature', value: 'auto', description: 'GPart= d Disk backend for the storage driver') option('storage_fs', type: 'feature', value: 'auto', description: 'FileSys= tem backend for the storage driver') option('storage_gluster', type: 'feature', value: 'auto', description: 'Gl= uster backend for the storage driver') +option('storage_iscsi', type: 'feature', value: 'auto', description: 'iscs= i backend for the storage driver') --=20 2.26.2