From nobody Mon May 6 22:49:28 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=1630657061; cv=none; d=zohomail.com; s=zohoarc; b=Vb+TjW0GQ1ZjoMGG/WmLt06ZLaltxiYXCuFb1R1LOGiLvjlpOR7hSQipowj0pSs24CbUcrJQjLws2de9IE7hFZ4rNqxAEw+c9m/XUNL88WDf3XlvEqwBarRQSTwwlLlw4LdvfIGax6oWco9xeNL4Ul3wUY/7dIfy+Y5k6pL2vfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630657061; 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=gucglQp54SBiDE3lKFO8gNB3cPulnWiHPh6yAJ9iM8o=; b=FLvzgPht+rspk+6UVoS0Io3/vw8oPB+/wwGTgDuveZMfYkr+QoClL+zQbXDpZ7m1pp0aNwdMJNljfnYBzYcG9k6mZvu36FnxvfEc9nNbVUeaHMjco/y0uDupq2Evu6ETBSbsk7V3AWMGwhOrIg/Q/rnUPfLQ8LkkSTDLOgWArcM= 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 1630657061272799.340230866885; Fri, 3 Sep 2021 01:17:41 -0700 (PDT) Received: from localhost ([::1]:46604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM4OK-0007S7-8z for importer@patchew.org; Fri, 03 Sep 2021 04:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L4-0002eo-6h for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L0-0005Nl-FN for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:17 -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-501-5Q_vHVQlNlORrUIHt3t3RQ-1; Fri, 03 Sep 2021 04:14:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC5D6107ACCA for ; Fri, 3 Sep 2021 08:14:09 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id B79F25F706; Fri, 3 Sep 2021 08:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630656851; 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=gucglQp54SBiDE3lKFO8gNB3cPulnWiHPh6yAJ9iM8o=; b=EAlwQ/imHIm/cOYdE/ZXioPNf7B9Hu/TXGePZenmuAG2Q8ehUMekXuL5AQw3RPukU7BgdC /l/JNQMSavRh7ZAD9iEnFdoyNPrqJYnV5ODmGxqHk2/MmOz8++XJs+W6C7sC0+x13Uost+ cjxUCc+Lj06ntwYfDnoA3eJQDtXcXAs= X-MC-Unique: 5Q_vHVQlNlORrUIHt3t3RQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 1/5] configure: Add the possibility to read options from meson_options.txt Date: Fri, 3 Sep 2021 10:13:54 +0200 Message-Id: <20210903081358.956267-2-thuth@redhat.com> In-Reply-To: <20210903081358.956267-1-thuth@redhat.com> References: <20210903081358.956267-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.39, 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?= , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630657062155100003 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 Reviewed-by: Eric Blake --- configure | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9a79a004d7..528e9c80c5 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$(printf %s\\n "$opt" | sed -e "s/--enable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + printf "ERROR: unknown option %s\n" "$opt" + printf "Try '%s --help' for more information\n" "$0" + exit 1 + fi + meson_options=3D"$meson_options -D$arg=3Denabled" + ;; + --disable-*) + arg=3D$(printf %s\\n "$opt" | sed -e "s/--disable-//" -e "s/-/_/g") + if ! grep -q "option('$arg', type[ ]*: 'feature'" \ + $source_path/meson_options.txt; then + printf "ERROR: unknown option %s\n" "$opt" + printf "Try '%s --help' for more information\n" "$0" + 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 Mon May 6 22:49:28 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=1630657001; cv=none; d=zohomail.com; s=zohoarc; b=G229kzOI62vjuI3ySxocwh/dI0ziId0+WDO3XHn6QAhvGTiwyWuFyXQF9hi2Yzdd4ld/PHgGvs+NHTJhwT0YTzTHClQoWkP2ka0+iUxeaIbp5ooWhVgLA+HrXVpplOxrJ9S4bSfCv08PBtNulXceRZ/QfvI8E+t5RJdEhreqT1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630657001; 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=6zuyUECTcpu9eDWgnE7OkvWtYjYE93yjgmdf9k1li1U=; b=ZMe44v639lJ1pQyAOrq21QN8wkEdeAEqM2HIduN0ygVjI56IWtR2Fgt6HCo1m8HocemDb45fjDkIzSNJwqH5FzEG+uqY6H6ahZ26gajZXPpTO5fGC5xnEEwho28URZJ8UDir9zwQ37zYmu/PabjSaW7YKv0Q2u6mYy6+znpZ6RE= 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 16306570016541017.7957741592284; Fri, 3 Sep 2021 01:16:41 -0700 (PDT) Received: from localhost ([::1]:43580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM4NM-0005QE-GU for importer@patchew.org; Fri, 03 Sep 2021 04:16:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L3-0002eP-2d for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4Kz-0005Oz-Un for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:16 -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-220-Uv1cBEP4Oj6tM3CxMVvlvg-1; Fri, 03 Sep 2021 04:14:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74A151854E2C for ; Fri, 3 Sep 2021 08:14:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4759D5C3DF; Fri, 3 Sep 2021 08:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630656853; 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=6zuyUECTcpu9eDWgnE7OkvWtYjYE93yjgmdf9k1li1U=; b=KVhNKKnaoVu7umUcXs0OsxcvbZa8SNATFajDznlMJeWGKLgaAAI8iUn4/inrrzCrlR28j0 DhfLv85mwcOVR6eHIK674qFAgV/9nLwpu4iCYuJoj78mm8lcWwgSiCaaTrhhfOrL7KoPCI 2q+LIwQJqpz/WeVc9g2xKAE0InJ4AHw= X-MC-Unique: Uv1cBEP4Oj6tM3CxMVvlvg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 2/5] meson_options.txt: Switch the default value for the vnc option to 'auto' Date: Fri, 3 Sep 2021 10:13:55 +0200 Message-Id: <20210903081358.956267-3-thuth@redhat.com> In-Reply-To: <20210903081358.956267-1-thuth@redhat.com> References: <20210903081358.956267-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.39, 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?= , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630657002881100003 Content-Type: text/plain; charset="utf-8" There is no reason why VNC should always be enabled and not be set to the default value. We already switched the setting in the "configure" script in commit 3a6a1256d4 ("configure: Allow vnc to get disabled with --without-default-features"), so let's do that in meson_options.txt now, too. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Mon May 6 22:49:28 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=1630657012; cv=none; d=zohomail.com; s=zohoarc; b=NogBrssMRKGLbM/J6HO9HevzrAMJ/dp/hoZUHJRzaEOveZ748zf4TNzoUy0lbI66XCnxY69jBXfOxfBKCgc98itRZrL6TXG01waZEkZm6WChVKbUBPQDuHvW1+nhgS1MUROjw0fvrGmurJVTVUmt0Fu+dQW42sbUb5rVUldZOrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630657012; 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=Cq+hbrN2NP2761k4Y+cOxPG7/ciP96cRx0iDRyCWVGA=; b=Py9Fa2uT//lCvCgXQLZ/jCtZo/vBgekfhZqwr4DkAEUgtP8ID33J6UpdMrFeErgwHD3RuwbE5ah9E0nPM8ElpL8JYlaVnvTXZzx5L8sVn/5r87im0SGN2s530r0IVCU1/DEseGFN4S67forChFMA9YPlnAAufgvNr5pqrXZDWVo= 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 1630657012254239.9922538071561; Fri, 3 Sep 2021 01:16:52 -0700 (PDT) Received: from localhost ([::1]:43912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM4NX-0005eL-0X for importer@patchew.org; Fri, 03 Sep 2021 04:16:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L6-0002jk-Ne for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L2-0005Qa-Qs for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:20 -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-505-u2z9nAeUMOq5sr1HK1adzQ-1; Fri, 03 Sep 2021 04:14:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8724A1854E2E for ; Fri, 3 Sep 2021 08:14:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2C605F706; Fri, 3 Sep 2021 08:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630656855; 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=Cq+hbrN2NP2761k4Y+cOxPG7/ciP96cRx0iDRyCWVGA=; b=UHphjqMxZ6V9chMuHLyydUOATEGLbIP1LgZO879P8M3n8ObypQI5DCOLFy6EceTorDExzU EL/1DTsqbAVtv/S3y0Q1WGWomGDKpvivA1XidrLt56uytz2DZU1arWqYtQzkoU21yy9EFL 59fPU0GFq+w14ar0nNDYvJ2p7tf/jmI= X-MC-Unique: u2z9nAeUMOq5sr1HK1adzQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 3/5] configure: Remove options that can be handled via meson_options.txt instead Date: Fri, 3 Sep 2021 10:13:56 +0200 Message-Id: <20210903081358.956267-4-thuth@redhat.com> In-Reply-To: <20210903081358.956267-1-thuth@redhat.com> References: <20210903081358.956267-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.39, 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?= , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630657013946100003 Content-Type: text/plain; charset="utf-8" These trivial options can now be handled via the new generic code that parses meson_options.txt. Note: It's OK that we do not pass the "option=3Dauto" settings from the configure script to meson anymore since all related options use "auto" as default value in meson_options.txt already. Reviewed-by: Eric Blake Signed-off-by: Thomas Huth --- configure | 316 +----------------------------------------------------- 1 file changed, 4 insertions(+), 312 deletions(-) diff --git a/configure b/configure index 528e9c80c5..5a3c6ae2ba 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 \ --=20 2.27.0 From nobody Mon May 6 22:49:28 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=1630657146; cv=none; d=zohomail.com; s=zohoarc; b=IUIaAEHEgO0MT7YHnhtvI4eEsq/Ptqb1rM+/5ItS1kIv2b8aSEQB7ArgyDlyust5ZT8kRXgza5AHYPql7fH3k52WCV7NFRXUFmEAk59Dwe+BgMdAt/iRWcrEqR+wyA81we8jsQw1SFos5Jj/sl51bWr9Y+NCrCsNN1kJ0qnT07s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630657146; 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=yIsC2uzMGuS8SOATBGCWosoZF/UQGvCdYSMl43uOw9A=; b=A6K8HR+ov8Ig+R+tp0L/j2Qpq5pd+J5w7gRfoIEqL2j/zfdGOztPulJNJ+3KiCD18nNdj58wGEiHfEtgnIlyP9iWpf/AosqGDUq/DN6Whh1r3l5px+zq2+gadhad38cTvHhZd0e/G+VLZXKkKuzYHtuoJzS67DaTKcVxOqqPXx8= 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 1630657146499981.6683991787249; Fri, 3 Sep 2021 01:19:06 -0700 (PDT) Received: from localhost ([::1]:52224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM4Ph-0002mU-D9 for importer@patchew.org; Fri, 03 Sep 2021 04:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L5-0002ha-9X for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L3-0005Rc-EF for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:19 -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-340-McccNNDRM1WLBdGodDZgjg-1; Fri, 03 Sep 2021 04:14:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1EC82835DE1 for ; Fri, 3 Sep 2021 08:14:15 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id D61725FC23; Fri, 3 Sep 2021 08:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630656856; 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=yIsC2uzMGuS8SOATBGCWosoZF/UQGvCdYSMl43uOw9A=; b=IuY3brMszGzEGJblikvAABc+0xf3Ws0QM3mmhJNJdmhI1BHFTXJdd5gvGjm41bTNVzdyy3 9gVUL0mJm76bxfXurBBEG/9/8ArShZBu24rKc1aGXLUD2UmLM06ltmCyz6bn1hwRm2E+Ki Snn6gaHwGKtEttgpCDHjinq4ieU8iQY= X-MC-Unique: McccNNDRM1WLBdGodDZgjg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 4/5] configure: Get help text from meson_options.txt Date: Fri, 3 Sep 2021 10:13:57 +0200 Message-Id: <20210903081358.956267-5-thuth@redhat.com> In-Reply-To: <20210903081358.956267-1-thuth@redhat.com> References: <20210903081358.956267-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.39, 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?= , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630657148451100001 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 Reviewed-by: Eric Blake --- configure | 95 ++++++++++++++++++------------------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) diff --git a/configure b/configure index 5a3c6ae2ba..a92d11a491 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,41 @@ 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 + +# Read remaining options and help text from meson_options.txt: +current_feature=3D"" +while read first rest ; do + case "$first" in + option*) + case "$rest" in + *type*:*"'feature'"*) + current_feature=3D${first%\'*} + current_feature=3D${current_feature#*\'} + ;; + *) + current_feature=3D"" + ;; + esac + ;; + description:) + if [ -n "$current_feature" ]; then + rest=3D${rest%\'*} + printf " %-15s %s\n" "$current_feature" "${rest#\'}" + fi + ;; + *) + current_feature=3D"" + ;; + 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 From nobody Mon May 6 22:49:28 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=1630657144; cv=none; d=zohomail.com; s=zohoarc; b=G1nd/+GnsGxJIstdXcX9DTIsZ3bqRxoOrmPslHQBcliIgVnaP2GRytwmSkJ7quliJwkQ6wv1xFcyb7uO8f80D+KWEAh6tS1sTdwrddQila56P8+j6gpcsnFafrfDxw3iEX4J290XhVRndS9C76ygqq1qckq4Bcn8K0kSvDytLNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630657144; 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=nqRowOAlLvcI9I3S78s8bub4g44j538LaJI8aA7Lxng=; b=Wzv6rWUPSqH5DZ+naLmRNSVakXWmZv9GDT0yDQ8faeI8BGJNdrD1MnrL+OqiXzgj2cXdUWxDE7t+VwUqd/rBB+3wzx+JPsaOLrLsogqsQFazlaniClV46oJkrLc7dG2K8dFSZo/rIiFXcBhRAT3IOjNLDXDbK1llJ0bAd5MdXQg= 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 1630657144652889.010258647308; Fri, 3 Sep 2021 01:19:04 -0700 (PDT) Received: from localhost ([::1]:52028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM4Pf-0002ev-Ms for importer@patchew.org; Fri, 03 Sep 2021 04:19:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L8-0002lH-Sm for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34045) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM4L5-0005T4-3Z for qemu-devel@nongnu.org; Fri, 03 Sep 2021 04:14:22 -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-466-vHXVdZ8bO0-qT04SxZJbGQ-1; Fri, 03 Sep 2021 04:14:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD651835DE1 for ; Fri, 3 Sep 2021 08:14:16 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DDBD5C232; Fri, 3 Sep 2021 08:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630656858; 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=nqRowOAlLvcI9I3S78s8bub4g44j538LaJI8aA7Lxng=; b=aAY4izr06u73/6AmFmnTxV+leF6Z2MEERGsN1g53OiEp8IZ0K1yD/QJQfnecbuY5gT1STE pa6qzXryoFpt9/IA7eIX+1kUigOdqc873x1nOGUJ1sebEq7wyOIJPXqauiB1isv7WpY3nn Yc5RGm5XWkPEZjLnhEQZxJlCA5Ot8xk= X-MC-Unique: vHXVdZ8bO0-qT04SxZJbGQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 5/5] meson_options.txt: Document that "configure" reads this file, too Date: Fri, 3 Sep 2021 10:13:58 +0200 Message-Id: <20210903081358.956267-6-thuth@redhat.com> In-Reply-To: <20210903081358.956267-1-thuth@redhat.com> References: <20210903081358.956267-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.39, 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?= , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1630657146334100001 Content-Type: text/plain; charset="utf-8" Add a comment that meson_options.txt is also parsed by the configure script and that the options need a certain layout for this to succeed. Signed-off-by: Thomas Huth Reviewed-by: Eric Blake --- meson_options.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meson_options.txt b/meson_options.txt index 2c89e79e8b..86b3c03c7d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,9 @@ +# Note: This file is also parsed by "configure" to automatically handle the +# 'feature' options for its --enable-* and --disable-* parameters. To be a= ble +# to use this automation, make sure that the corresponding options() have = their +# "type: 'feature'" in the very first line, and their "description:" in th= eir +# second line. + option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('docdir', type : 'string', value : 'doc', --=20 2.27.0