From nobody Tue Nov 18 09:06:22 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=1608571177; cv=none; d=zohomail.com; s=zohoarc; b=Y0vYwRTEVIjPYaHsut7LwWTGVg9Vayl9L3q75kpMKuU3dIYCpn0t4SYGOff2nhyWCE3zQJfX9wUF5gEWoYGydt/BaU1kxfLI1aPMzZ1AJ/Zvrqvhfw5zPs02nD8AVjOZ43eCcChJ00lDpY180D3IWDxUqjDrEHeoS6Cpda8ZyFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608571177; 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=0IPpgfXJIG4wmc/dJzLIQz8n37gZPgs0r3/il0rSCBQ=; b=Ji7sCAkGBd5UFwUtDNdVSkQ76qtGztmUbG2JvEEG0gcNsv/3YvTeSv+Wudi+rIoTASF4cO7/44fA3sq/WraAq0D7ZXrH74njDAjqW20ODaJeoRSa86TTwQ/HSe1VAXBT+xSvYCco3T2UjB6Qf4yu8JatuMj88O0syjnWcYhQZiw= 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 1608571177354538.0875246682306; Mon, 21 Dec 2020 09:19:37 -0800 (PST) Received: from localhost ([::1]:40360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krMkt-0004pM-Pf for importer@patchew.org; Mon, 21 Dec 2020 10:05:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krMRL-00050e-BA for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:35 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:55822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1krMRD-0007rC-MB for qemu-devel@nongnu.org; Mon, 21 Dec 2020 09:45:34 -0500 Received: by mail-wm1-x334.google.com with SMTP id x22so10081179wmc.5 for ; Mon, 21 Dec 2020 06:45:26 -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.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 06:45:25 -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=0IPpgfXJIG4wmc/dJzLIQz8n37gZPgs0r3/il0rSCBQ=; b=Ooo6NM9Jcil0b4ei/71psljq9lII19QKlYtYe98l+lLaMuh0biapanfkk3231MJWVZ pNp8WKRjkO4faKp45zNZ1vx1NusA4fwtGS+N99xpLg3iDfih39IWVm95Vb04/ZQp2vI6 sp6P/t4KB6cWWSg3blm1hDulNuF1YYQW3zOFhiipJyjJlJdpeyeGLxaTfV8cFwrlvSuT 9pcMFjHZ2CtWmZykSkR0yyV8/1D8Vtw480c+oCVdi/JSfbW9aWrIA/eKS1QsxDIN7cD7 2sUHKd1Dahnaxpi3QUUAgUiUmEWnxy63Th86+xk9JX+QBM8HvQTocJc/XVlmg4JPKfv4 rnkw== 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=0IPpgfXJIG4wmc/dJzLIQz8n37gZPgs0r3/il0rSCBQ=; b=AVe4nKHECadNjiO6RwOUy21WLRNIYsZfTTXXsYX3/AepKMOXawjWs7wftiLz+o0rR6 UwgssOwoR5mKnrlZkIxkCUB9XEexfweTiD6oyP1cEFKe4vYW9GCyAjTfKHMpmtvIfCZy 2cBEDFz/zbBSS2JrKqmueK48XbqHWTeleI2gwLKIq0nK9sS6OVUlGuddlqIJQSOa0KYS b274nJFbuHff0+X4Ji5rtlucMNjVIA4UQKMBNpnbS85zp/fq0WtnYtsMrz+Q6jpF6J+Q cyfQceBZoYRsUvv9mWuQ0aEpw+kn0AcFBZq0ROYwkvSz7dbP2RoZAq6HtaPTEwjDWYvc fS3g== X-Gm-Message-State: AOAM531ErBvo7rI12QZr3K4WAjR/8A7AFDeYqikfV6SvadUEMZ70lpzD WuvqlozYAne4l5MjHoq+z36L3PEHfX4= X-Google-Smtp-Source: ABdhPJyIZPxlGbx/e8/mgPPHTn/25KXjxdGKwIIvajT0SRnDtBGOsKyg6GNReMg7GWizdQwh8CzBKQ== X-Received: by 2002:a05:600c:2042:: with SMTP id p2mr17292435wmg.152.1608561925764; Mon, 21 Dec 2020 06:45:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 41/55] libiscsi: convert to meson Date: Mon, 21 Dec 2020 15:44:33 +0100 Message-Id: <20201221144447.26161-42-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::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.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 --- block/meson.build | 2 +- configure | 29 ++++------------------------- contrib/vhost-user-scsi/meson.build | 2 +- meson.build | 10 ++++++---- meson_options.txt | 2 ++ 5 files changed, 14 insertions(+), 31 deletions(-) diff --git a/block/meson.build b/block/meson.build index b02cb14aad..134034abb4 100644 --- a/block/meson.build +++ b/block/meson.build @@ -59,7 +59,7 @@ block_ss.add(when: 'CONFIG_QED', if_true: files( block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], if_true: files('parallel= s.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-a= io.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref,= iokit]) -block_ss.add(when: 'CONFIG_LIBISCSI', if_true: files('iscsi-opts.c')) +block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c')) block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c')) block_ss.add(when: 'CONFIG_SHEEPDOG', if_true: files('sheepdog.c')) diff --git a/configure b/configure index 3d65c1e196..30084af631 100755 --- a/configure +++ b/configure @@ -405,7 +405,7 @@ guest_agent_msi=3D"$default_feature" vss_win32_sdk=3D"$default_feature" win_sdk=3D"no" want_tools=3D"$default_feature" -libiscsi=3D"$default_feature" +libiscsi=3D"auto" libnfs=3D"$default_feature" coroutine=3D"" coroutine_pool=3D"$default_feature" @@ -1138,9 +1138,9 @@ for opt do ;; --enable-spice) spice=3D"yes" ;; - --disable-libiscsi) libiscsi=3D"no" + --disable-libiscsi) libiscsi=3D"disabled" ;; - --enable-libiscsi) libiscsi=3D"yes" + --enable-libiscsi) libiscsi=3D"enabled" ;; --disable-libnfs) libnfs=3D"no" ;; @@ -4313,21 +4313,6 @@ if compile_prog "" "" ; then bswap_h=3Dyes fi =20 -########################################## -# Do we have libiscsi >=3D 1.9.0 -if test "$libiscsi" !=3D "no" ; then - if $pkg_config --atleast-version=3D1.9.0 libiscsi; then - libiscsi=3D"yes" - libiscsi_cflags=3D$($pkg_config --cflags libiscsi) - libiscsi_libs=3D$($pkg_config --libs libiscsi) - else - if test "$libiscsi" =3D "yes" ; then - feature_not_found "libiscsi" "Install libiscsi >=3D 1.9.0" - fi - libiscsi=3D"no" - fi -fi - ########################################## # Do we need librt # uClibc provides 2 versions of clock_gettime(), one with realtime @@ -6229,12 +6214,6 @@ if test "$zstd" =3D "yes" ; then echo "ZSTD_LIBS=3D$zstd_libs" >> $config_host_mak fi =20 -if test "$libiscsi" =3D "yes" ; then - echo "CONFIG_LIBISCSI=3Dy" >> $config_host_mak - echo "LIBISCSI_CFLAGS=3D$libiscsi_cflags" >> $config_host_mak - echo "LIBISCSI_LIBS=3D$libiscsi_libs" >> $config_host_mak -fi - if test "$libnfs" =3D "yes" ; then echo "CONFIG_LIBNFS=3Dy" >> $config_host_mak echo "LIBNFS_LIBS=3D$libnfs_libs" >> $config_host_mak @@ -6800,7 +6779,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 -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 \ + -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 -Dlibiscs= i=3D$libiscsi \ -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/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/= meson.build index 044c50bf43..cc893f6f20 100644 --- a/contrib/vhost-user-scsi/meson.build +++ b/contrib/vhost-user-scsi/meson.build @@ -1,4 +1,4 @@ -if 'CONFIG_LIBISCSI' in config_host +if libiscsi.found() executable('vhost-user-scsi', files('vhost-user-scsi.c'), dependencies: [qemuutil, libiscsi, vhost_user], build_by_default: targetos =3D=3D 'linux', diff --git a/meson.build b/meson.build index 66e35598ce..d1cbea169c 100644 --- a/meson.build +++ b/meson.build @@ -372,9 +372,10 @@ if 'CONFIG_PLUGIN' in config_host libdl =3D cc.find_library('dl', required: true) endif libiscsi =3D not_found -if 'CONFIG_LIBISCSI' in config_host - libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), - link_args: config_host['LIBISCSI_LIBS'].sp= lit()) +if not get_option('libiscsi').auto() or have_block + libiscsi =3D dependency('libiscsi', version: '>=3D1.9.0', + required: get_option('libiscsi'), + method: 'pkg-config', static: enable_static) endif zstd =3D not_found if 'CONFIG_ZSTD' in config_host @@ -928,6 +929,7 @@ if glusterfs.found() 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_LIBISCSI', libiscsi.found()) 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) @@ -2286,7 +2288,7 @@ summary_info +=3D {'libusb': config_host.h= as_key('CONFIG_USB_LIBUSB')} summary_info +=3D {'usb net redir': config_host.has_key('CONFIG_USB_RE= DIR')} summary_info +=3D {'OpenGL support': config_host.has_key('CONFIG_OPENGL= ')} summary_info +=3D {'OpenGL dmabufs': config_host.has_key('CONFIG_OPENGL= _DMABUF')} -summary_info +=3D {'libiscsi support': config_host.has_key('CONFIG_LIBISC= SI')} +summary_info +=3D {'libiscsi support': libiscsi.found()} summary_info +=3D {'libnfs support': config_host.has_key('CONFIG_LIBNFS= ')} summary_info +=3D {'build guest agent': config_host.has_key('CONFIG_GUEST_= AGENT')} if targetos =3D=3D 'windows' diff --git a/meson_options.txt b/meson_options.txt index fd16f3b399..b562d4f1a6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -50,6 +50,8 @@ option('curl', type : 'feature', value : 'auto', description: 'CURL block device driver') option('glusterfs', type : 'feature', value : 'auto', description: 'Glusterfs block device driver') +option('libiscsi', type : 'feature', value : 'auto', + description: 'libiscsi userspace initiator') option('mpath', type : 'feature', value : 'auto', description: 'Multipath persistent reservation passthrough') option('iconv', type : 'feature', value : 'auto', --=20 2.29.2