From nobody Sat Sep 26 20:51:54 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789671239; cv=none; d=zohomail.com; s=zohoarc; b=EKCe+0OlNADy2ig9IN9WZeuht8djOs8+voRtKyGEDyAdcSVplctQ8z6kEC9anJg6Qgv67eKhbLmHMaqJ9/5dy2NC8VkqyEW+yDNpRciNjEB2/jeZ1W5/aHoQu7FNWE6GK61JoRYYxgxPpG6AtO5lBJbbrkcWfcUa90Oj7Cqxv34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789671239; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aVp9tA1RvLMP9FcJIPSR8LQzb3AJzr6I8aeJVALKBKo=; b=oH5lLYv6gViESx/E97pMHj+/rLT+k6h2iQE8dvVGT1XcgCRa5F/VFaOyn4Tjk4wmc7cfQoZchawQFk7JnIYHd2DJW5BL+tIP4QWrU3yf/SSeeRnY7x0I5MI7QkHqxrpDQSmBKs4JOg+1k1/CspVW424pu3eWEZ9KR6Q+jwf30UM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789671239870522.6328621417555; Thu, 17 Sep 2026 11:53:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7HEo-0007bL-2K; Thu, 17 Sep 2026 14:53:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7HEk-0007b7-UG for qemu-devel@nongnu.org; Thu, 17 Sep 2026 14:53:36 -0400 Received: from mail-wm2-x10.google.com ([2a00:1450:4864:31::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7HEi-0004rx-Rd for qemu-devel@nongnu.org; Thu, 17 Sep 2026 14:53:34 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccead2aecso6232435e9.0 for ; Thu, 17 Sep 2026 11:53:31 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd2160c2sm99781815e9.6.2026.09.17.11.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 11:53:29 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DDFA35F872; Thu, 17 Sep 2026 19:53:27 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789671210; x=1790276010; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=aVp9tA1RvLMP9FcJIPSR8LQzb3AJzr6I8aeJVALKBKo=; b=eParfU+4CPRROAMaBWt2/0it8d46BMZcsNQmGA7U2ekG+9EGKLolV9boFOB5bqfMEX mCmLBP/TBCZYgac6T92v0TFEn7AiC1p3NttivJgLHlocdnmMdjEx9ipayZrspsLZyL0Q jItWvtgF9sIYOlpxdNSoAqGxDjQNBuASbIPwB/WJR/kBf14PB2x8PKWzQr/SCqf9FC4h /9Y2ThMtDxEVMj0qob8RLi67goa0/4y5czOsKHUUWsU7l0etkYexFMKnFtvCP8nBJ2Kj JT+5WQS5Lkbki9vLHemTzNK2CoTmOvxkZvp15KyTuZ+E9C5WVVoyXwJ2IbWAPzq1fWjh XtwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789671210; x=1790276010; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=aVp9tA1RvLMP9FcJIPSR8LQzb3AJzr6I8aeJVALKBKo=; b=d4jkE+RTXnENmG1SaGthJP9BLl0/0AZ/uc4xAEV5a61lwsV7tu7mAuhuSW2egfbE0d udQJcraRml+W8OJHMeoleyGpk+m7ha5C8kXi3MkDGDmC4bH0Zb9bcpm7DPrBbTfEd52C MzCuu7jhR6RnT6zA2P6WRSt9wVvsf8xpQMkA0MExGy5c4th3u8noQpSNb7oWFMPGPEKg vTGhM9hItiGHvswpTq4YB8JMnQE0KbuQxpw2hqxrvc7N468ThdFv3FwPyQVdTICoYm+H ZNFYqXUjslAn4FMIuZZJmMrp8ccGK/l50DRz9mvCB5P37+5dQS7jgQuFrNoYMSDfBEku SlLQ== X-Gm-Message-State: AFuF++l9rq4isf6eGWm6OuFzbhBd77SANwlzGpU74cCGReKc1Rpfaf8U 8r//jtCGH1Mm53fYYUAbAJZQn0J93AJELZw9WH3Oob55sTcaStQ4GzFIV3y6bYVira8= X-Gm-Gg: AYBFou361zEs+ObEKgJkAnQ9/EcpyjEjyi8RoifEb26+uXtp1TUOQkba7Lg/m3/PTih MpRDhk3Omq5nhJX0gnDvaaQgD1HtpSoDAN4IdPSobVjwnZNe6AOei0kAPOseW8yMBRSg5oQYfor Got0uTcXU/5O9PcPWGj5p84mz3x94ZUsuLXIUXhY2gmRlOvaDGIj0ZksJ+qw6DXya8mtkUXM5aX NgI36qMl0781GCKvWKFKG0gul/KCVufMRjOF8GWo7CUYUWEYRCZYwzoHG50TDT6DaWpaH5XGnNi FExX6ms7htj5bWdoX1Mxtq7T9f+c/F0J01mw7em63w9IGvDCRgu0yz1sNGhkSty8ol0u6Yq3CaW fnNKMBTAab1eIJ/B1roEIkoc63hUt4DHDQRsf2IgHtzndKfswxRxiVSgcc48lf56N8TPmzeANZp tWnBJgMUMvX62rCPIl5Moov9P6Jquy1b9vd7f61c4IYgupN+3CBlSiumSLHR6qlh9IGeMEReY= X-Received: by 2002:a05:600d:8485:10b0:49f:bc43:9e96 with SMTP id 5b1f17b1804b1-49fbc43a0a0mr54675595e9.8.1789671209800; Thu, 17 Sep 2026 11:53:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: pierrick.bouvier@oss.qualcomm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , John Snow , Cleber Rosa Subject: [PATCH] scripts: update meson-buildoptions.sh Date: Thu, 17 Sep 2026 19:53:22 +0100 Message-ID: <20260917185322.3457036-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789671240453158500 This wasn't run because the automatic trigger is fickle. We don't want to expose all the tcg-test-cross-cc options to help as we already have processing via --cross-cc-ARCH so we tweak the CONFIGURE_HELP filter in the update script. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- For PR: - I'll stack this at the front of the PR I roll tomorrow. --- scripts/meson-buildoptions.py | 3 +- scripts/meson-buildoptions.sh | 54 +++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 9e3a75c8b11..a2bfff9c4bf 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -56,6 +56,7 @@ # Options that configure prints help for, so we can skip CONFIGURE_HELP =3D { "gdb", + "tcg_tests_cross", } =20 # Builtin options that should be definable via configure. Some of the oth= ers @@ -194,7 +195,7 @@ def print_help(options): key =3D cli_help_key(opt) # The first section includes options that have an arguments, # and booleans (i.e., only one of enable/disable makes sense) - if opt["name"] in CONFIGURE_HELP: + if any(opt["name"].startswith(h) for h in CONFIGURE_HELP): pass elif require_arg(opt): metavar =3D cli_metavar(opt) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ba3c9de216b..4ad8c1c5d35 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -10,7 +10,10 @@ meson_options_help() { printf "%s\n" ' --block-drv-rw-whitelist=3DVALUE' printf "%s\n" ' set block driver read-write wh= itelist (by default' printf "%s\n" ' affects only QEMU, not tools l= ike qemu-img)' + printf "%s\n" ' --container-command=3DVALUE' + printf "%s\n" ' command to build/run container= s' printf "%s\n" ' --datadir=3DVALUE Data file directory [share]' + printf "%s\n" ' --disable-containers use containers to cross compil= e tcg tests' printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better per= formance)' printf "%s\n" ' --disable-debug-info Enable debug symbols and other= information' printf "%s\n" ' --disable-hexagon-idef-parser' @@ -195,7 +198,7 @@ meson_options_help() { printf "%s\n" ' spice-protocol Spice protocol support' printf "%s\n" ' stack-protector compiler-provided stack protection' printf "%s\n" ' tcg TCG support' - printf "%s\n" ' tests build test suite' + printf "%s\n" ' tests Build the test suite' printf "%s\n" ' tools build support utilities that come with = QEMU' printf "%s\n" ' tpm TPM support' printf "%s\n" ' u2f U2F emulation support' @@ -282,6 +285,9 @@ _meson_option_parse() { --disable-cocoa) printf "%s" -Dcocoa=3Ddisabled ;; --enable-colo-proxy) printf "%s" -Dcolo_proxy=3Denabled ;; --disable-colo-proxy) printf "%s" -Dcolo_proxy=3Ddisabled ;; + --container-command=3D*) quote_sh "-Dcontainer_command=3D$2" ;; + --enable-containers) printf "%s" -Dcontainers=3Dtrue ;; + --disable-containers) printf "%s" -Dcontainers=3Dfalse ;; --enable-coreaudio) printf "%s" -Dcoreaudio=3Denabled ;; --disable-coreaudio) printf "%s" -Dcoreaudio=3Ddisabled ;; --with-coroutine=3D*) quote_sh "-Dcoroutine_backend=3D$2" ;; @@ -518,9 +524,53 @@ _meson_option_parse() { --disable-tcg) printf "%s" -Dtcg=3Ddisabled ;; --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dtrue ;; --disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dfalse ;; - --tls-priority=3D*) quote_sh "-Dtls_priority=3D$2" ;; + --tcg-tests-cross-cc-aarch64=3D*) quote_sh "-Dtcg_tests_cross_cc_aarch= 64=3D$2" ;; + --tcg-tests-cross-cc-aarch64-be=3D*) quote_sh "-Dtcg_tests_cross_cc_aa= rch64_be=3D$2" ;; + --tcg-tests-cross-cc-alpha=3D*) quote_sh "-Dtcg_tests_cross_cc_alpha= =3D$2" ;; + --tcg-tests-cross-cc-arm=3D*) quote_sh "-Dtcg_tests_cross_cc_arm=3D$2"= ;; + --tcg-tests-cross-cc-hexagon=3D*) quote_sh "-Dtcg_tests_cross_cc_hexag= on=3D$2" ;; + --tcg-tests-cross-cc-hppa=3D*) quote_sh "-Dtcg_tests_cross_cc_hppa=3D$= 2" ;; + --tcg-tests-cross-cc-i386=3D*) quote_sh "-Dtcg_tests_cross_cc_i386=3D$= 2" ;; + --tcg-tests-cross-cc-loongarch64=3D*) quote_sh "-Dtcg_tests_cross_cc_l= oongarch64=3D$2" ;; + --tcg-tests-cross-cc-m68k=3D*) quote_sh "-Dtcg_tests_cross_cc_m68k=3D$= 2" ;; + --tcg-tests-cross-cc-mips=3D*) quote_sh "-Dtcg_tests_cross_cc_mips=3D$= 2" ;; + --tcg-tests-cross-cc-mips64=3D*) quote_sh "-Dtcg_tests_cross_cc_mips64= =3D$2" ;; + --tcg-tests-cross-cc-mips64el=3D*) quote_sh "-Dtcg_tests_cross_cc_mips= 64el=3D$2" ;; + --tcg-tests-cross-cc-or1k=3D*) quote_sh "-Dtcg_tests_cross_cc_or1k=3D$= 2" ;; + --tcg-tests-cross-cc-ppc64=3D*) quote_sh "-Dtcg_tests_cross_cc_ppc64= =3D$2" ;; + --tcg-tests-cross-cc-ppc64le=3D*) quote_sh "-Dtcg_tests_cross_cc_ppc64= le=3D$2" ;; + --tcg-tests-cross-cc-riscv64=3D*) quote_sh "-Dtcg_tests_cross_cc_riscv= 64=3D$2" ;; + --tcg-tests-cross-cc-s390x=3D*) quote_sh "-Dtcg_tests_cross_cc_s390x= =3D$2" ;; + --tcg-tests-cross-cc-sh4=3D*) quote_sh "-Dtcg_tests_cross_cc_sh4=3D$2"= ;; + --tcg-tests-cross-cc-tricore=3D*) quote_sh "-Dtcg_tests_cross_cc_trico= re=3D$2" ;; + --tcg-tests-cross-cc-x86-64=3D*) quote_sh "-Dtcg_tests_cross_cc_x86_64= =3D$2" ;; + --tcg-tests-cross-cc-xtensa=3D*) quote_sh "-Dtcg_tests_cross_cc_xtensa= =3D$2" ;; + --tcg-tests-cross-cc-xtensaeb=3D*) quote_sh "-Dtcg_tests_cross_cc_xten= saeb=3D$2" ;; + --tcg-tests-cross-cflags-aarch64=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_aarch64=3D$2" ;; + --tcg-tests-cross-cflags-aarch64-be=3D*) quote_sh "-Dtcg_tests_cross_c= flags_aarch64_be=3D$2" ;; + --tcg-tests-cross-cflags-alpha=3D*) quote_sh "-Dtcg_tests_cross_cflags= _alpha=3D$2" ;; + --tcg-tests-cross-cflags-arm=3D*) quote_sh "-Dtcg_tests_cross_cflags_a= rm=3D$2" ;; + --tcg-tests-cross-cflags-hexagon=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_hexagon=3D$2" ;; + --tcg-tests-cross-cflags-hppa=3D*) quote_sh "-Dtcg_tests_cross_cflags_= hppa=3D$2" ;; + --tcg-tests-cross-cflags-i386=3D*) quote_sh "-Dtcg_tests_cross_cflags_= i386=3D$2" ;; + --tcg-tests-cross-cflags-loongarch64=3D*) quote_sh "-Dtcg_tests_cross_= cflags_loongarch64=3D$2" ;; + --tcg-tests-cross-cflags-m68k=3D*) quote_sh "-Dtcg_tests_cross_cflags_= m68k=3D$2" ;; + --tcg-tests-cross-cflags-mips=3D*) quote_sh "-Dtcg_tests_cross_cflags_= mips=3D$2" ;; + --tcg-tests-cross-cflags-mips64=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_mips64=3D$2" ;; + --tcg-tests-cross-cflags-mips64el=3D*) quote_sh "-Dtcg_tests_cross_cfl= ags_mips64el=3D$2" ;; + --tcg-tests-cross-cflags-or1k=3D*) quote_sh "-Dtcg_tests_cross_cflags_= or1k=3D$2" ;; + --tcg-tests-cross-cflags-ppc64=3D*) quote_sh "-Dtcg_tests_cross_cflags= _ppc64=3D$2" ;; + --tcg-tests-cross-cflags-ppc64le=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_ppc64le=3D$2" ;; + --tcg-tests-cross-cflags-riscv64=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_riscv64=3D$2" ;; + --tcg-tests-cross-cflags-s390x=3D*) quote_sh "-Dtcg_tests_cross_cflags= _s390x=3D$2" ;; + --tcg-tests-cross-cflags-sh4=3D*) quote_sh "-Dtcg_tests_cross_cflags_s= h4=3D$2" ;; + --tcg-tests-cross-cflags-tricore=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_tricore=3D$2" ;; + --tcg-tests-cross-cflags-x86-64=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_x86_64=3D$2" ;; + --tcg-tests-cross-cflags-xtensa=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_xtensa=3D$2" ;; + --tcg-tests-cross-cflags-xtensaeb=3D*) quote_sh "-Dtcg_tests_cross_cfl= ags_xtensaeb=3D$2" ;; --enable-tests) printf "%s" -Dtests=3Denabled ;; --disable-tests) printf "%s" -Dtests=3Ddisabled ;; + --tls-priority=3D*) quote_sh "-Dtls_priority=3D$2" ;; --enable-tools) printf "%s" -Dtools=3Denabled ;; --disable-tools) printf "%s" -Dtools=3Ddisabled ;; --enable-tpm) printf "%s" -Dtpm=3Denabled ;; --=20 2.47.3