From nobody Sun Feb 8 05:53:57 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=1594893867; cv=none; d=zohomail.com; s=zohoarc; b=cBTumNdN2phX0aYabavWResbbWjbn4iiITZSNIfGZSp69lTO089RVjdA3JGrSrAGORQY3aGUTDa/dSZ5D549nzGytyBP/3bD5PCbqHlW7e8nYSzz89tgY+6lY4A2CuEzU/fzAuZAzE3+2sye1di/lbWYK+61tQ3EQK7b/5dzYpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893867; 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=NUj5n6KlKy0BO0EUE2jGH/Ov29zcO2jQR7OZXIKV+DQ=; b=PrH3z0F/dJe6vAUost2lZk1T+4TCCS2qF/EYeXwBWlNDGLT1M8PTrkN9pV6bytX5S5giVlOpfotjLgKb4S7NkhvTmzBuKV3NOlBqI67G4Hfz2GD9eduOCjF5+3/enP7CxZ3HWj46e7wvzTL4qB3Xbj6Ev3NEpPhsGEM4DUgoDRo= 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 159489386754512.695286530864223; Thu, 16 Jul 2020 03:04:27 -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-457-CawOBfAHPA-kfhl_QhKbQg-1; Thu, 16 Jul 2020 06:03:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADE111014404; Thu, 16 Jul 2020 10:03:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89AF2610AF; Thu, 16 Jul 2020 10:03:04 +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 57CB01806B0B; Thu, 16 Jul 2020 10:03:04 +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 06GA3005016871 for ; Thu, 16 Jul 2020 06:03:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC83F2DE9C; Thu, 16 Jul 2020 10:03:00 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6330B2DE7F for ; Thu, 16 Jul 2020 10:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893866; 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=NUj5n6KlKy0BO0EUE2jGH/Ov29zcO2jQR7OZXIKV+DQ=; b=EIdiUOIo9QKIXkpYb1KyA80mwiDfvSh5ZXiMg7hKWTEeeO5Tiz7X3gKqCC7Qzaob3eeRav oErKJW+aUjLymRY+tlERFleKgkgvh+ujoyHSFh+hQIJzzCInf3GJhDXy/xT1Cd0RtT5azo MzlSW/Fyrr5Sf8q+Jjo+uqc80JgQKIo= X-MC-Unique: CawOBfAHPA-kfhl_QhKbQg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 100/351] meson: add storage disk build option Date: Thu, 16 Jul 2020 11:55:36 +0200 Message-Id: <58a6b441416eb76bef8f88d4366fbc5da635b5f7.1594891445.git.phrdina@redhat.com> 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.12 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-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" =3D "no"; then with_storage_iscsi_direct=3Dno with_storage_scsi=3Dno with_storage_mpath=3Dno - with_storage_disk=3Dno with_storage_rbd=3Dno with_storage_sheepdog=3Dno with_storage_gluster=3Dno @@ -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 . -dnl - -AC_DEFUN([LIBVIRT_STORAGE_ARG_DISK], [ - LIBVIRT_ARG_WITH_FEATURE([STORAGE_DISK], [GPartd Disk backend for the st= orage driver], - [check]) -]) - -AC_DEFUN([LIBVIRT_STORAGE_CHECK_DISK], [ - AC_REQUIRE([LIBVIRT_CHECK_DEVMAPPER]) - AC_REQUIRE([LIBVIRT_CHECK_LIBPARTED]) - - if test "$with_storage_disk" =3D "yes" || - test "$with_storage_disk" =3D "check"; then - - if test "$with_storage_disk" =3D "yes" && - test "$with_libparted" !=3D "yes"; then - AC_MSG_ERROR([Need parted for disk storage driver]) - fi - - if test "$with_storage_disk" =3D "check"; then - with_storage_disk=3D"$with_libparted" - fi - - if test "$with_storage_disk" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, - [whether Disk backend for storage driver is enabl= ed]) - fi - fi - - if test "x$with_storage_disk" =3D "xyes"; then - if test "x$with_devmapper" =3D "xno"; then - AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper to c= ompile libvirt with disk storage driver]) - fi - fi - - AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" =3D "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 =3D true conf.set('WITH_STORAGE_DIR', 1) endif + + if not get_option('storage_disk').disabled() and devmapper_dep.found() a= nd libparted_dep.found() + use_storage =3D 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 =20 if use_storage @@ -1916,6 +1923,7 @@ summary(driver_summary, section: 'Drivers', bool_yn: = true) =20 storagedriver_summary =3D { 'Dir': conf.has('WITH_STORAGE_DIR'), + 'Disk': conf.has('WITH_STORAGE_DISK'), } summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true) =20 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 =20 # storage driver options 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') --=20 2.26.2