From nobody Mon Feb 9 23:40:48 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=1770119621; cv=none; d=zohomail.com; s=zohoarc; b=NsCzbUqtpCaN/XdNKY5Punkr2+H3rKWd8Bklz8q51LHuXA35OYxpMCrBjBGpfrXPbf6SgGwRFt2uDsX13YCmR/gZ5223EJVGtH4vOx4zDhecf/UrwdTSdv9jCVs9maJloU/lfhiXUKJPp53yyXVRX5yUrmpSvL//F3twU/lLv3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770119621; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ruv1Ejeh4EyN1qePTlvxJYVwjWJP4ANv3Gjqm9WaH/s=; b=m1gbfkWv2Mzxjogmd76kUvWKMA7AwMYuizivXaYfqYeMWYRosWS+Y18WPKuDe/SgSoOtjMdnyvZUS294LM1BsLFGrf4nQZeWhZJKzNMWfnsZ5BsOTH1LAjWmnHX8O72sW/CHFzj0OI9X46K7KXkJeMoS9/oYWubEeQNgb2qLpK4= 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 1770119621977789.2833038232291; Tue, 3 Feb 2026 03:53:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnEx2-0007vC-V2; Tue, 03 Feb 2026 06:52:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vnEwy-0007sq-No for qemu-devel@nongnu.org; Tue, 03 Feb 2026 06:52:10 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnEwv-00057k-Js for qemu-devel@nongnu.org; Tue, 03 Feb 2026 06:52:08 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-65808bb859cso8230495a12.2 for ; Tue, 03 Feb 2026 03:52:05 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8dbf2ecc73sm1039332166b.62.2026.02.03.03.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 03:52:03 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 26F4B5F844; Tue, 03 Feb 2026 11:52:02 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770119524; x=1770724324; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ruv1Ejeh4EyN1qePTlvxJYVwjWJP4ANv3Gjqm9WaH/s=; b=ZOWOVQG8O3R3Beyhbr0DfLC+y19xlLLLVcwPaq1axmuijbpfZkKCYBv9K5m6gJmkzQ pwYEiYDzyLML9UDfqoHSyOUDkpzTBnH9io+bClImN6JGdeVqY0RRtBFtvAa9zF2rnktS PWf+DxqNxB9GN1oMW5KBuNvIn0P0o5o1KsQD07r0STN2AG8IS7HFdOm/I72/QFiAiGbv 0HWCSQUxV6Amr+tf/WOwIUM/WC/ZCS335oCWaAlse+p9rKRh0/Qjq/yStsRjRhmM2AP5 7nR3OIKo1E+tkTKwrx13hvly32FUhNg9Zi6wrRfX3Yh8PEP5+Zs8Od82w1+fsme6Fmr6 DXOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770119524; x=1770724324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ruv1Ejeh4EyN1qePTlvxJYVwjWJP4ANv3Gjqm9WaH/s=; b=ROD4vH0v2otlVx3GlEcsCkopqp+xpTgmHFMho656fp0lq9fEiH3x/rloMh/uvZNJRn FmJbENOhYzdIc308LfSSxCSVNu0rtRr79fbnV5MMFmXALIZcHGGG9gtv7w8UZELM5nGE xqPd/2xQaKsAEugnMOJzEZojC75NRG2/5Yb4RI77OjO7ZC0lUkEirBFLGHcpyEcycLY0 8AwE4cNi4Am75rYTHbDIk0Gu2ftjr66V6KIYUz+fiC/Uya074zmoQCDaxq8rnALTc+kQ OCv2HGfvuGb0Q2aTaHz5PkAnhnT86Tnax7Me+FVDgKrpZvArtHWcLRJhOcsNxBZmpHSv 4djw== X-Gm-Message-State: AOJu0Yxq1ffeDtYWhRqOitokcb9bU+QqaohZ8FhM5+ZD6eh0oW5B4Akt 3nVjre7AYIu6pKf/ycegxqXAx1diRHNQ5U2T0SkZPP3YElKSattHuxnHurOv4mVy9IM= X-Gm-Gg: AZuq6aKsqKyPBq1smLWcgDduzvEuVaUW0Iv3PY1YdQecErkSMhGaCem/SbMN8+biIFz U3vtL1lrOy1tkXc2hXG8UEfmyZyjE1N1hE39/hEQPHCJPTYQydMwGEZAm39rRzxZQZCCXLowxZE pNTxyAePlP4qNKPOhSKjuf8mIaVntz2l0bQfWPq1v4UVxSVrZi2yGWm1FqQNgukNGmWKaTevG8X +bCeTnUwcM+GlXmK0r1L033x6gQCJ9UgICr+2ZKCm4cIMRzQxVh7vx33bh/ued/Iqoesrjz+aDF w5nVzZwFxk1/hFnKTn+JPbVO9kzqDvavmXgfy1AwH3XDKB4FECC3iW6diU55XB59wUKRT9fPyFE uDa/rfnEk3ckp6/+6eUXZlxatAtWU9ClZKwqYIs6vdiMedELMXcewXCY84z3yUW543tVD12VDYj 3GRzy1UzW/4SU= X-Received: by 2002:a17:907:3f17:b0:b8a:f3c0:c14 with SMTP id a640c23a62f3a-b8dff721f68mr889105166b.38.1770119523924; Tue, 03 Feb 2026 03:52:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , Pierrick Bouvier , qemu-arm@nongnu.org, Markus Armbruster , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson , Nicholas Piggin , Wainer dos Santos Moschetta , qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Cleber Rosa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Edgar E. Iglesias" , qemu-s390x@nongnu.org, Thomas Huth , Paolo Bonzini , Akihiko Odaki , Daniel Henrique Barboza , David Hildenbrand , Ilya Leoshkevich , Richard Henderson , Laurent Vivier , Gustavo Romero Subject: [PATCH 01/11] meson-buildoptions: Remove duplicated entry of --gdb in the help text Date: Tue, 3 Feb 2026 11:51:51 +0000 Message-ID: <20260203115201.2387721-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260203115201.2387721-1-alex.bennee@linaro.org> References: <20260203115201.2387721-1-alex.bennee@linaro.org> 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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.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: 1770119623770158500 Since --gdb has recently been added to meson_options.txt, the help text shows up twice in the output of "./configure --help": $ ./configure --help | grep gdb --gdb=3DGDB-path gdb to use for gdbstub tests [/usr/bin/gdb] --gdb=3DVALUE Path to GDB As the probed value is of interest we want to keep the configure text so make meson-buildoptions able to handle deferring to configure. Fixes: b46b3818cf8 ("tests/functional: Provide GDB to the functional tests") Signed-off-by: Alex Benn=C3=A9e Acked-by: Paolo Bonzini Reviewed-by: Gustavo Romero Reviewed-by: Thomas Huth Tested-by: Thomas Huth --- scripts/meson-buildoptions.py | 9 ++++++++- scripts/meson-buildoptions.sh | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index e636d258e8a..9e3a75c8b11 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -53,6 +53,11 @@ "werror", } =20 +# Options that configure prints help for, so we can skip +CONFIGURE_HELP =3D { + "gdb", +} + # Builtin options that should be definable via configure. Some of the oth= ers # we really do not want (e.g. c_args is defined via the native file, not # via -D, because it's a mix of CFLAGS and --extra-cflags); for specific @@ -189,7 +194,9 @@ 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 require_arg(opt): + if opt["name"] in CONFIGURE_HELP: + pass + elif require_arg(opt): metavar =3D cli_metavar(opt) left =3D f"--{key}=3D{metavar}" help_line(left, opt, 27, True) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3d0d1323446..e8edc5252a3 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' --enable-ubsan enable undefined behaviour san= itizer' printf "%s\n" ' --firmwarepath=3DVALUES search PATH for firmware fil= es [share/qemu-' printf "%s\n" ' firmware]' - printf "%s\n" ' --gdb=3DVALUE Path to GDB' printf "%s\n" ' --iasl=3DVALUE Path to ACPI disassembler' printf "%s\n" ' --includedir=3DVALUE Header file directory [inclu= de]' printf "%s\n" ' --interp-prefix=3DVALUE where to find shared librari= es etc., use %M for' --=20 2.47.3