From nobody Mon Feb 9 11:33:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608199211; cv=none; d=zohomail.com; s=zohoarc; b=Mz+TNG0GTkF5yyhKIWtBntWn2lP+6zrCeJb96HKQ7TFNWDwlRyIuB2iuZC5Y1x7HKm9LlmhP5lFyilBG6PmDIPq9TPxTS6+6xDFYb3b0e5oUxq+wjgQ7LQpaGOgfkxYMI1ILxAQAyFl8MYGA+cY3O4j8WjeE2aU8pngb2s+QTls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608199211; h=Content-Transfer-Encoding:Cc: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=TdvZIaVS2PKvVRM9fsWZ4iOV5QJRNYL/FLyT44crNg8=; b=e3oDtGktlwgVcQfTHTBA9yDcc8r3A454/7ONEJEk5xFE7WeSoXNJAPy6jq6pTXvTSss1ETmmAMlrYgc+pv9Jhel5ByBzESn3srEDexdGTJi82pxlPnug3WBwRMNu9+CWWuejOfLYL33fV5GcQ77ccu0Wil6XDKEvhguU/ue7A3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608199211746252.43032775876225; Thu, 17 Dec 2020 02:00:11 -0800 (PST) Received: from localhost ([::1]:36864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpq4v-0007Vw-Di for importer@patchew.org; Thu, 17 Dec 2020 05:00:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kppmU-0004uV-6r for qemu-devel@nongnu.org; Thu, 17 Dec 2020 04:41:06 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:42035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kppmG-0007iU-3h for qemu-devel@nongnu.org; Thu, 17 Dec 2020 04:41:05 -0500 Received: by mail-ed1-x536.google.com with SMTP id g24so2327430edw.9 for ; Thu, 17 Dec 2020 01:40:51 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id rs27sm3463677ejb.21.2020.12.17.01.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 01:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TdvZIaVS2PKvVRM9fsWZ4iOV5QJRNYL/FLyT44crNg8=; b=namBqQ6kdwnwlOSMVvRAmcPmqJtIMQAm3jhKmpXcWabZWY7ZbaZK2QWZuzBfaP6oHa e5WZW7CvMXMpTFscFtyAmKdFphOarnmCVlogBvl5UCSx2/rEtbYBcClxWDVBwk/6WMRM INIvPHzSiVdfojLNLp20rYScLB9xpGx8JOGnEeewIUWdRrNfHDcZLKrjtx4RfTFN3JUC Sr7KJ037urPnd7tTdErrUf/eHDEMmMFDtd7CGz+aNydg9mF1akcLnZ0lOLJWzOkCPMrx W5lP+RPTJi3Pyi5mj2YB9eGnYI7/qw4SpMGU2z1w3KGmfmN41mueDGb+lWG7/d0uQ0Fa C/bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TdvZIaVS2PKvVRM9fsWZ4iOV5QJRNYL/FLyT44crNg8=; b=TVAxU0jIEsnXMazik1ObppqforrLQ1wQYkAWjk9XKECxl528WqsLoTP9gpWmGphoYR upqs2TJxVwcyTzyPQvjOhspJ1N9+RDqOfWs4FZ4ES3AnHCuumAWWWkDx0LySt1MH9kuT hI0QxnK7J04qIVMJsPcXSOxIS9BC0KIcw3NoWWZzce5330j4wldLbf5MXm6O4gtcyE2G 68ZabWxs1mXeLRUKm36QN8Aw1kEiBX1UZEqXMfcWNL06AIRaN/PlL1TNGEIPaicrd1D0 mrwOGK/14sagqrjgOb1AZlZj9fCgiw0eFUaTQzw2vjBPM5paEPTz1+/hPN5AeN6BLqDD 1BHw== X-Gm-Message-State: AOAM530d4AQ1Ul52c3FKyglFUdoaWtoVXJYm9AmHrIspRVx6cdDRECh5 3mmR8rn3wh4WKtOuYJ56epO5qKyURIk= X-Google-Smtp-Source: ABdhPJw35xDD82hK/qKSNNOt3+JmuoOsUe8X1+NNGDyVm5vvdQgZ0ZQZw2sTiv3bz8S9jmc9xdBI3g== X-Received: by 2002:a50:955b:: with SMTP id v27mr36991445eda.324.1608198050733; Thu, 17 Dec 2020 01:40:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/18] glusterfs: convert to meson Date: Thu, 17 Dec 2020 10:40:30 +0100 Message-Id: <20201217094044.46462-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217094044.46462-1-pbonzini@redhat.com> References: <20201217094044.46462-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=83=C2=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 102 ++-------------------------------------------- meson.build | 46 +++++++++++++++++++-- meson_options.txt | 2 + 3 files changed, 48 insertions(+), 102 deletions(-) diff --git a/configure b/configure index 71196b1fe7..5529ac4b32 100755 --- a/configure +++ b/configure @@ -415,13 +415,7 @@ crypto_afalg=3D"no" cfi=3D"false" cfi_debug=3D"false" seccomp=3D"$default_feature" -glusterfs=3D"$default_feature" -glusterfs_xlator_opt=3D"no" -glusterfs_discard=3D"no" -glusterfs_fallocate=3D"no" -glusterfs_zerofill=3D"no" -glusterfs_ftruncate_has_stat=3D"no" -glusterfs_iocb_has_stat=3D"no" +glusterfs=3D"auto" gtk=3D"$default_feature" gtk_gl=3D"no" tls_priority=3D"NORMAL" @@ -1366,7 +1360,7 @@ for opt do ;; --disable-seccomp) seccomp=3D"no" ;; - --disable-glusterfs) glusterfs=3D"no" + --disable-glusterfs) glusterfs=3D"disabled" ;; --disable-avx2) avx2_opt=3D"no" ;; @@ -1377,7 +1371,7 @@ for opt do --enable-avx512f) avx512f_opt=3D"yes" ;; =20 - --enable-glusterfs) glusterfs=3D"yes" + --enable-glusterfs) glusterfs=3D"enabled" ;; --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane) echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2 @@ -3871,64 +3865,6 @@ if test "$libxml2" !=3D "no" ; then fi fi =20 -########################################## -# glusterfs probe -if test "$glusterfs" !=3D "no" ; then - if $pkg_config --atleast-version=3D3 glusterfs-api; then - glusterfs=3D"yes" - glusterfs_cflags=3D$($pkg_config --cflags glusterfs-api) - glusterfs_libs=3D$($pkg_config --libs glusterfs-api) - if $pkg_config --atleast-version=3D4 glusterfs-api; then - glusterfs_xlator_opt=3D"yes" - fi - if $pkg_config --atleast-version=3D5 glusterfs-api; then - glusterfs_discard=3D"yes" - fi - if $pkg_config --atleast-version=3D6 glusterfs-api; then - glusterfs_fallocate=3D"yes" - glusterfs_zerofill=3D"yes" - fi - cat > $TMPC << EOF -#include - -int -main(void) -{ - /* new glfs_ftruncate() passes two additional args */ - return glfs_ftruncate(NULL, 0, NULL, NULL); -} -EOF - if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then - glusterfs_ftruncate_has_stat=3D"yes" - fi - cat > $TMPC << EOF -#include - -/* new glfs_io_cbk() passes two additional glfs_stat structs */ -static void -glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, stru= ct glfs_stat *poststat, void *data) -{} - -int -main(void) -{ - glfs_io_cbk iocb =3D &glusterfs_iocb; - iocb(NULL, 0 , NULL, NULL, NULL); - return 0; -} -EOF - if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then - glusterfs_iocb_has_stat=3D"yes" - fi - else - if test "$glusterfs" =3D "yes" ; then - feature_not_found "GlusterFS backend support" \ - "Install glusterfs-api devel >=3D 3" - fi - glusterfs=3D"no" - fi -fi - # Check for inotify functions when we are building linux-user # emulator. This is done because older glibc versions don't # have syscall stubs for these implemented. In that case we @@ -6415,36 +6351,6 @@ if test "$getauxval" =3D "yes" ; then echo "CONFIG_GETAUXVAL=3Dy" >> $config_host_mak fi =20 -if test "$glusterfs" =3D "yes" ; then - echo "CONFIG_GLUSTERFS=3Dy" >> $config_host_mak - echo "GLUSTERFS_CFLAGS=3D$glusterfs_cflags" >> $config_host_mak - echo "GLUSTERFS_LIBS=3D$glusterfs_libs" >> $config_host_mak -fi - -if test "$glusterfs_xlator_opt" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_XLATOR_OPT=3Dy" >> $config_host_mak -fi - -if test "$glusterfs_discard" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_DISCARD=3Dy" >> $config_host_mak -fi - -if test "$glusterfs_fallocate" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_FALLOCATE=3Dy" >> $config_host_mak -fi - -if test "$glusterfs_zerofill" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_ZEROFILL=3Dy" >> $config_host_mak -fi - -if test "$glusterfs_ftruncate_has_stat" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=3Dy" >> $config_host_mak -fi - -if test "$glusterfs_iocb_has_stat" =3D "yes" ; then - echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=3Dy" >> $config_host_mak -fi - if test "$libssh" =3D "yes" ; then echo "CONFIG_LIBSSH=3Dy" >> $config_host_mak echo "LIBSSH_CFLAGS=3D$libssh_cflags" >> $config_host_mak @@ -6919,7 +6825,7 @@ NINJA=3D$ninja $meson setup \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_p= ng=3D$vnc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f -Dvirti= ofsd=3D$virtiofsd \ -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt -Dbrlapi=3D$b= rlapi \ - -Dcurl=3D$curl \ + -Dcurl=3D$curl -Dglusterfs=3D$glusterfs \ -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev=3D$libudev\ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ -Dvhost_user_blk_server=3D$vhost_user_blk_server \ diff --git a/meson.build b/meson.build index 83dbc61acd..409b958a7f 100644 --- a/meson.build +++ b/meson.build @@ -613,9 +613,40 @@ if 'CONFIG_RBD' in config_host rbd =3D declare_dependency(link_args: config_host['RBD_LIBS'].split()) endif glusterfs =3D not_found -if 'CONFIG_GLUSTERFS' in config_host - glusterfs =3D declare_dependency(compile_args: config_host['GLUSTERFS_CF= LAGS'].split(), - link_args: config_host['GLUSTERFS_LIBS'].= split()) +glusterfs_ftruncate_has_stat =3D false +glusterfs_iocb_has_stat =3D false +if not get_option('glusterfs').auto() or have_block + glusterfs =3D dependency('glusterfs-api', version: '>=3D3', + required: get_option('glusterfs'), + method: 'pkg-config', static: enable_static) + if glusterfs.found() + glusterfs_ftruncate_has_stat =3D cc.links(''' + #include + + int + main(void) + { + /* new glfs_ftruncate() passes two additional args */ + return glfs_ftruncate(NULL, 0, NULL, NULL); + } + ''', dependencies: glusterfs) + glusterfs_iocb_has_stat =3D cc.links(''' + #include + + /* new glfs_io_cbk() passes two additional glfs_stat structs */ + static void + glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat= , struct glfs_stat *poststat, void *data) + {} + + int + main(void) + { + glfs_io_cbk iocb =3D &glusterfs_iocb; + iocb(NULL, 0 , NULL, NULL, NULL); + return 0; + } + ''', dependencies: glusterfs) + endif endif libssh =3D not_found if 'CONFIG_LIBSSH' in config_host @@ -876,6 +907,13 @@ config_host_data.set('CONFIG_MPATH', mpathpersist.foun= d()) config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) config_host_data.set('CONFIG_CURL', curl.found()) config_host_data.set('CONFIG_CURSES', curses.found()) +config_host_data.set('CONFIG_GLUSTERFS', glusterfs.found()) +config_host_data.set('CONFIG_GLUSTERFS_XLATOR_OPT', glusterfs.version().ve= rsion_compare('>=3D4')) +config_host_data.set('CONFIG_GLUSTERFS_DISCARD', glusterfs.version().versi= on_compare('>=3D5')) +config_host_data.set('CONFIG_GLUSTERFS_FALLOCATE', glusterfs.version().ver= sion_compare('>=3D6')) +config_host_data.set('CONFIG_GLUSTERFS_ZEROFILL', glusterfs.version().vers= ion_compare('>=3D6')) +config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT', glusterfs_ftru= ncate_has_stat) +config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', glusterfs_iocb_has_= stat) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_s= erver) @@ -2252,7 +2290,7 @@ summary_info +=3D {'coroutine pool': config_host['= CONFIG_COROUTINE_POOL'] =3D=3D '1 summary_info +=3D {'debug stack usage': config_host.has_key('CONFIG_DEBUG_= STACK_USAGE')} summary_info +=3D {'mutex debugging': config_host.has_key('CONFIG_DEBUG_= MUTEX')} summary_info +=3D {'crypto afalg': config_host.has_key('CONFIG_AF_ALG= ')} -summary_info +=3D {'GlusterFS support': config_host.has_key('CONFIG_GLUSTE= RFS')} +summary_info +=3D {'GlusterFS support': glusterfs.found()} summary_info +=3D {'gcov': get_option('b_coverage')} summary_info +=3D {'TPM support': config_host.has_key('CONFIG_TPM')} summary_info +=3D {'libssh support': config_host.has_key('CONFIG_LIBSSH= ')} diff --git a/meson_options.txt b/meson_options.txt index 2b845ac62b..b5d84bb88b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,6 +46,8 @@ option('cocoa', type : 'feature', value : 'auto', description: 'Cocoa user interface (macOS only)') option('curl', type : 'feature', value : 'auto', description: 'CURL block device driver') +option('glusterfs', type : 'feature', value : 'auto', + description: 'Glusterfs block device driver') option('mpath', type : 'feature', value : 'auto', description: 'Multipath persistent reservation passthrough') option('iconv', type : 'feature', value : 'auto', --=20 2.29.2