From nobody Tue May 7 12:02:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630258429; cv=none; d=zohomail.com; s=zohoarc; b=CYg3e05bkA3MRc8F+H/Uy4hr6Dgcusk2J4l+FQTofHev120pVURVp1/x38ZAsQn/moc6RW51Fsd3RU/uIblHDW4DA7tpOrqJN2kvEBcdMIp09u+++3rBuT75Wk10TQonSiVz9I0tHzSCbUn5yvsCJClVJSrHT7qbp/ac/+hugiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630258429; h=Content-Type: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=wHknF0D1Eg1pEEEHG32q0tMsvG25u8EebWnjBUY2BGE=; b=CsEz/f7tYie+1+n57a1R6no0sgR9DPi0K0dPOMBd3Y0z9GhRBA4LgjXSZ01px6VwLNCVc6x49bvE3cnEySTTzH22UHt/qkubq4oqHFGZnrZwSqfiYuoSB9OiaOPEi3UaEnkOjbaTxTvJl60KVj2uG9HRI4qvNDJe6o1uteyhwUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630258429175530.9440408159356; Sun, 29 Aug 2021 10:33:49 -0700 (PDT) Received: from localhost ([::1]:51624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKOgl-00073V-MU for importer@patchew.org; Sun, 29 Aug 2021 13:33:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfY-0005hC-7D for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfV-0007dc-7E for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:31 -0400 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-185-2JDcK0a9Pf2xs07AwAc4fg-1; Sun, 29 Aug 2021 13:32:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76E951082924 for ; Sun, 29 Aug 2021 17:32:25 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA2560D31; Sun, 29 Aug 2021 17:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630258347; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wHknF0D1Eg1pEEEHG32q0tMsvG25u8EebWnjBUY2BGE=; b=ZfheKy5nbnXBuzSUK4TPl2TDYwjlNiWaLBioE4htk9TFvyc7Hq2Q4jRia2VCUY2SKBPMMA 5dQmJVNQPRlmURMvY992/MdChJCqEQDDpbFEFX5YVt5A96yuc6vfQOE0wn+rwaAGu59SQt 2CkEmLY+0ueKECAHru9THYlzrX/2iQc= X-MC-Unique: 2JDcK0a9Pf2xs07AwAc4fg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/3] configure: Add the possibility to read options from meson_options.txt Date: Sun, 29 Aug 2021 19:32:08 +0200 Message-Id: <20210829173210.39562-2-thuth@redhat.com> In-Reply-To: <20210829173210.39562-1-thuth@redhat.com> References: <20210829173210.39562-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630258430153100002 Content-Type: text/plain; charset="utf-8" To avoid double maintenance between the configure script and meson_options.txt, add some simple logic in the configure script to read the options from meson_options.txt. Signed-off-by: Thomas Huth --- configure | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9a79a004d7..b3e6d51916 100755 --- a/configure +++ b/configure @@ -836,6 +836,8 @@ fi =20 werror=3D"" =20 +meson_options=3D"" + for opt do optarg=3D$(expr "x$opt" : 'x[^=3D]*=3D\(.*\)') case "$opt" in @@ -1581,6 +1583,26 @@ for opt do ;; --disable-slirp-smbd) slirp_smbd=3Dno ;; + --enable-*) + arg=3D$(echo "$opt" | sed -e "s/--enable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" + exit 1 + fi + meson_options=3D"$meson_options -D$arg=3Denabled" + ;; + --disable-*) + arg=3D$(echo "$opt" | sed -e "s/--disable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + echo "ERROR: unknown option $opt" + echo "Try '$0 --help' for more information" + exit 1 + fi + meson_options=3D"$meson_options -D$arg=3Ddisabled" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -5211,7 +5233,7 @@ if test "$skip_meson" =3D no; then -Dvhost_user_blk_server=3D$vhost_user_blk_server -Dmultiprocess=3D= $multiprocess \ -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek -Dguest_agent_msi=3D$gue= st_agent_msi -Dbpf=3D$bpf\ $(if test "$default_feature" =3D no; then echo "-Dauto_features=3D= disabled"; fi) \ - -Dtcg_interpreter=3D$tcg_interpreter \ + -Dtcg_interpreter=3D$tcg_interpreter $meson_options \ $cross_arg \ "$PWD" "$source_path" =20 --=20 2.27.0 From nobody Tue May 7 12:02:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630258535; cv=none; d=zohomail.com; s=zohoarc; b=bFzzlNcR1rLoSmg/eYg8lxHP0ONE6Ib4Ucec1Y6oH8BMqDEYeMxFNKnRtJK88DSeG7UKcdVj+NTAvjfZUAKCPNv/3zTmkiq6ERlhDfLtz3zJDY6cvxqYpdexStQDUtWqxIhg87d1aO0KqPuW9QvknO4D+k2lMnLHiFj9jPGv52I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630258535; h=Content-Type: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=G1Bsykwl2wYCVn3Ry5+muRkAzVb59Z/hgF89Hmp7AtU=; b=aTekxoRU37/jhDMhww78BewPlZL4jM8T/k0LFtaB+YX+sFS+Tw+aCxsfImuKtgm8bxp7KJ2X/QiRrQdVLNqirp2KzU5PWYj5N5fBm0Ak9UcFIwjv3hWM5HmDahgdKYbl7L0u9oz17D75Vqiy2OtOK6PEgPgSbeBeSMNDk2etdqQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1630258535051282.5293595671485; Sun, 29 Aug 2021 10:35:35 -0700 (PDT) Received: from localhost ([::1]:55982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKOiU-0001bD-2B for importer@patchew.org; Sun, 29 Aug 2021 13:35:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfY-0005hs-V2 for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfW-0007eJ-1J for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:32 -0400 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-106-fJVcjywtM0WJBDLY9ve8cA-1; Sun, 29 Aug 2021 13:32:27 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E087185302B for ; Sun, 29 Aug 2021 17:32:27 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC5F760939; Sun, 29 Aug 2021 17:32:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630258349; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G1Bsykwl2wYCVn3Ry5+muRkAzVb59Z/hgF89Hmp7AtU=; b=LnODBx4JoMfzIDYyaikqAB8ME+oXCC6ArZVNIsLQ7O2zw7imUSKGu/T5pABrvZKaoXmKnF lDte0nZtLBwxiEbfIk9Z+xICEPc3WmeDIC7g24ED0rCD7WjXYEMK5KXWDAyGwfl2DuMIJP 8y6OK/DKRZV5H6yS0Dheo1NurOrWjJQ= X-MC-Unique: fJVcjywtM0WJBDLY9ve8cA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/3] configure: Remove options that can be handled via meson_options.txt instead Date: Sun, 29 Aug 2021 19:32:09 +0200 Message-Id: <20210829173210.39562-3-thuth@redhat.com> In-Reply-To: <20210829173210.39562-1-thuth@redhat.com> References: <20210829173210.39562-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630258535867100002 Content-Type: text/plain; charset="utf-8" These trivial options can now be handled via the new generic code that parses meson_options.txt Signed-off-by: Thomas Huth Reviewed-by: Eric Blake --- configure | 316 +--------------------------------------------- meson_options.txt | 2 +- 2 files changed, 5 insertions(+), 313 deletions(-) diff --git a/configure b/configure index b3e6d51916..cb125c3f84 100755 --- a/configure +++ b/configure @@ -291,34 +291,14 @@ for opt do esac done =20 -brlapi=3D"auto" -curl=3D"auto" -iconv=3D"auto" -curses=3D"auto" -docs=3D"auto" fdt=3D"auto" netmap=3D"no" sdl=3D"auto" -sdl_image=3D"auto" coreaudio=3D"auto" -virtiofsd=3D"auto" -virtfs=3D"auto" -libudev=3D"auto" -mpath=3D"auto" -vnc=3D"auto" -sparse=3D"auto" vde=3D"$default_feature" -vnc_sasl=3D"auto" -vnc_jpeg=3D"auto" -vnc_png=3D"auto" -xkbcommon=3D"auto" xen=3D${default_feature:+disabled} xen_ctrl_version=3D"$default_feature" -xen_pci_passthrough=3D"auto" linux_aio=3D"$default_feature" -linux_io_uring=3D"auto" -cap_ng=3D"auto" -attr=3D"auto" xfs=3D"$default_feature" tcg=3D"enabled" membarrier=3D"$default_feature" @@ -328,15 +308,8 @@ vhost_crypto=3D"$default_feature" vhost_scsi=3D"$default_feature" vhost_vsock=3D"$default_feature" vhost_user=3D"no" -vhost_user_blk_server=3D"auto" vhost_user_fs=3D"$default_feature" vhost_vdpa=3D"$default_feature" -bpf=3D"auto" -kvm=3D"auto" -hax=3D"auto" -hvf=3D"auto" -whpx=3D"auto" -nvmm=3D"auto" rdma=3D"$default_feature" pvrdma=3D"$default_feature" gprof=3D"no" @@ -362,7 +335,6 @@ bsd=3D"no" linux=3D"no" solaris=3D"no" profiler=3D"no" -cocoa=3D"auto" softmmu=3D"yes" linux_user=3D"no" bsd_user=3D"no" @@ -374,45 +346,23 @@ trace_backends=3D"log" trace_file=3D"trace" spice=3D"$default_feature" spice_protocol=3D"auto" -rbd=3D"auto" -smartcard=3D"auto" -u2f=3D"auto" -libusb=3D"auto" -usb_redir=3D"auto" opengl=3D"$default_feature" cpuid_h=3D"no" avx2_opt=3D"$default_feature" capstone=3D"auto" -lzo=3D"auto" -snappy=3D"auto" -bzip2=3D"auto" -lzfse=3D"auto" -zstd=3D"auto" guest_agent=3D"$default_feature" guest_agent_with_vss=3D"no" guest_agent_ntddscsi=3D"no" -guest_agent_msi=3D"auto" vss_win32_sdk=3D"$default_feature" win_sdk=3D"no" want_tools=3D"$default_feature" -libiscsi=3D"auto" -libnfs=3D"auto" coroutine=3D"" coroutine_pool=3D"$default_feature" debug_stack_usage=3D"no" crypto_afalg=3D"no" cfi=3D"false" cfi_debug=3D"false" -seccomp=3D"auto" -glusterfs=3D"auto" -gtk=3D"auto" tls_priority=3D"NORMAL" -gnutls=3D"auto" -nettle=3D"auto" -gcrypt=3D"auto" -auth_pam=3D"auto" -vte=3D"auto" -virglrenderer=3D"auto" tpm=3D"$default_feature" libssh=3D"$default_feature" live_block_migration=3D${default_feature:-yes} @@ -428,25 +378,17 @@ vdi=3D${default_feature:-yes} vvfat=3D${default_feature:-yes} qed=3D${default_feature:-yes} parallels=3D${default_feature:-yes} -libxml2=3D"auto" debug_mutex=3D"no" -libpmem=3D"auto" default_devices=3D"true" plugins=3D"$default_feature" fuzzing=3D"no" rng_none=3D"no" secret_keyring=3D"$default_feature" -libdaxctl=3D"auto" meson=3D"" ninja=3D"" skip_meson=3Dno -gettext=3D"auto" -fuse=3D"auto" -fuse_lseek=3D"auto" -multiprocess=3D"auto" slirp_smbd=3D"$default_feature" =20 -malloc_trim=3D"auto" gio=3D"$default_feature" =20 # parse CC options second @@ -982,38 +924,10 @@ for opt do ;; --enable-sdl) sdl=3D"enabled" ;; - --disable-sdl-image) sdl_image=3D"disabled" - ;; - --enable-sdl-image) sdl_image=3D"enabled" - ;; --disable-qom-cast-debug) qom_cast_debug=3D"no" ;; --enable-qom-cast-debug) qom_cast_debug=3D"yes" ;; - --disable-virtfs) virtfs=3D"disabled" - ;; - --enable-virtfs) virtfs=3D"enabled" - ;; - --disable-libudev) libudev=3D"disabled" - ;; - --enable-libudev) libudev=3D"enabled" - ;; - --disable-virtiofsd) virtiofsd=3D"disabled" - ;; - --enable-virtiofsd) virtiofsd=3D"enabled" - ;; - --disable-mpath) mpath=3D"disabled" - ;; - --enable-mpath) mpath=3D"enabled" - ;; - --disable-vnc) vnc=3D"disabled" - ;; - --enable-vnc) vnc=3D"enabled" - ;; - --disable-gettext) gettext=3D"disabled" - ;; - --enable-gettext) gettext=3D"enabled" - ;; --oss-lib=3D*) oss_lib=3D"$optarg" ;; --audio-drv-list=3D*) audio_drv_list=3D"$optarg" @@ -1046,24 +960,8 @@ for opt do ;; --disable-tsan) tsan=3D"no" ;; - --enable-sparse) sparse=3D"enabled" - ;; - --disable-sparse) sparse=3D"disabled" - ;; --disable-strip) strip_opt=3D"no" ;; - --disable-vnc-sasl) vnc_sasl=3D"disabled" - ;; - --enable-vnc-sasl) vnc_sasl=3D"enabled" - ;; - --disable-vnc-jpeg) vnc_jpeg=3D"disabled" - ;; - --enable-vnc-jpeg) vnc_jpeg=3D"enabled" - ;; - --disable-vnc-png) vnc_png=3D"disabled" - ;; - --enable-vnc-png) vnc_png=3D"enabled" - ;; --disable-slirp) slirp=3D"disabled" ;; --enable-slirp) slirp=3D"enabled" @@ -1084,51 +982,15 @@ for opt do ;; --enable-xen) xen=3D"enabled" ;; - --disable-xen-pci-passthrough) xen_pci_passthrough=3D"disabled" - ;; - --enable-xen-pci-passthrough) xen_pci_passthrough=3D"enabled" - ;; - --disable-brlapi) brlapi=3D"disabled" - ;; - --enable-brlapi) brlapi=3D"enabled" - ;; - --disable-kvm) kvm=3D"disabled" - ;; - --enable-kvm) kvm=3D"enabled" - ;; - --disable-hax) hax=3D"disabled" - ;; - --enable-hax) hax=3D"enabled" - ;; - --disable-hvf) hvf=3D"disabled" - ;; - --enable-hvf) hvf=3D"enabled" - ;; - --disable-nvmm) nvmm=3D"disabled" - ;; - --enable-nvmm) nvmm=3D"enabled" - ;; - --disable-whpx) whpx=3D"disabled" - ;; - --enable-whpx) whpx=3D"enabled" - ;; --disable-tcg-interpreter) tcg_interpreter=3D"false" ;; --enable-tcg-interpreter) tcg_interpreter=3D"true" ;; - --disable-cap-ng) cap_ng=3D"disabled" - ;; - --enable-cap-ng) cap_ng=3D"enabled" - ;; --disable-tcg) tcg=3D"disabled" plugins=3D"no" ;; --enable-tcg) tcg=3D"enabled" ;; - --disable-malloc-trim) malloc_trim=3D"disabled" - ;; - --enable-malloc-trim) malloc_trim=3D"enabled" - ;; --disable-spice) spice=3D"no" ;; --enable-spice) @@ -1141,20 +1003,8 @@ for opt do ;; --enable-spice-protocol) spice_protocol=3D"yes" ;; - --disable-libiscsi) libiscsi=3D"disabled" - ;; - --enable-libiscsi) libiscsi=3D"enabled" - ;; - --disable-libnfs) libnfs=3D"disabled" - ;; - --enable-libnfs) libnfs=3D"enabled" - ;; --enable-profiler) profiler=3D"yes" ;; - --disable-cocoa) cocoa=3D"disabled" - ;; - --enable-cocoa) cocoa=3D"enabled" - ;; --disable-system) softmmu=3D"no" ;; --enable-system) softmmu=3D"yes" @@ -1202,18 +1052,6 @@ for opt do ;; --disable-cfi-debug) cfi_debug=3D"false" ;; - --disable-curses) curses=3D"disabled" - ;; - --enable-curses) curses=3D"enabled" - ;; - --disable-iconv) iconv=3D"disabled" - ;; - --enable-iconv) iconv=3D"enabled" - ;; - --disable-curl) curl=3D"disabled" - ;; - --enable-curl) curl=3D"enabled" - ;; --disable-fdt) fdt=3D"disabled" ;; --enable-fdt) fdt=3D"enabled" @@ -1226,22 +1064,10 @@ for opt do ;; --enable-linux-aio) linux_aio=3D"yes" ;; - --disable-linux-io-uring) linux_io_uring=3D"disabled" - ;; - --enable-linux-io-uring) linux_io_uring=3D"enabled" - ;; - --disable-attr) attr=3D"disabled" - ;; - --enable-attr) attr=3D"enabled" - ;; --disable-membarrier) membarrier=3D"no" ;; --enable-membarrier) membarrier=3D"yes" ;; - --disable-bpf) bpf=3D"disabled" - ;; - --enable-bpf) bpf=3D"enabled" - ;; --disable-blobs) blobs=3D"false" ;; --with-pkgversion=3D*) pkgversion=3D"$optarg" @@ -1258,10 +1084,6 @@ for opt do ;; --disable-crypto-afalg) crypto_afalg=3D"no" ;; - --disable-docs) docs=3D"disabled" - ;; - --enable-docs) docs=3D"enabled" - ;; --disable-vhost-net) vhost_net=3D"no" ;; --enable-vhost-net) vhost_net=3D"yes" @@ -1278,10 +1100,6 @@ for opt do ;; --enable-vhost-vsock) vhost_vsock=3D"yes" ;; - --disable-vhost-user-blk-server) vhost_user_blk_server=3D"disabled" - ;; - --enable-vhost-user-blk-server) vhost_user_blk_server=3D"enabled" - ;; --disable-vhost-user-fs) vhost_user_fs=3D"no" ;; --enable-vhost-user-fs) vhost_user_fs=3D"yes" @@ -1290,60 +1108,14 @@ for opt do ;; --enable-opengl) opengl=3D"yes" ;; - --disable-rbd) rbd=3D"disabled" - ;; - --enable-rbd) rbd=3D"enabled" - ;; --disable-xfsctl) xfs=3D"no" ;; --enable-xfsctl) xfs=3D"yes" ;; - --disable-smartcard) smartcard=3D"disabled" - ;; - --enable-smartcard) smartcard=3D"enabled" - ;; - --disable-u2f) u2f=3D"disabled" - ;; - --enable-u2f) u2f=3D"enabled" - ;; - --disable-libusb) libusb=3D"disabled" - ;; - --enable-libusb) libusb=3D"enabled" - ;; - --disable-usb-redir) usb_redir=3D"disabled" - ;; - --enable-usb-redir) usb_redir=3D"enabled" - ;; - --disable-zlib-test) - ;; - --disable-lzo) lzo=3D"disabled" - ;; - --enable-lzo) lzo=3D"enabled" - ;; - --disable-snappy) snappy=3D"disabled" - ;; - --enable-snappy) snappy=3D"enabled" - ;; - --disable-bzip2) bzip2=3D"disabled" - ;; - --enable-bzip2) bzip2=3D"enabled" - ;; - --enable-lzfse) lzfse=3D"enabled" - ;; - --disable-lzfse) lzfse=3D"disabled" - ;; - --disable-zstd) zstd=3D"disabled" - ;; - --enable-zstd) zstd=3D"enabled" - ;; --enable-guest-agent) guest_agent=3D"yes" ;; --disable-guest-agent) guest_agent=3D"no" ;; - --enable-guest-agent-msi) guest_agent_msi=3D"enabled" - ;; - --disable-guest-agent-msi) guest_agent_msi=3D"disabled" - ;; --with-vss-sdk) vss_win32_sdk=3D"" ;; --with-vss-sdk=3D*) vss_win32_sdk=3D"$optarg" @@ -1360,12 +1132,6 @@ for opt do ;; --disable-tools) want_tools=3D"no" ;; - --enable-seccomp) seccomp=3D"enabled" - ;; - --disable-seccomp) seccomp=3D"disabled" - ;; - --disable-glusterfs) glusterfs=3D"disabled" - ;; --disable-avx2) avx2_opt=3D"no" ;; --enable-avx2) avx2_opt=3D"yes" @@ -1374,9 +1140,6 @@ for opt do ;; --enable-avx512f) avx512f_opt=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 ;; @@ -1386,28 +1149,8 @@ for opt do --enable-uuid|--disable-uuid) echo "$0: $opt is obsolete, UUID support is always built" >&2 ;; - --disable-gtk) gtk=3D"disabled" - ;; - --enable-gtk) gtk=3D"enabled" - ;; --tls-priority=3D*) tls_priority=3D"$optarg" ;; - --disable-gnutls) gnutls=3D"disabled" - ;; - --enable-gnutls) gnutls=3D"enabled" - ;; - --disable-nettle) nettle=3D"disabled" - ;; - --enable-nettle) nettle=3D"enabled" - ;; - --disable-gcrypt) gcrypt=3D"disabled" - ;; - --enable-gcrypt) gcrypt=3D"enabled" - ;; - --disable-auth-pam) auth_pam=3D"disabled" - ;; - --enable-auth-pam) auth_pam=3D"enabled" - ;; --enable-rdma) rdma=3D"yes" ;; --disable-rdma) rdma=3D"no" @@ -1416,14 +1159,6 @@ for opt do ;; --disable-pvrdma) pvrdma=3D"no" ;; - --disable-vte) vte=3D"disabled" - ;; - --enable-vte) vte=3D"enabled" - ;; - --disable-virglrenderer) virglrenderer=3D"disabled" - ;; - --enable-virglrenderer) virglrenderer=3D"enabled" - ;; --disable-tpm) tpm=3D"no" ;; --enable-tpm) tpm=3D"yes" @@ -1440,10 +1175,6 @@ for opt do ;; --enable-numa) numa=3D"yes" ;; - --disable-libxml2) libxml2=3D"disabled" - ;; - --enable-libxml2) libxml2=3D"enabled" - ;; --disable-tcmalloc) tcmalloc=3D"no" ;; --enable-tcmalloc) tcmalloc=3D"yes" @@ -1525,14 +1256,6 @@ for opt do ;; --disable-debug-mutex) debug_mutex=3Dno ;; - --enable-libpmem) libpmem=3D"enabled" - ;; - --disable-libpmem) libpmem=3D"disabled" - ;; - --enable-xkbcommon) xkbcommon=3D"enabled" - ;; - --disable-xkbcommon) xkbcommon=3D"disabled" - ;; --enable-plugins) if test "$mingw32" =3D "yes"; then error_exit "TCG plugins not currently supported on= Windows platforms" else @@ -1559,22 +1282,6 @@ for opt do ;; --disable-keyring) secret_keyring=3D"no" ;; - --enable-libdaxctl) libdaxctl=3D"enabled" - ;; - --disable-libdaxctl) libdaxctl=3D"disabled" - ;; - --enable-fuse) fuse=3D"enabled" - ;; - --disable-fuse) fuse=3D"disabled" - ;; - --enable-fuse-lseek) fuse_lseek=3D"enabled" - ;; - --disable-fuse-lseek) fuse_lseek=3D"disabled" - ;; - --enable-multiprocess) multiprocess=3D"enabled" - ;; - --disable-multiprocess) multiprocess=3D"disabled" - ;; --enable-gio) gio=3Dyes ;; --disable-gio) gio=3Dno @@ -5213,25 +4920,10 @@ if test "$skip_meson" =3D no; then -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ ${staticpic:+-Db_staticpic=3D$staticpic} \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ - -Db_lto=3D$lto -Dcfi=3D$cfi -Dcfi_debug=3D$cfi_debug \ - -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim -Dsparse=3D$sparse= \ - -Dkvm=3D$kvm -Dhax=3D$hax -Dwhpx=3D$whpx -Dhvf=3D$hvf -Dnvmm=3D$nv= mm \ - -Dxen=3D$xen -Dxen_pci_passthrough=3D$xen_pci_passthrough -Dtcg=3D= $tcg \ - -Dcocoa=3D$cocoa -Dgtk=3D$gtk -Dmpath=3D$mpath -Dsdl=3D$sdl -Dsdl_= image=3D$sdl_image \ - -Dlibusb=3D$libusb -Dsmartcard=3D$smartcard -Dusb_redir=3D$usb_red= ir -Dvte=3D$vte \ - -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 -Dlibiscs= i=3D$libiscsi \ - -Dlibnfs=3D$libnfs -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev= =3D$libudev\ - -Drbd=3D$rbd -Dlzo=3D$lzo -Dsnappy=3D$snappy -Dlzfse=3D$lzfse -Dli= bxml2=3D$libxml2 \ - -Dlibdaxctl=3D$libdaxctl -Dlibpmem=3D$libpmem -Dlinux_io_uring=3D$= linux_io_uring \ - -Dgnutls=3D$gnutls -Dnettle=3D$nettle -Dgcrypt=3D$gcrypt -Dauth_pa= m=3D$auth_pam \ - -Dzstd=3D$zstd -Dseccomp=3D$seccomp -Dvirtfs=3D$virtfs -Dcap_ng=3D= $cap_ng \ - -Dattr=3D$attr -Ddefault_devices=3D$default_devices -Dvirglrendere= r=3D$virglrenderer \ - -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ - -Dvhost_user_blk_server=3D$vhost_user_blk_server -Dmultiprocess=3D= $multiprocess \ - -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek -Dguest_agent_msi=3D$gue= st_agent_msi -Dbpf=3D$bpf\ + -Db_lto=3D$lto -Dcfi=3D$cfi -Dcfi_debug=3D$cfi_debug -Dmalloc=3D$m= alloc \ + -Ddefault_devices=3D$default_devices -Dxen=3D$xen -Dtcg=3D$tcg -Ds= dl=3D$sdl \ + -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt \ + -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$blobs \ $(if test "$default_feature" =3D no; then echo "-Dauto_features=3D= disabled"; fi) \ -Dtcg_interpreter=3D$tcg_interpreter $meson_options \ $cross_arg \ diff --git a/meson_options.txt b/meson_options.txt index a9a9b8f4c6..2c89e79e8b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -120,7 +120,7 @@ option('usb_redir', type : 'feature', value : 'auto', description: 'libusbredir support') option('virglrenderer', type : 'feature', value : 'auto', description: 'virgl rendering support') -option('vnc', type : 'feature', value : 'enabled', +option('vnc', type : 'feature', value : 'auto', description: 'VNC server') option('vnc_jpeg', type : 'feature', value : 'auto', description: 'JPEG lossy compression for VNC server') --=20 2.27.0 From nobody Tue May 7 12:02:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1630258534; cv=none; d=zohomail.com; s=zohoarc; b=bLP/O7weuCQljMGuAn2zmYNfkdC6ilCagAPHgiP7IbzIi6yehqb6tDFNkL5fE1GvYXysEqBaJwwwqZHYApxG8Cp1xnFDYVArE5eySurqEPq7aTnhGbKD0N6kSJmroVgh5oJ0pecGPLau1N6kG+s8HUUXxlKuh43Ycb041APIH6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630258534; h=Content-Type: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=4GbFDsAkxaHCYVaiYXmHoSjhftRtlDugeSznPCPOSyg=; b=W8Gkdq0Er7rkvNh1lbyLN0h04osE0f+0sUhWYx4sa9ujA5/KGNh4IyRTinxg8yKeGVRZTqE8lhma+XxAJa5D6ghcqUG1rmLbppOVghStop2PNV9rKlD5MX3I32+j+B8PHSoVMD4dAGrVwjDxAQNzdbwoLd1pK0WUXvpkgZGsUMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163025853454396.11171459882814; Sun, 29 Aug 2021 10:35:34 -0700 (PDT) Received: from localhost ([::1]:55948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKOiT-0001Zq-JO for importer@patchew.org; Sun, 29 Aug 2021 13:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfZ-0005i3-NV for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKOfX-0007gh-EG for qemu-devel@nongnu.org; Sun, 29 Aug 2021 13:32:33 -0400 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-373-4-ScpaHDM2-lywfFicWNYg-1; Sun, 29 Aug 2021 13:32:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84F8D1008065 for ; Sun, 29 Aug 2021 17:32:28 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84AD760D31; Sun, 29 Aug 2021 17:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630258350; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4GbFDsAkxaHCYVaiYXmHoSjhftRtlDugeSznPCPOSyg=; b=fDbL1RWBvqNFCDpiAejhDC8gmgraL2+hMjMRb4adAAMtYyOZ6zlTqu3jaWafw/6xOgBcgN qNPobV70G6WTOn8mE3+9TKeO0Z+49C0qvoUwGfUJAGiYkwdoUCFhKcKoI9j9t129kGk7Na ibD1W4EFSFo8VpcGQYOKvGQEIfrZPa8= X-MC-Unique: 4-ScpaHDM2-lywfFicWNYg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 3/3] configure: Get help text from meson_options.txt Date: Sun, 29 Aug 2021 19:32:10 +0200 Message-Id: <20210829173210.39562-4-thuth@redhat.com> In-Reply-To: <20210829173210.39562-1-thuth@redhat.com> References: <20210829173210.39562-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630258535827100001 Content-Type: text/plain; charset="utf-8" It's cumbersome to maintain the option help texts twice, once in the "configure" script and once in meson_options.txt. So let's add some logic to the configure script to read most of the help texts from meson_options.txt. Signed-off-by: Thomas Huth --- configure | 89 ++++++++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 64 deletions(-) diff --git a/configure b/configure index cb125c3f84..8446b7b3ea 100755 --- a/configure +++ b/configure @@ -1549,7 +1549,6 @@ Advanced options (experts only): Default:trace- --disable-slirp disable SLIRP userspace network connectivity --enable-tcg-interpreter enable TCI (TCG with bytecode interpreter, expe= rimental and slow) - --enable-malloc-trim enable libc malloc_trim() for memory optimizati= on --oss-lib path to OSS library --cpu=3DCPU Build for host CPU [$cpu] --with-coroutine=3DBACKEND coroutine backend. Supported options: @@ -1576,16 +1575,13 @@ disabled with --disable-FEATURE, default is enabled= if available user supported user emulation targets linux-user all linux usermode emulation targets bsd-user all BSD usermode emulation targets - docs build documentation guest-agent build the QEMU Guest Agent - guest-agent-msi build guest agent Windows MSI installation package pie Position Independent Executables modules modules support (non-Windows) module-upgrades try to load modules from alternate paths for upgrades debug-tcg TCG debugging (default is disabled) debug-info debugging information lto Enable Link-Time Optimization. - sparse sparse checker safe-stack SafeStack Stack Smash Protection. Depends on clang/llvm >=3D 3.7 and requires coroutine backend ucont= ext. cfi Enable Control-Flow Integrity for indirect function call= s. @@ -1595,85 +1591,33 @@ disabled with --disable-FEATURE, default is enabled= if available cfi-debug In case of a cfi violation, a message containing the lin= e that triggered the error is written to stderr. After the erro= r, QEMU is still terminated with SIGILL - gnutls GNUTLS cryptography support - nettle nettle cryptography support - gcrypt libgcrypt cryptography support - auth-pam PAM access control - sdl SDL UI - sdl-image SDL Image support for icons - gtk gtk UI - vte vte support for the gtk UI - curses curses UI - iconv font glyph conversion support - vnc VNC UI support - vnc-sasl SASL encryption for VNC server - vnc-jpeg JPEG lossy compression for VNC server - vnc-png PNG compression for VNC server - cocoa Cocoa UI (Mac OS X only) - virtfs VirtFS - virtiofsd build virtiofs daemon (virtiofsd) - libudev Use libudev to enumerate host devices - mpath Multipath persistent reservation passthrough - xen xen backend driver support - xen-pci-passthrough PCI passthrough support for Xen - brlapi BrlAPI (Braile) - curl curl connectivity membarrier membarrier system call (for Linux 4.14+ or Windows) fdt fdt device tree - kvm KVM acceleration support - hax HAX acceleration support - hvf Hypervisor.framework acceleration support - nvmm NVMM acceleration support - whpx Windows Hypervisor Platform acceleration support rdma Enable RDMA-based migration pvrdma Enable PVRDMA support vde support for vde network netmap support for netmap network linux-aio Linux AIO support - linux-io-uring Linux io_uring support - cap-ng libcap-ng support - attr attr and xattr support vhost-net vhost-net kernel acceleration support vhost-vsock virtio sockets device support vhost-scsi vhost-scsi kernel target support vhost-crypto vhost-user-crypto backend support vhost-kernel vhost kernel backend support vhost-user vhost-user backend support - vhost-user-blk-server vhost-user-blk server support vhost-vdpa vhost-vdpa kernel backend support - bpf BPF kernel support spice spice spice-protocol spice-protocol - rbd rados block device (rbd) - libiscsi iscsi support - libnfs nfs support - smartcard smartcard support (libcacard) - u2f U2F support (u2f-emu) - libusb libusb (for usb passthrough) live-block-migration Block migration in the main migration stream - usb-redir usb network redirection support - lzo support of lzo compression library - snappy support of snappy compression library - bzip2 support of bzip2 compression library - (for reading bzip2-compressed dmg images) - lzfse support of lzfse compression library - (for reading lzfse-compressed dmg images) - zstd support for zstd compression library - (for migration compression and qcow2 cluster compression) - seccomp seccomp support coroutine-pool coroutine freelist (better performance) - glusterfs GlusterFS backend tpm TPM support libssh ssh block device support numa libnuma support - libxml2 for Parallels image format tcmalloc tcmalloc support jemalloc jemalloc support avx2 AVX2 optimization support avx512f AVX512F optimization support replication replication support opengl opengl support - virglrenderer virgl rendering support xfsctl xfsctl support qom-cast-debug cast debugging support tools build qemu-io, qemu-nbd and qemu-img tools @@ -1688,18 +1632,35 @@ disabled with --disable-FEATURE, default is enabled= if available crypto-afalg Linux AF_ALG crypto backend driver capstone capstone disassembler support debug-mutex mutex debugging support - libpmem libpmem support - xkbcommon xkbcommon support rng-none dummy RNG, avoid using /dev/(u)random and getrandom() - libdaxctl libdaxctl support - fuse FUSE block device export - fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports - multiprocess Out of process device emulation support gio libgio support slirp-smbd use smbd (at path --smbd=3D*) in slirp networking - -NOTE: The object files are built at the place where configure is launched EOF + +current_feature=3D"" +current_desc=3D"" +while read word1 word2 ; do + case "$word1" in + option*) + if echo "$word2" | grep -q "type[ ]*: 'feature'"; then + current_feature=3D$(echo $word1 | sed -e "s/option('//" -e "s/'= ,.*$//") + else + current_feature=3D"" + fi + ;; + description:) + if [ -n "$current_feature" ]; then + printf " %-15s %s\n" "$current_feature" \ + "$(echo "$word2" | sed -e "s/^'//" -e "s/'.*$//")" + current_feature=3D"" + fi + ;; + esac +done < $source_path/meson_options.txt | sort + +echo +echo "NOTE: The object files are built at the place where configure is lau= nched" + exit 0 fi =20 --=20 2.27.0