From nobody Mon Feb 9 05:41:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594893805; cv=none; d=zohomail.com; s=zohoarc; b=icWBhSQ2ktQ+QHKZFJ8wTYyhEGQlMXLm9st6xpBmPQwP+s0tBhfUxwWQf3QLw6hkLCv8sNisux97r9lI+TSw3U4bYGYhD9ZMTNkI3VhrymZ9ZCJs1V2gsKNvD+jUPIxOkEDVsVCbb1aUTL63bVGFGsY5Uf2iwLJDhaoRxPKV7uc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893805; 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=RtuY6cRZydzxLUsda+IDfshK3RJ9+0yPnRE+hH2adfc=; b=gGsUmLZ33M8pfNzhtCWruMpudUKonIxMB6AyPggq1EWUFXzMZ2WV7tPDK9DWiXf+DCqOp0Y2kKgN5MworW+rUYDoa+KSZkWdoh1eRr5z/oy1zGyptIWB3t/C6wGnHBRI5HHyiSMJcNs7ivtPqT/5Wloj4HTvSLBLPeNE7+45tR8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594893805810880.3050490686227; Thu, 16 Jul 2020 03:03:25 -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-1-1IxWXoxrMxeAX8KPb16QwA-1; Thu, 16 Jul 2020 06:03:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A2321011AF8; Thu, 16 Jul 2020 10:03:09 +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 A330F7B421; Thu, 16 Jul 2020 10:03:08 +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 71B2996245; Thu, 16 Jul 2020 10:03:08 +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 06GA32bM016902 for ; Thu, 16 Jul 2020 06:03:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id C17D82DE72; Thu, 16 Jul 2020 10:03:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A8562DE71 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=1594893804; 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=RtuY6cRZydzxLUsda+IDfshK3RJ9+0yPnRE+hH2adfc=; b=KOAzQLPXaVYomg4qxPyeMLdIf4GX0YTicxBrWqqYCbJFjpWik/Ol8k8cRVWcbPi0lD9lyi 4qbcWtO5agF/lW4246sQT/N+opwhPPiV46guQ9C6WUO3Q8MHrD9wx8Kdt0kDCizEwNOcFv A/OgaA/azkksL5DRUlu/CDMMxQ7YVhI= X-MC-Unique: 1IxWXoxrMxeAX8KPb16QwA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 102/351] meson: add storage gluster build option Date: Thu, 16 Jul 2020 11:55:38 +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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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-gluster.m4 | 43 -------------------------------------- meson.build | 8 +++++++ meson_options.txt | 1 + 4 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 m4/virt-storage-gluster.m4 diff --git a/configure.ac b/configure.ac index dc812c73d9a..73c0f85ac74 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ LIBVIRT_STORAGE_ARG_SCSI LIBVIRT_STORAGE_ARG_MPATH LIBVIRT_STORAGE_ARG_RBD LIBVIRT_STORAGE_ARG_SHEEPDOG -LIBVIRT_STORAGE_ARG_GLUSTER LIBVIRT_STORAGE_ARG_ZFS LIBVIRT_STORAGE_ARG_VSTORAGE =20 @@ -155,7 +154,6 @@ if test "$with_libvirtd" =3D "no"; then with_storage_mpath=3Dno with_storage_rbd=3Dno with_storage_sheepdog=3Dno - with_storage_gluster=3Dno with_storage_zfs=3Dno with_storage_vstorage=3Dno fi @@ -167,7 +165,6 @@ LIBVIRT_STORAGE_CHECK_SCSI LIBVIRT_STORAGE_CHECK_MPATH LIBVIRT_STORAGE_CHECK_RBD LIBVIRT_STORAGE_CHECK_SHEEPDOG -LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS LIBVIRT_STORAGE_CHECK_VSTORAGE =20 @@ -234,7 +231,6 @@ LIBVIRT_STORAGE_RESULT_SCSI LIBVIRT_STORAGE_RESULT_MPATH LIBVIRT_STORAGE_RESULT_RBD LIBVIRT_STORAGE_RESULT_SHEEPDOG -LIBVIRT_STORAGE_RESULT_GLUSTER LIBVIRT_STORAGE_RESULT_ZFS LIBVIRT_STORAGE_RESULT_VSTORAGE AC_MSG_NOTICE([]) diff --git a/m4/virt-storage-gluster.m4 b/m4/virt-storage-gluster.m4 deleted file mode 100644 index 0a2406f1fc5..00000000000 --- a/m4/virt-storage-gluster.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The storage Gluster 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_GLUSTER], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_GLUSTER], [Gluster backend for the sto= rage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [ - AC_REQUIRE([LIBVIRT_CHECK_GLUSTER]) - - if test "$with_storage_gluster" =3D "check"; then - with_storage_gluster=3D$with_glusterfs - fi - if test "$with_storage_gluster" =3D "yes"; then - if test "$with_glusterfs" =3D no; then - AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver]) - fi - AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1], - [whether Gluster backend for storage driver is enabled]) - fi - AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" =3D= "yes"]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_RESULT_GLUSTER], [ - LIBVIRT_RESULT([Gluster], [$with_storage_gluster]) -]) diff --git a/meson.build b/meson.build index 68fb89d7dea..5678038c5e8 100644 --- a/meson.build +++ b/meson.build @@ -1920,6 +1920,13 @@ if conf.has('WITH_LIBVIRTD') conf.set_quoted('SHOWMOUNT', showmount_path) endif endif + + if not get_option('storage_gluster').disabled() and glusterfs_dep.found() + use_storage =3D true + conf.set('WITH_STORAGE_GLUSTER', 1) + elif get_option('storage_gluster').enabled() + error('Need glusterfs (libgfapi) for gluster storage driver') + endif endif =20 if use_storage @@ -1969,6 +1976,7 @@ storagedriver_summary =3D { 'FS': conf.has('WITH_STORAGE_FS'), 'NetFS': conf.has('WITH_STORAGE_FS'), 'Disk': conf.has('WITH_STORAGE_DISK'), + 'Gluster': conf.has('WITH_STORAGE_GLUSTER'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index afa93b88418..fe41c2671c2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -77,3 +77,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto= ', description: 'use SE option('storage_dir', type: 'feature', value: 'auto', description: 'direct= ory backand for the storage driver') 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') --=20 2.26.2