From nobody Tue Nov 18 09:03:10 2025 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=1608572563; cv=none; d=zohomail.com; s=zohoarc; b=M9ULJ2n1KVWwUyT69MM0fhJPs0kNEGtctO0wPrurI7bB4P99bnrWrCyxLwP6UWYHlzzya2D2+CB3XQoqM/pLX1gfmruqyT/p0piRrH+xgTXFZ4n01btIsRJ2fJNDQHnEayANjFg8rCx7tNZ+gugSQEqSluT2ZMoLrr9MCmfQwmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608572563; h=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=YvGDjUX1uzLrPzoSyBtKDm1Id/IjIEI43leAgzqJqhU=; b=RqIgTxNUoWVFr9i/rPT1h6pT/PKUhX+56Peoa4tEG1+tTbl3zFsAL4r5mhISd/PY38cSlYnKYjpgsfsamD6NGT/mK6DTU0yKWMKaDOC6xFA71bVyKnTtuJ3MUCKaukholNKolblESG3sp8Xgmt9G07Z9ZthBoR94+u+pA3An2BE= 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 1608572563568535.5657677711262; Mon, 21 Dec 2020 09:42:43 -0800 (PST) Received: from localhost ([::1]:37242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krN6e-0002Q9-Dq for importer@patchew.org; Mon, 21 Dec 2020 10:28:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krMRJ-0004vH-0h for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:33 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1krMRC-0007qL-Ha for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:32 -0500 Received: by mail-wm1-x32e.google.com with SMTP id v14so10095560wml.1 for ; Mon, 21 Dec 2020 06:45:25 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id l5sm27439627wrv.44.2020.12.21.06.45.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 06:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YvGDjUX1uzLrPzoSyBtKDm1Id/IjIEI43leAgzqJqhU=; b=GjSAnPZGbVYqszF+K55bs8+51fglNPeZUvEr3sun4/OdNZN6NJIay2SMQ0WUjeF6H7 7OsmHmj6ymwCdP1xl0/JcKaIF8PU1Dh+QtwK+XSQH4qzfGDc4kdMxCNki9DWxIhUObAi 8Cd9Fp1Jisg2Sx5Cj5fWUajUP0fzFRyhhXdGkOsmTCBIMEuKIGGPxq2+BqkzbV6wSRM1 z8YG1c9crnBVqR+uBe7/pqbjpam2vjAUBNUOempk1a+oR5/vMxcKQhGXfQcBuCER/HRN QyCKEx8AkPzmm4ChPsykl9w/RuURGHGKtf5gxRb+YyA6tot1grfsW334I1bT0TheGXZp upJA== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YvGDjUX1uzLrPzoSyBtKDm1Id/IjIEI43leAgzqJqhU=; b=NoXwizXHdBRRRGCBF5yVzMXAahQiMvBxSS6IjrFmNwOp5aIK4+fnCJLkJBtm/GmVyD JiqGBMk/EeBtVJSl1d5HCRxQm5VwmhCFPLIu9IvD8eBNEeYSb0vewdhRilM9V2l9+W+j keplftgRJM2r4RayOuQj1mzwMzRO3xAgcLbrfxghUjrdd2VJzoJeQYt58ce4FWCXeH9X uKMWHG6TAK1KjaGN0VGSDRxrSpDRGmwGmIOhV9/mhVQjGhrnYF1w4Lb3qcC6nxoeixoZ JKpbjCydZWvGY9gMahsSDsWA6cm9Im4dRRXDjC4prhtnHnOnJOc82zMVAe4YdyOFEoqV yJYg== X-Gm-Message-State: AOAM531Fmk8OeMvMT0q4iGwXZLVfREpWaSeDEjih7n9HJBdk4om9wJCx hwVbQctDAIzHgWtL2yZWrSNvxY4gaX4= X-Google-Smtp-Source: ABdhPJyIFN0OslCzEpf6+jPU9LJvw/YkGFZGsg/R0qwbPBNzXyVzhRwqS8pKZU/87Z0BBLyUFf6ixg== X-Received: by 2002:a1c:df85:: with SMTP id w127mr17383726wmg.166.1608561924222; Mon, 21 Dec 2020 06:45:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 39/55] glusterfs: convert to meson Date: Mon, 21 Dec 2020 15:44:31 +0100 Message-Id: <20201221144447.26161-40-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201221144447.26161-1-pbonzini@redhat.com> References: <20201221144447.26161-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::32e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32e.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, 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: , 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 --- configure | 102 ++-------------------------------------------- meson.build | 48 ++++++++++++++++++++-- meson_options.txt | 2 + 3 files changed, 50 insertions(+), 102 deletions(-) diff --git a/configure b/configure index bb6b8eefdb..b7644cfbd9 100755 --- a/configure +++ b/configure @@ -414,13 +414,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" @@ -1365,7 +1359,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" ;; @@ -1376,7 +1370,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 @@ -3869,64 +3863,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 @@ -6413,36 +6349,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 @@ -6917,7 +6823,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 1d5b00aef1..db52ac6bdf 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,15 @@ 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()) +if glusterfs.found() + config_host_data.set('CONFIG_GLUSTERFS_XLATOR_OPT', glusterfs.version().= version_compare('>=3D4')) + config_host_data.set('CONFIG_GLUSTERFS_DISCARD', glusterfs.version().ver= sion_compare('>=3D5')) + config_host_data.set('CONFIG_GLUSTERFS_FALLOCATE', glusterfs.version().v= ersion_compare('>=3D6')) + config_host_data.set('CONFIG_GLUSTERFS_ZEROFILL', glusterfs.version().ve= rsion_compare('>=3D6')) + config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT', glusterfs_ft= runcate_has_stat) + config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', glusterfs_iocb_ha= s_stat) +endif 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) @@ -2253,7 +2293,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