From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6363EC4361B for ; Thu, 17 Dec 2020 12:33:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9317A2339E for ; Thu, 17 Dec 2020 12:33:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9317A2339E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpsTG-0000iI-Ig for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 07:33:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpsM8-0004cr-3l for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:26:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpsM1-0006CB-5Q for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:26:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608207956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Unc/EUUG+9AQsiWEVnUNJji2JTqbieQ7nM4934sAzAU=; b=NnLqEQGKNBn6M4yN62xrb+q99mvypIE2t/1XWEPfFRTZiLDgdl7oifMRbbOf0fts2mAlIF 6iMgXkLuEZfDDLa/o/ogSZ+ZewzivtmlHKzlcgB5CFxghUSLo7xU0V0eJkZJ5ovane6de7 U4rdRzB4dBJPVANJAWZLUyRgjT3y4tY= Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-595-cE2Ylj7-PmWkORxwH4aVqA-1; Thu, 17 Dec 2020 07:25:54 -0500 X-MC-Unique: cE2Ylj7-PmWkORxwH4aVqA-1 Received: by mail-io1-f70.google.com with SMTP id l18so27008197iok.7 for ; Thu, 17 Dec 2020 04:25:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Unc/EUUG+9AQsiWEVnUNJji2JTqbieQ7nM4934sAzAU=; b=awZtYRLmXS7M4Z9y0fuanzMQGXfnkYY4JiW8hBLiRi9EbKYY+eEBWFLy370mXJTDaY 0Um9aZJhYz1iECPwhyHGwPiBiO/B7LCR4ilhBhy2noqdJ9LqxOjEqwR3z691ftG0V3el 2javq/tl5kQDRu6KcmSLGLqZwyRrIM1uLBii6RIbC/dWLfQXHx06/rghm8bZmIr2vZYA YbZV+MC0Xf+Sc8jemrHaR6IIvmsZdeYuCRS/JV6aY/q4XvA9BDwOoqsQvFr67lNTCJEv 18sATxHoRAvFNWvVw2Qxgwu4H2BMlQeXpicAKdHokSXVIHLMlPWHsRm3NJNcPFvlWo98 Rc4A== X-Gm-Message-State: AOAM532nREFRxj3L8F5d1saPKZH5SVd7hNGAjuBDvIgiKY08T/eEu5ip eoY6orVDrnwAw3EfkbWwHiXkOeapptZC+RSKllVe2o5IeJegHeA/Le/f/x9lF1QzRpGSM7h7qen 7dXlnvSxjsEskUDssEUvOTYRfd5ZkqJ8= X-Received: by 2002:a02:5e81:: with SMTP id h123mr47430110jab.36.1608207953341; Thu, 17 Dec 2020 04:25:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvU/aNkWMfhzrDskP2BZbkLGRmZPKCeTTg9YYxQhx0jNbka+cvWUCl8+HLO1BlAFd8JF40yOsqKX1C5xVy+50= X-Received: by 2002:a02:5e81:: with SMTP id h123mr47430099jab.36.1608207953157; Thu, 17 Dec 2020 04:25:53 -0800 (PST) MIME-Version: 1.0 References: <20201217094044.46462-1-pbonzini@redhat.com> <20201217094044.46462-7-pbonzini@redhat.com> In-Reply-To: <20201217094044.46462-7-pbonzini@redhat.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Thu, 17 Dec 2020 16:25:41 +0400 Message-ID: Subject: Re: [PATCH 06/18] libiscsi: convert to meson To: Paolo Bonzini Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000c5f7e805b6a81774" Received-SPF: pass client-ip=216.205.24.124; envelope-from=mlureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-devel Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000c5f7e805b6a81774 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Dec 17, 2020 at 1:40 PM Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > Reviewed-by: Marc-Andr=C3=A9 Lureau --- > 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('parallels.c')) > block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', > 'win32-aio.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 082ac3bf35..e22c56e8f6 100755 > --- a/configure > +++ b/configure > @@ -406,7 +406,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" > @@ -1139,9 +1139,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" > ;; > @@ -4315,21 +4315,6 @@ if compile_prog "" "" ; then > bswap_h=3Dyes > fi > > -########################################## > -# 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 > @@ -6231,12 +6216,6 @@ if test "$zstd" =3D "yes" ; then > echo "ZSTD_LIBS=3D$zstd_libs" >> $config_host_mak > fi > > -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 > @@ -6802,7 +6781,7 @@ NINJA=3D$ninja $meson setup \ > -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg > -Dvnc_png=3D$vnc_png \ > -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f > -Dvirtiofsd=3D$virtiofsd \ > -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt -Dbrlapi=3D= $brlapi \ > - -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 \ > + -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip2=3D$bzip2 > -Dlibiscsi=3D$libiscsi \ > -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev=3D$libudev\ > -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D= $blobs \ > -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 9ba8eecf37..3f53a7f1b2 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_CFLAGS'].split(), > - link_args: > config_host['LIBISCSI_LIBS'].split()) > +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 > @@ -926,6 +927,7 @@ config_host_data.set('CONFIG_GLUSTERFS_FALLOCATE', > glusterfs.version().version_c > config_host_data.set('CONFIG_GLUSTERFS_ZEROFILL', > glusterfs.version().version_compare('>=3D6')) > config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT', > glusterfs_ftruncate_has_stat) > config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', > glusterfs_iocb_has_stat) > +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_server) > @@ -2283,7 +2285,7 @@ summary_info +=3D {'libusb': > config_host.has_key('CONFIG_USB_LIBUSB')} > summary_info +=3D {'usb net redir': > config_host.has_key('CONFIG_USB_REDIR')} > 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_LIBISCSI')} > +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', > -- > 2.29.2 > > > --000000000000c5f7e805b6a81774 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Dec 17, 2020 at 1:40 PM Paolo= Bonzini <pbonzini@redhat.com= > wrote:
Sign= ed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>=C2=A0

<= /div>
---
=C2=A0block/meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0configure=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 29 ++++------------------------- =C2=A0contrib/vhost-user-scsi/meson.build |=C2=A0 2 +-
=C2=A0meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 10 ++++++----
=C2=A0meson_options.txt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 2 ++
=C2=A05 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(<= br> =C2=A0block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], if_true: fi= les('parallels.c'))
=C2=A0block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-w= in32.c', 'win32-aio.c'))
=C2=A0block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-= posix.c'), coref, iokit])
-block_ss.add(when: 'CONFIG_LIBISCSI', if_true: files('iscsi-op= ts.c'))
+block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
=C2=A0block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c= '))
=C2=A0block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('= replication.c'))
=C2=A0block_ss.add(when: 'CONFIG_SHEEPDOG', if_true: files('she= epdog.c'))
diff --git a/configure b/configure
index 082ac3bf35..e22c56e8f6 100755
--- a/configure
+++ b/configure
@@ -406,7 +406,7 @@ guest_agent_msi=3D"$default_feature"
=C2=A0vss_win32_sdk=3D"$default_feature"
=C2=A0win_sdk=3D"no"
=C2=A0want_tools=3D"$default_feature"
-libiscsi=3D"$default_feature"
+libiscsi=3D"auto"
=C2=A0libnfs=3D"$default_feature"
=C2=A0coroutine=3D""
=C2=A0coroutine_pool=3D"$default_feature"
@@ -1139,9 +1139,9 @@ for opt do
=C2=A0 =C2=A0;;
=C2=A0 =C2=A0--enable-spice) spice=3D"yes"
=C2=A0 =C2=A0;;
-=C2=A0 --disable-libiscsi) libiscsi=3D"no"
+=C2=A0 --disable-libiscsi) libiscsi=3D"disabled"
=C2=A0 =C2=A0;;
-=C2=A0 --enable-libiscsi) libiscsi=3D"yes"
+=C2=A0 --enable-libiscsi) libiscsi=3D"enabled"
=C2=A0 =C2=A0;;
=C2=A0 =C2=A0--disable-libnfs) libnfs=3D"no"
=C2=A0 =C2=A0;;
@@ -4315,21 +4315,6 @@ if compile_prog "" "" ; then
=C2=A0 =C2=A0bswap_h=3Dyes
=C2=A0fi

-##########################################
-# Do we have libiscsi >=3D 1.9.0
-if test "$libiscsi" !=3D "no" ; then
-=C2=A0 if $pkg_config --atleast-version=3D1.9.0 libiscsi; then
-=C2=A0 =C2=A0 libiscsi=3D"yes"
-=C2=A0 =C2=A0 libiscsi_cflags=3D$($pkg_config --cflags libiscsi)
-=C2=A0 =C2=A0 libiscsi_libs=3D$($pkg_config --libs libiscsi)
-=C2=A0 else
-=C2=A0 =C2=A0 if test "$libiscsi" =3D "yes" ; then
-=C2=A0 =C2=A0 =C2=A0 feature_not_found "libiscsi" "Install = libiscsi >=3D 1.9.0"
-=C2=A0 =C2=A0 fi
-=C2=A0 =C2=A0 libiscsi=3D"no"
-=C2=A0 fi
-fi
-
=C2=A0##########################################
=C2=A0# Do we need librt
=C2=A0# uClibc provides 2 versions of clock_gettime(), one with realtime @@ -6231,12 +6216,6 @@ if test "$zstd" =3D "yes" ; then=
=C2=A0 =C2=A0echo "ZSTD_LIBS=3D$zstd_libs" >> $config_host_= mak
=C2=A0fi

-if test "$libiscsi" =3D "yes" ; then
-=C2=A0 echo "CONFIG_LIBISCSI=3Dy" >> $config_host_mak
-=C2=A0 echo "LIBISCSI_CFLAGS=3D$libiscsi_cflags" >> $confi= g_host_mak
-=C2=A0 echo "LIBISCSI_LIBS=3D$libiscsi_libs" >> $config_ho= st_mak
-fi
-
=C2=A0if test "$libnfs" =3D "yes" ; then
=C2=A0 =C2=A0echo "CONFIG_LIBNFS=3Dy" >> $config_host_mak =C2=A0 =C2=A0echo "LIBNFS_LIBS=3D$libnfs_libs" >> $config_h= ost_mak
@@ -6802,7 +6781,7 @@ NINJA=3D$ninja $meson setup \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc= _jpeg=3D$vnc_jpeg -Dvnc_png=3D$vnc_png \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dgettext=3D$gettext -Dxkbcommon=3D$xkbco= mmon -Du2f=3D$u2f -Dvirtiofsd=3D$virtiofsd \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dcapstone=3D$capstone -Dslirp=3D$slirp -= Dfdt=3D$fdt -Dbrlapi=3D$brlapi \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip= 2=3D$bzip2 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcurl=3D$curl -Dglusterfs=3D$glusterfs -Dbzip= 2=3D$bzip2 -Dlibiscsi=3D$libiscsi \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Diconv=3D$iconv -Dcurses=3D$curses -Dlib= udev=3D$libudev\
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Ddocs=3D$docs -Dsphinx_build=3D$sphinx_b= uild -Dinstall_blobs=3D$blobs \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-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()
=C2=A0 =C2=A0executable('vhost-user-scsi', files('vhost-user-sc= si.c'),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dependencies: [qemuutil, l= ibiscsi, vhost_user],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 build_by_default: targetos= =3D=3D 'linux',
diff --git a/meson.build b/meson.build
index 9ba8eecf37..3f53a7f1b2 100644
--- a/meson.build
+++ b/meson.build
@@ -372,9 +372,10 @@ if 'CONFIG_PLUGIN' in config_host
=C2=A0 =C2=A0libdl =3D cc.find_library('dl', required: true)
=C2=A0endif
=C2=A0libiscsi =3D not_found
-if 'CONFIG_LIBISCSI' in config_host
-=C2=A0 libiscsi =3D declare_dependency(compile_args: config_host['LIBI= SCSI_CFLAGS'].split(),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 link_args: config_host['LIBISCSI= _LIBS'].split())
+if not get_option('libiscsi').auto() or have_block
+=C2=A0 libiscsi =3D dependency('libiscsi', version: '>=3D1.= 9.0',
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0required: get_option('libiscsi'),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0method: 'pkg-config', static: enable_static)
=C2=A0endif
=C2=A0zstd =3D not_found
=C2=A0if 'CONFIG_ZSTD' in config_host
@@ -926,6 +927,7 @@ config_host_data.set('CONFIG_GLUSTERFS_FALLOCATE= 9;, glusterfs.version().version_c
=C2=A0config_host_data.set('CONFIG_GLUSTERFS_ZEROFILL', glusterfs.v= ersion().version_compare('>=3D6'))
=C2=A0config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT', g= lusterfs_ftruncate_has_stat)
=C2=A0config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', gluste= rfs_iocb_has_stat)
+config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
=C2=A0config_host_data.set('CONFIG_SDL', sdl.found())
=C2=A0config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) =C2=A0config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vho= st_user_blk_server)
@@ -2283,7 +2285,7 @@ summary_info +=3D {'libusb':=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 config_host.has_key('CONFIG_USB_LIBUSB')}<= br> =C2=A0summary_info +=3D {'usb net redir':=C2=A0 =C2=A0 =C2=A0config= _host.has_key('CONFIG_USB_REDIR')}
=C2=A0summary_info +=3D {'OpenGL support':=C2=A0 =C2=A0 config_host= .has_key('CONFIG_OPENGL')}
=C2=A0summary_info +=3D {'OpenGL dmabufs':=C2=A0 =C2=A0 config_host= .has_key('CONFIG_OPENGL_DMABUF')}
-summary_info +=3D {'libiscsi support':=C2=A0 config_host.has_key(&= #39;CONFIG_LIBISCSI')}
+summary_info +=3D {'libiscsi support':=C2=A0 libiscsi.found()}
=C2=A0summary_info +=3D {'libnfs support':=C2=A0 =C2=A0 config_host= .has_key('CONFIG_LIBNFS')}
=C2=A0summary_info +=3D {'build guest agent': config_host.has_key(&= #39;CONFIG_GUEST_AGENT')}
=C2=A0if 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',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'CURL block device driver'= )
=C2=A0option('glusterfs', type : 'feature', value : 'au= to',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'Glusterfs block device driver= ')
+option('libiscsi', type : 'feature', value : 'auto'= ;,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0description: 'libiscsi userspace initiator&= #39;)
=C2=A0option('mpath', type : 'feature', value : 'auto&#= 39;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'Multipath persistent reservat= ion passthrough')
=C2=A0option('iconv', type : 'feature', value : 'auto&#= 39;,
--
2.29.2


--000000000000c5f7e805b6a81774--