From nobody Sat Feb 7 05:49:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1631614585; cv=none; d=zohomail.com; s=zohoarc; b=AP+WHrL/h1/lQl5II0oIINIjeVs+9zwwOrqk++tlNtvrY2oad+6EUrS+hKBWEaOpcoUNYL62Q/LZyv5T5VWlL5HjX57GV+IT3v95bhDCxcYi0XQ2/qTnfEpTGl5kSeR3pr0+Bu6IfXn/ummxQU3HXmL8nP/buwxkyTgm2/wXDf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631614585; 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=MgpeMhBsknMwoNb9rSVVeIU2JU54qHVanTZL6g4xYCw=; b=fNkTkuYoTtBdkTn16/CPcfQXrC9+j1UyFou0VtV+8mtBGtSo3HKdiLrdNVHh8A5q1Ctgt4Rd7f5CgUIlzr7awi8VvtofDWdXxUY70SQIMG6JzIGniU4HCza15JHah04A5x/odWfl3RIu5yolu+CCLoqcqsF3XqLBbkBSNK/AiDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 163161458546764.80827096633823; Tue, 14 Sep 2021 03:16: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-237--8VXRy01NvC-0R0QgF9B0Q-1; Tue, 14 Sep 2021 06:16:22 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4E07101F7A4; Tue, 14 Sep 2021 10:16:17 +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 D062A5C25A; Tue, 14 Sep 2021 10:16:16 +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 39BBE1806D02; Tue, 14 Sep 2021 10:16:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18EAG9x3024895 for ; Tue, 14 Sep 2021 06:16:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 018B61007607; Tue, 14 Sep 2021 10:16:09 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 803CF10027C4 for ; Tue, 14 Sep 2021 10:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631614584; 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=MgpeMhBsknMwoNb9rSVVeIU2JU54qHVanTZL6g4xYCw=; b=GVdah8hAlQ27GduKyIrumoSbDYX/Iw4GjdoXTqvasroND1tS8/SkFg4IyITUassHfgLfUK SufYQEtMZzm9EVs8oHc9J5EIKW7uwt+rImZU2Lg1ZBumr4Ed1V9kgk28Dzhh9BJBrIRImE xayG29WvUBHAd5PYH7xYAX5bFKQDurc= X-MC-Unique: -8VXRy01NvC-0R0QgF9B0Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] meson: Enable ZFS storage backend more often Date: Tue, 14 Sep 2021 12:16:01 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.16 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) X-ZM-MESSAGEID: 1631614587396100003 Content-Type: text/plain; charset="utf-8" Currently, the ZFS storage backend is enabled only if both zfs and zpool binaries were found during configure phase. This is not consistent with our attempts to move dependencies on binaries from compile to runtime. And also it is inconsistent with other backends, e.g. vstorage. Signed-off-by: Michal Privoznik --- meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 77ee60977d..488490181f 100644 --- a/meson.build +++ b/meson.build @@ -1947,24 +1947,24 @@ if conf.has('WITH_LIBVIRTD') endif =20 if not get_option('storage_zfs').disabled() - zfs_enable =3D true foreach name : [ 'zfs', 'zpool' ] set_variable( '@0@_prog'.format(name), find_program(name, required: get_option('storage_zfs'), dirs: libv= irt_sbin_path) ) - if not get_variable('@0@_prog'.format(name)).found() - zfs_enable =3D false - endif endforeach =20 - if zfs_enable - use_storage =3D true - conf.set('WITH_STORAGE_ZFS', 1) - foreach name : [ 'zfs', 'zpool' ] - conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) - endforeach - endif + use_storage =3D true + conf.set('WITH_STORAGE_ZFS', 1) + foreach name : [ 'zfs', 'zpool' ] + prog_var =3D get_variable('@0@_prog'.format(name)) + if prog_var.found() + prog_path =3D prog_var.path() + else + prog_path =3D name + endif + conf.set_quoted(name.to_upper(), prog_path) + endforeach endif endif =20 --=20 2.32.0