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=1789741522; cv=none; d=zohomail.com; s=zohoarc; b=XX9E+ynJxaHXBTM/JLh+7VVDiNrILfZ5TC4FNkCXwTIM4d61oAF26xX/owD854qN8OJo/lM8xjSrKtBVOtw1cQdBjDZfro651x3OuVbAsjD4RduagxDivqUJH8i8hE3ElKtHOZqEJVsg5isXU1jsjt4fbvSIdT/tRYKnGzZUoCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741522; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=50aCxFdjvgOonBzfwDq4lxvq9N8Gbe3Y6UNEwMKBtjw=; b=DhLnnO7SsxJS0Kn7nrHumx1cFzmL4r4AuQliSngHLoMP4eJtdePpOeBkllDym6P5m8VrlmIO12MUjdDzub7tH8I+PzcULBq9Jpn0V8UsnzWfa0YJtNGYH4mMTZiHMHaT5lKd0bCT9TtjpnG4V10RGn+GSRyw2pkiD21JrHbtrgY= 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 1789741522601325.2065827564056; Fri, 18 Sep 2026 07:25:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZW4-0005lM-TZ; Fri, 18 Sep 2026 10:24:41 -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 1x7ZW2-0005kh-Fn for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:38 -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 1x7ZW0-0007p0-9s for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:38 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cd5462b69so4734485e9.1 for ; Fri, 18 Sep 2026 07:24:35 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc79bdc35sm59367035e9.0.2026.09.18.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:30 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B545D5F948; Fri, 18 Sep 2026 15:24:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741475; x=1790346275; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=50aCxFdjvgOonBzfwDq4lxvq9N8Gbe3Y6UNEwMKBtjw=; b=k7Y1GKLIREnj+KxWU2n4iL8HmkmMJ4Ax2qkibrGUJ+Fa6Z5EyeOMTxZGetO4g2paNH 8ca7ieHgLgKlm3vY2J0HaNiVxqES3RwNBImI14v3wJzjtKYYc/fHODzT6alOMJtFDAxh nsV+Jauwd00DHpWPw6eBtowT9Z8KZ5SvfLW91iRG2zSphrpL+JD1+xdETVIftPKLvCkZ 7ydhiphzDII4iff044us602w394Zql5gy40mBEqGdMy610Xg7OB5Oq0eTCoTrUHYxzRr eTz9TJFFWScX9uOt3SR32xrCEuZ76f5X5PXPDT5dZiLR86NnjPhPnX/i9Q+twUPQc2mt Kgvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741475; x=1790346275; h=content-transfer-encoding:content-type: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 :content-type; bh=50aCxFdjvgOonBzfwDq4lxvq9N8Gbe3Y6UNEwMKBtjw=; b=v2+npf/m83U2LB3UHU8s/TGfpajTNN5cqpsyDv+ZnCS4+y7X+y0iLTbS5DTokP6r1b tvUunkiYzYA/wTF+10wOROpM861jT24YNiSgewwqwB6RY7JVruab8ZlfIfzKHpSa3fkI RSayu24xTVnNgmulKv5Ji9tSlevdfkz4CTbdWqrEKaSd2QA9MHi0DoPinbX0tXGWOVTT gQAfufhpGl/Fne12dkTp8fwcC2s6tf1CU5vb6mrIUDwZWUl/vBRQIcA9yYW87XO60iQ3 fplaJ8xPcT78pq1zNC7F1RpkvjwP1KWKEO0sUKrmzxnlCmFdwphywIMe/qpLBxrJ1a9x 4HdA== X-Gm-Message-State: AFuF++m1e0dL06Ty7Urbn7PLFgwj0t8Ki1eXpAgV2hEB8Mznv9udKTGy L2p+6Vjd1qJViGcjTM1C/rldEpEjcUfUKMJwQtX1BINWPRpOR6Kgevr+AB20lX8qEtA= X-Gm-Gg: AYBFou3B8rBrNQAZwF/MVfSn/baIfzxDyza6eFQc7Z11pOxYL5EGbhtg9cqnHsiGAy3 j8xnfPpXScpH/rChSSFQPhOaFCLBmALmW793CFlsMjmHOqgrdHtJL2syYia9PvVvWvtavz/oCwq 5/5yFNdEuy8Oh/TGBZqSfz93MRELpUiHvQ3fux//Sa9np8ARuwR7fE1DiQoS2ULhtIxd821Z2Zm 6M2M12NDHBD1uih3NTsYeu+ECqBVKDTM1/xkgj15J2jfu7cPSpw0fGAEEed5LF8TUp6kaykI2L5 Uwv+IxRodjLfKHYk/uL2z2HPdLqb8uchisUYj00GYd7Wj0c4A31Seevr690JEHs2wWrFkJrtkP2 +L38Lg79P5RVKSgrwSL9WuimOeErtPDbgRNJiAh3o1yULNBwrbE5pZ7Hw07CAfGGa5TRWFLAfEs b5QCpuJMGrzC3SiqXQ+dhB47mpwgKU7L4sK6ro87tdpJC+y8PqXx9SVuD3LmhYFv0oRqH9fJ4p X-Received: by 2002:a05:600c:1986:b0:49b:9105:cdaf with SMTP id 5b1f17b1804b1-49fc56cb2f7mr63463755e9.8.1789741474629; Fri, 18 Sep 2026 07:24:34 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Paolo Bonzini , John Snow , Cleber Rosa Subject: [PULL 01/17] scripts: update meson-buildoptions.sh Date: Fri, 18 Sep 2026 15:24:12 +0100 Message-ID: <20260918142429.336497-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789741524354158500 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. Reviewed-by: Pierrick Bouvier Message-ID: <20260917185322.3457036-1-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e 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 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=1789741578; cv=none; d=zohomail.com; s=zohoarc; b=MCG5PSCWIknV7YHFVoF+u/ipqc92vBAP0pIWwmOjz3ssANL6lp3x0pFVdF/E5p9FOkfv3Veoy6H+rOYr2tPHlD4yjTzpbwi7QlUFVGOShXf5TN7ztfL8gIBhpcFb+axoweAMYb4Oh7N25hXm+3lSZDupeAJb/r2plPRTAoRsxKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741578; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AR0DyEx72qeZfYxJLtRNwW2bZaDCp1KhQKLIaJNg1i0=; b=XAWgcI2aXQ8A6UpdKKyGh07qGaqXu2tyu4zrKZa33RMTUZgEv9hVSJdc822vXBMJSCxT+w7/9pqr3Nw8lbwOpJfdRRbR95vx4sysxqBmmfsCYE+PlmNensqiPCZHlIngbBxQC+X0mDOjF4Agk6Ai3D6cH755zZkXmWmTs4PBKJk= 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 1789741578950946.6208623271596; Fri, 18 Sep 2026 07:26:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWN-0005nh-8D; Fri, 18 Sep 2026 10:25:01 -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 1x7ZW2-0005kk-L1 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:38 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZVy-0007on-WB for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:38 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f633ece3so619253f8f.3 for ; Fri, 18 Sep 2026 07:24:34 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4871ff56411sm4912967f8f.21.2026.09.18.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:30 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CCC085FA11; Fri, 18 Sep 2026 15:24:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741473; x=1790346273; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=AR0DyEx72qeZfYxJLtRNwW2bZaDCp1KhQKLIaJNg1i0=; b=NqeQ4fi30J4tIxQJSQkiE0/SEyCUk9KP3aREj/m1wzjv5K5CN6b2zTDH2jbjZ5WW5K 38bg2qIsubYHI/SY1/t0wkE4WGuBrk4cK5u9glPFSx9y/FQwDXdVk9KE3eJA1O8Uo22+ 1/LW/AbadVfNpTsjLFlzAumNmZtspYt98LZrBLZ+FpI07RrI+BiZFgDZ0VPrStjHFvH2 kq9Gk04MPNsE4DpF71LtETbGjZS+xZ9wP2tO8vHdr07CNzSaQmt+3+VskOjPhekXASc4 QflpJtINZhUvPzqBy7Qr0mq/W2VAZyI+uaYaVXxWGMNkN8lWFr0cGUMPDUb7qdbjsour nCCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741473; x=1790346273; h=content-transfer-encoding:content-type: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 :content-type; bh=AR0DyEx72qeZfYxJLtRNwW2bZaDCp1KhQKLIaJNg1i0=; b=CAkN0sy78nu382osmAAFAkmpNAJPejw1pEL1hyah2oHTSQpwKC5T8JKIq7QFtSUlxq Uv4kPN5JX/63U0mc/AfD9Vch2GzsnQfuYZEYiVwWzMCSkJq42EjEErb4AJ0kEmjkbdzy z//NEuDOWK+3JHaSL2IYHEK3wY3pjYXOZs2biTmmw3tSe0j0QZX5ryDnb9cXt2sg4wUo 8izEj2Juu/b41oePuSFU+HbUesEpo/NAaFb6wxjfncQXf0y/uVPHiYDk5hgnRHUcMBHY mb7jT41iKc/W+8atQyBUSOPrzhrpZkSmAY3ovtlX7GpN2hX5rWqPkb+qghkFb/XCVB5N bf1w== X-Gm-Message-State: AFuF++mjhUmlm87d2NbVgOPXjEGzyszKlzUNy+w4KW337r/FILyQIpCq 8pULHbuvMtwPUmWpVGrpLgyA33anzbE7IY2dPsAzJVwRdLVj6nWN+3kvksYK/8scIHI= X-Gm-Gg: AYBFou2AKWcGo21QviomJTaxRaSgAawEbJ44ek+5xAQlb99u+pZQeS6+mUADpXBltwV Eb/cK5vab5AcK87BBfXiVYUqQg2XLuXVt3aR+h1S+fEqI0UGunnQvtjddZHpd6HXu4/nIXCZ/rH iaFdp1KANdly7Se1LsHgyJe8G/kWkgKIFtsUrKBajlDfLTu3rf4kX/NRF/3YZ0Ddulv3kFRaC0N lFfHiRUUw5IfLTXl+nqjfn/qfED2H6tuLAJhFE54KWfhqBBJJ51Srbg6IXOc4lF0tthn1NFI1yK JUPbhovl0XDXGIBQiMvDt1OFPX1ZOXl7+/K3rggeSUPKg61LRaEhdw6h3NMSgZeXu4VScZCCqv/ ub4e6SqHdeYbW20lrPScSKj581270ZDo0Hwu1xjYLPe86B+4DaY7lCbu7Y4dszGWU6WDWSO152M pyxYVUg8aGkJJFohGwhuPiq2o3/zyJ6+c8bUsIWn6InYVizPSr/ALCwHIzz/VU33iKSa41X5xU2 V0CfaSYtQ== X-Received: by 2002:a05:6000:4904:b0:486:fed8:8710 with SMTP id ffacd0b85a97d-4871e367d9amr3938641f8f.38.1789741473091; Fri, 18 Sep 2026 07:24:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Pierrick Bouvier , Paolo Bonzini Subject: [PULL 02/17] Revert "configure: remove cross_cc and gdb detection logic" Date: Fri, 18 Sep 2026 15:24:13 +0100 Message-ID: <20260918142429.336497-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:30::10; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-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: 1789741580569158500 We want to restore the logic to configure as it's also used by the firmware builds. This reverts commit 031f935567ab8abfa4e84682ecea08915ca9656d. Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-2-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index aaa41fe47aa..1973f023b1e 100755 --- a/configure +++ b/configure @@ -1266,6 +1266,366 @@ EOF fi fi =20 +########################################## +# functions to probe cross compilers + +if test "$container_command" =3D ""; then + container_command=3D$($python "$source_path"/tests/docker/docker.py pr= obe) + test "$container_command" =3D "no" && container_command=3D"" +fi +if test $use_containers =3D "yes" && test "$container_command" !=3D ""; th= en + docker_py=3D"$python $source_path/tests/docker/docker.py --command $co= ntainer_command" +fi + +# cross compilers defaults, can be overridden with --cross-cc-ARCH +: ${cross_prefix_aarch64=3D"aarch64-linux-gnu-"} +: ${cross_prefix_aarch64_be=3D"$cross_prefix_aarch64"} +: ${cross_prefix_alpha=3D"alpha-linux-gnu-"} +: ${cross_prefix_arm=3D"arm-linux-gnueabihf-"} +: ${cross_prefix_armeb=3D"$cross_prefix_arm"} +: ${cross_prefix_hexagon=3D"hexagon-unknown-linux-musl-"} +: ${cross_prefix_loongarch64=3D"loongarch64-unknown-linux-gnu-"} +: ${cross_prefix_hppa=3D"hppa-linux-gnu-"} +: ${cross_prefix_i386=3D"i686-linux-gnu-"} +: ${cross_prefix_m68k=3D"m68k-linux-gnu-"} +: ${cross_prefix_microblaze=3D"microblaze-linux-musl-"} +: ${cross_prefix_mips64el=3D"mips64el-linux-gnuabi64-"} +: ${cross_prefix_mips64=3D"mips64-linux-gnuabi64-"} +: ${cross_prefix_mipsel=3D"mipsel-linux-gnu-"} +: ${cross_prefix_mips=3D"mips-linux-gnu-"} +: ${cross_prefix_ppc=3D"powerpc-linux-gnu-"} +: ${cross_prefix_ppc64=3D"powerpc64-linux-gnu-"} +: ${cross_prefix_ppc64le=3D"$cross_prefix_ppc64"} +: ${cross_prefix_riscv64=3D"riscv64-linux-gnu-"} +: ${cross_prefix_s390x=3D"s390x-linux-gnu-"} +: ${cross_prefix_sh4=3D"sh4-linux-gnu-"} +: ${cross_prefix_sparc64=3D"sparc64-linux-gnu-"} +: ${cross_prefix_sparc=3D"$cross_prefix_sparc64"} +: ${cross_prefix_tricore=3D"tricore-"} +: ${cross_prefix_x86_64=3D"x86_64-linux-gnu-"} + +: ${cross_cc_aarch64_be=3D"$cross_cc_aarch64"} +: ${cross_cc_cflags_aarch64_be=3D"-mbig-endian"} +: ${cross_cc_armeb=3D"$cross_cc_arm"} +: ${cross_cc_cflags_armeb=3D"-mbig-endian"} +: ${cross_cc_hexagon=3D"hexagon-unknown-linux-musl-clang"} +: ${cross_cc_cflags_hexagon=3D"-mv73 -O2 -static"} +: ${cross_cc_cflags_i386=3D"-m32"} +: ${cross_cc_cflags_ppc=3D"-m32 -mbig-endian"} +: ${cross_cc_cflags_ppc64=3D"-m64 -mbig-endian"} +: ${cross_cc_ppc64le=3D"$cross_cc_ppc64"} +: ${cross_cc_cflags_ppc64le=3D"-m64 -mlittle-endian"} +: ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} +: ${cross_cc_sparc=3D"$cross_cc_sparc64"} +: ${cross_cc_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} +: ${cross_cc_cflags_x86_64=3D"-m64 -mcx16"} + +compute_target_variable() { + eval "$2=3D" + if eval test -n "\"\${cross_prefix_$1}\""; then + if eval has "\"\${cross_prefix_$1}\$3\""; then + eval "$2=3D\"\${cross_prefix_$1}\$3\"" + fi + fi +} + +have_target() { + for i; do + case " $target_list " in + *" $i "*) return 0;; + *) ;; + esac + done + return 1 +} + +# probe_target_compiler TARGET +# +# Look for a compiler for the given target, either native or cross. +# Set variables target_* if a compiler is found, and container_cross_* +# if a Docker-based cross-compiler image is known for the target. +# Set got_cross_cc to yes/no depending on whether a non-container-based +# compiler was found. +# +# If TARGET is a user-mode emulation target, also set build_static to +# "y" if static linking is possible. +# +probe_target_compiler() { + # reset all output variables + got_cross_cc=3Dno + container_image=3D + container_hosts=3D + container_cross_prefix=3D + container_cross_cc=3D + container_cross_ar=3D + container_cross_as=3D + container_cross_ld=3D + container_cross_nm=3D + container_cross_objcopy=3D + container_cross_ranlib=3D + container_cross_strip=3D + + target_arch=3D${1%%-*} + case $target_arch in + aarch64) container_hosts=3D"x86_64 aarch64" ;; + aarch64_be) container_hosts=3D"x86_64 aarch64" ;; + alpha) container_hosts=3Dx86_64 ;; + arm) container_hosts=3D"x86_64 aarch64" ;; + hexagon) container_hosts=3Dx86_64 ;; + hppa) container_hosts=3Dx86_64 ;; + i386) container_hosts=3Dx86_64 ;; + loongarch64) container_hosts=3Dx86_64 ;; + m68k) container_hosts=3Dx86_64 ;; + microblaze) container_hosts=3Dx86_64 ;; + mips64el) container_hosts=3Dx86_64 ;; + mips64) container_hosts=3Dx86_64 ;; + mipsel) container_hosts=3Dx86_64 ;; + mips) container_hosts=3Dx86_64 ;; + ppc) container_hosts=3Dx86_64 ;; + ppc64|ppc64le) container_hosts=3Dx86_64 ;; + riscv64) container_hosts=3Dx86_64 ;; + s390x) container_hosts=3Dx86_64 ;; + sh4) container_hosts=3Dx86_64 ;; + sparc64) container_hosts=3Dx86_64 ;; + tricore) container_hosts=3Dx86_64 ;; + x86_64) container_hosts=3D"aarch64 ppc64le x86_64" ;; + xtensa*) container_hosts=3Dx86_64 ;; + esac + + for host in $container_hosts; do + test "$container_command" !=3D "" || continue + test "$host" =3D "$cpu" || continue + case $target_arch in + # debian-all-test-cross architectures + + aarch64_be) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Daarch64-linux-gnu- + ;; + alpha|hppa|m68k|mips|mipsel|riscv64|sh4|sparc64) + container_image=3Ddebian-all-test-cross + ;; + mips64) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Dmips64-linux-gnuabi64- + ;; + ppc|ppc64|ppc64le) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- + ;; + + # architectures with individual containers + + aarch64) + # We don't have any bigendian build tools so we only use this for = AArch64 + container_image=3Ddebian-arm64-cross + ;; + arm) + # We don't have any bigendian build tools so we only use this for = ARM + container_image=3Ddebian-armhf-cross + container_cross_prefix=3Darm-linux-gnueabihf- + ;; + hexagon) + container_cross_prefix=3Dhexagon-unknown-linux-musl- + container_cross_cc=3D${container_cross_prefix}clang + ;; + i386) + container_image=3Ddebian-i686-cross + container_cross_prefix=3Di686-linux-gnu- + ;; + loongarch64) + container_image=3Ddebian-loongarch-cross + container_cross_prefix=3Dloongarch64-unknown-linux-gnu- + ;; + microblaze) + container_cross_prefix=3Dmicroblaze-linux-musl- + ;; + mips64el) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Dmips64el-linux-gnuabi64- + ;; + tricore) + container_image=3Ddebian-tricore-cross + container_cross_prefix=3Dtricore- + ;; + x86_64) + container_image=3Ddebian-amd64-cross + ;; + xtensa*) + container_image=3Ddebian-xtensa-cross + + # default to the dc232b cpu + container_cross_prefix=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa= -dc232b-elf- + ;; + esac + # Debian and GNU architecture names usually match + : ${container_image:=3Ddebian-$target_arch-cross} + : ${container_cross_prefix:=3D$target_arch-linux-gnu-} + : ${container_cross_cc:=3D${container_cross_prefix}gcc} + : ${container_cross_ar:=3D${container_cross_prefix}ar} + : ${container_cross_as:=3D${container_cross_prefix}as} + : ${container_cross_ld:=3D${container_cross_prefix}ld} + : ${container_cross_nm:=3D${container_cross_prefix}nm} + : ${container_cross_objcopy:=3D${container_cross_prefix}objcopy} + : ${container_cross_ranlib:=3D${container_cross_prefix}ranlib} + : ${container_cross_strip:=3D${container_cross_prefix}strip} + done + + try=3Dcross + # For softmmu/roms also look for a bi-endian or multilib-enabled host co= mpiler + if [ "${1%softmmu}" !=3D "$1" ] || test "$target_arch" =3D "$cpu"; then + case "$target_arch:$cpu" in + aarch64_be:aarch64 | \ + armeb:arm | \ + i386:x86_64 | \ + ppc*:ppc64 | \ + sparc:sparc64 | \ + "$cpu:$cpu") + try=3D'native cross' ;; + esac + fi + eval "target_cflags=3D\${cross_cc_cflags_$target_arch}" + for thistry in $try; do + case $thistry in + native) + target_cc=3D$cc + target_ccas=3D$ccas + target_ar=3D$ar + target_as=3D$as + target_ld=3D$ld + target_nm=3D$nm + target_objcopy=3D$objcopy + target_ranlib=3D$ranlib + target_strip=3D$strip + ;; + cross) + target_cc=3D + if eval test -n "\"\${cross_cc_$target_arch}\""; then + if eval has "\"\${cross_cc_$target_arch}\""; then + eval "target_cc=3D\"\${cross_cc_$target_arch}\"" + fi + else + compute_target_variable $target_arch target_cc gcc + fi + target_ccas=3D$target_cc + compute_target_variable $target_arch target_ar ar + compute_target_variable $target_arch target_as as + compute_target_variable $target_arch target_ld ld + compute_target_variable $target_arch target_nm nm + compute_target_variable $target_arch target_objcopy objcopy + compute_target_variable $target_arch target_ranlib ranlib + compute_target_variable $target_arch target_strip strip + ;; + esac + + if test -n "$target_cc"; then + case $target_arch in + i386|x86_64) + if $target_cc --version | grep -qi "clang"; then + continue + fi + ;; + esac + elif test -n "$target_as" && test -n "$target_ld"; then + # Special handling for assembler only targets + case $target in + tricore-softmmu) + build_static=3D + got_cross_cc=3Dyes + break + ;; + *) + continue + ;; + esac + else + continue + fi + + write_c_skeleton + case $1 in + *-softmmu) + if do_compiler "$target_cc" $target_cflags -o $TMPO -c $TMPC && + do_compiler "$target_cc" $target_cflags -r -nostdlib -o "${TMPDI= R1}/${TMPB}2.o" "$TMPO" -lgcc; then + got_cross_cc=3Dyes + break + fi + ;; + *) + if do_compiler "$target_cc" $target_cflags -o $TMPE $TMPC -static = ; then + build_static=3Dy + got_cross_cc=3Dyes + break + fi + if do_compiler "$target_cc" $target_cflags -o $TMPE $TMPC ; then + build_static=3D + got_cross_cc=3Dyes + break + fi + ;; + esac + done + if test $got_cross_cc !=3D yes; then + build_static=3D + target_cc=3D + target_ccas=3D + target_ar=3D + target_as=3D + target_ld=3D + target_nm=3D + target_objcopy=3D + target_ranlib=3D + target_strip=3D + fi + test -n "$target_cc" +} + +write_target_makefile() { + echo "PYTHON=3D$python" + echo "EXTRA_CFLAGS=3D$target_cflags" + if test -z "$target_cc" && test -z "$target_as"; then + test -z "$container_image" && error_exit "Internal error: could not fi= nd cross compiler for $1?" + echo "$1: docker-image-$container_image" >> Makefile.prereqs + if test -n "$container_cross_cc"; then + echo "CC=3D$docker_py cc --cc $container_cross_cc -i qemu/$container= _image -s $source_path --" + echo "CCAS=3D$docker_py cc --cc $container_cross_cc -i qemu/$contain= er_image -s $source_path --" + fi + echo "AR=3D$docker_py cc --cc $container_cross_ar -i qemu/$container_i= mage -s $source_path --" + echo "AS=3D$docker_py cc --cc $container_cross_as -i qemu/$container_i= mage -s $source_path --" + echo "LD=3D$docker_py cc --cc $container_cross_ld -i qemu/$container_i= mage -s $source_path --" + echo "NM=3D$docker_py cc --cc $container_cross_nm -i qemu/$container_i= mage -s $source_path --" + echo "OBJCOPY=3D$docker_py cc --cc $container_cross_objcopy -i qemu/$c= ontainer_image -s $source_path --" + echo "RANLIB=3D$docker_py cc --cc $container_cross_ranlib -i qemu/$con= tainer_image -s $source_path --" + echo "STRIP=3D$docker_py cc --cc $container_cross_strip -i qemu/$conta= iner_image -s $source_path --" + else + if test -n "$target_cc"; then + echo "CC=3D$target_cc" + echo "CCAS=3D$target_ccas" + fi + if test -n "$target_ar"; then + echo "AR=3D$target_ar" + fi + if test -n "$target_as"; then + echo "AS=3D$target_as" + fi + if test -n "$target_ld"; then + echo "LD=3D$target_ld" + fi + if test -n "$target_nm"; then + echo "NM=3D$target_nm" + fi + if test -n "$target_objcopy"; then + echo "OBJCOPY=3D$target_objcopy" + fi + if test -n "$target_ranlib"; then + echo "RANLIB=3D$target_ranlib" + fi + if test -n "$target_strip"; then + echo "STRIP=3D$target_strip" + fi + fi +} + ####################################### # cross-compiled firmware targets =20 @@ -1299,6 +1659,48 @@ fi =20 echo "# Automatically generated by configure - do not modify" > Makefile.p= rereqs =20 +# Mac OS X ships with a broken assembler +if have_target i386-softmmu x86_64-softmmu && \ + test "$host_os" !=3D "darwin" && test "$host_os" !=3D "sunos" && \ + test "$host_os" !=3D "haiku" && \ + probe_target_compiler i386-softmmu; then + subdirs=3D"$subdirs pc-bios/optionrom" + config_mak=3Dpc-bios/optionrom/config.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "TOPSRC_DIR=3D$source_path" >> $config_mak + write_target_makefile >> $config_mak +fi + +if have_target ppc-softmmu ppc64-softmmu && \ + probe_target_compiler ppc-softmmu; then + subdirs=3D"$subdirs pc-bios/vof" + config_mak=3Dpc-bios/vof/config.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "SRC_DIR=3D$source_path/pc-bios/vof" >> $config_mak + write_target_makefile >> $config_mak +fi + +# Only build s390-ccw bios if the compiler has -march=3Dz900 or -march=3Dz= 10 +# (which is the lowest architecture level that Clang supports) +if have_target s390x-softmmu && probe_target_compiler s390x-softmmu && \ + GIT=3Dgit "$source_path/scripts/git-submodule.sh" "$git_submodules_act= ion" roms/SLOF >> config.log 2>&1; then + write_c_skeleton + do_compiler "$target_cc" $target_cc_cflags -march=3Dz900 -o $TMPO -c $TM= PC + has_z900=3D$? + if [ $has_z900 =3D 0 ] || do_compiler "$target_cc" $target_cc_cflags -ma= rch=3Dz10 -msoft-float -Werror -o $TMPO -c $TMPC; then + if [ $has_z900 !=3D 0 ]; then + echo "WARNING: Your compiler does not support the z900!" + echo " The s390-ccw bios will only work with guest CPUs >=3D= z10." + fi + subdirs=3D"$subdirs pc-bios/s390-ccw" + config_mak=3Dpc-bios/s390-ccw/config-host.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "SRC_PATH=3D$source_path/pc-bios/s390-ccw" >> $config_mak + echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action" >> $config_mak + write_target_makefile >> $config_mak + fi +fi + ####################################### # generate config-host.mak =20 @@ -1322,6 +1724,65 @@ if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi =20 +tcg_tests_with_compilers=3D +for target in $target_list; do + arch=3D${target%%-*} + + case $target in + xtensa*-linux-user) + # the toolchain is not complete with headers, only build system tests + continue + ;; + *-softmmu) + test -f "$source_path/tests/tcg/$arch/Makefile.softmmu-target" || co= ntinue + qemu=3D"qemu-system-$arch" + ;; + *-linux-user|*-bsd-user) + qemu=3D"qemu-$arch" + ;; + esac + + if probe_target_compiler $target || test -n "$container_image"; then + test -n "$container_image" && build_static=3Dy + mkdir -p "tests/tcg/$target" + config_target_mak=3Dtests/tcg/$target/config-target.mak + ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/M= akefile" + echo "# Automatically generated by configure - do not modify" > "$co= nfig_target_mak" + echo "TARGET_NAME=3D$arch" >> "$config_target_mak" + echo "TARGET=3D$target" >> "$config_target_mak" + write_target_makefile "build-tcg-tests-$target" >> "$config_target_m= ak" + echo "BUILD_STATIC=3D$build_static" >> "$config_target_mak" + echo "QEMU=3D$PWD/$qemu" >> "$config_target_mak" + + # will GDB work with these binaries? + if test "${gdb_arches#*$arch}" !=3D "$gdb_arches"; then + echo "GDB=3D$gdb_bin" >> $config_target_mak + fi + + if test "${gdb_arches#*$arch}" !=3D "$gdb_arches" && version_ge $gdb= _version 14.1; then + echo "GDB_HAS_SME_TILES=3Dy" >> $config_target_mak + else + echo "GDB_HAS_SME_TILES=3Dn" >> $config_target_mak + fi + + if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 15.1; then + echo "GDB_HAS_MTE=3Dy" >> $config_target_mak + fi + + if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 16.0; then + # GDB has to support MTE in baremetal to allow debugging MTE in = QEMU system mode + echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=3Dy" >> $config_target_mak + fi + + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs + tcg_tests_with_compilers=3D"$tcg_tests_with_compilers $target" + fi +done + +if test "$tcg" =3D "enabled"; then + echo "TCG_TESTS_WITH_COMPILERS=3D$tcg_tests_with_compilers" >> $config= _host_mak +fi + if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { --=20 2.47.3 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=1789741535; cv=none; d=zohomail.com; s=zohoarc; b=b/IdLP5BbZn0hkLDTR0o7rX6dywingizOKYJw/0nTB/2f/W/gLOgm8BE0FB2PtdABYcUCFgbo7xo326iI5jPCO81YMgjlgZfOVilPCYAPrR93pjI0TD3aIkAvo9LMHkvAFQUOHqPQYPRYDar26gxvcEldpKyEkHAj9eXrUk/Dk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741535; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h93Ez9eMZuLiqa78/3gdqAuJAwQM1qafcTQGw9IZ92Q=; b=e8Pztg3ORHxlGkrM4xKjKQtfkMK8dunQGBkMWe6seYdKE5GkUy5CDM+EvFdj60/Pjlo/FHxWCaxHeK6x5Y3PR75/YKlwOOUqCrryrlGC7S9F205kiyX/sJkxxUnqqRwVcamifijaxGqg/4djUDESvvAKNSBpXWQmGi646wjWyf4= 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 1789741535320749.5808373938839; Fri, 18 Sep 2026 07:25:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWb-00065B-11; Fri, 18 Sep 2026 10:25:13 -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 1x7ZW3-0005l8-Cq for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:39 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZW1-0007pC-Ib for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:39 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f6356256so313081f8f.1 for ; Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-487203f077fsm4131949f8f.26.2026.09.18.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:30 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E4FB05FA18; Fri, 18 Sep 2026 15:24:29 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741476; x=1790346276; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=h93Ez9eMZuLiqa78/3gdqAuJAwQM1qafcTQGw9IZ92Q=; b=ocLW1Ox0jyhMyfhwyD4UAS3MRc+WMY5Tzv3ouuIVURwaklMgl09EKmduqw06n2ND7L /XCzOLIdQv87GkJMcGr96NuDT+nXIt7v6AeyLaYxjGUYWwXo29UElIsCDTaYGSER44/N 5fQn6S9A4dWh/3p8beJ9O1TloNJe2hbjnHAPu8f8ee6saa0piuigWrF2qyQoyie53oyd xLQj3lJhAFKgp8qymNx6DYBMiYl0J4Tip3dVlu4iGt3ak69kKRVpyrBBghcwU0U8BPrP RPEmdatSqa1+mIo+WwyRD1YDWuw9L7eBGcboOrBOCkmnwPTo218PDgp9m3qloDe5q+dh qvzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741476; x=1790346276; h=content-transfer-encoding:content-type: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 :content-type; bh=h93Ez9eMZuLiqa78/3gdqAuJAwQM1qafcTQGw9IZ92Q=; b=djPDQOgSjX9tG9L2XwVPrvvix1RlS5fxvBoBVrgq+Itxf8gJr4K82xzv89bbob/L9T L0t0lx1v2F5a2KijSkBOmkREDH9QUB41iOm0+uLwYhBl9n0Osici4Gbq/5tQkb2yx8hY zjas8t6lsFW7UvJDbVHJ3cChY4+TvLble7b1u4uX0t58bJF/fYfuxRMEGD8ofSIGtwWD Zx4vpCM9LtfoHNbuLmCeYrIUHvwjchyz+d6AoGm5k5y0hw17F+W/ztqYQtgFMfW0gQQ6 dAHjc/OKxqt562oYKBObr2DIxfOf+EF6ehs9QYIBLXVPAvQ14/lzpM2SUGrAe9AiTrKl zA/A== X-Gm-Message-State: AFuF++koNLmFepfAicOswBlcDV4V7noXzme0L8EKSIU+wYcvI7CUogEe 8CXQ/+b8fxxgKlwpYnwyUTmOJ8rvcMxdJRCtwCwPGsjqQyUEWDIH8Tye0AfaNYLlDME= X-Gm-Gg: AYBFou3Le2OjwiXsS3EMa6yTCbX5nYVI88a7jxPx2cq3OGn656v84O3ADQlDtEuwx2i 1HWPBIt9d9zk4Qy6AzeQTexu36giHVtN4iT79NOJdjiD6PbbGXTzSfbCEuDcxbLfuflCxgP9Rvr UyEKVq9mUHsiN3WwnofXEe4eh1ZIeuReH0u27yGJNSQbCOL/+qQm5etZuEkt3hHiViziNCWT5y7 F/Rpu36hguMaxw61AyXZeshtL6sbwIZ9DE2kw5Uzi1FTBmaNNFBTSGOKlNv3ndU7jCD1b+U5ALa atfGITEjN/G0gw5Up8vz9srOeCxqZJKSU8WQCgfnx6ZBGTXYIPzc83fN0kXB5dBb6SoXeacahWk XT0MkcwKVbS0FVHsCaNRU0BEdx/zQg3LGJJik1Ik8wcUe4aoKWMd68TBbLuQjeQB5K+ZOhtfEC1 1sc6UUQHkpRVG9S8rggrSQRwFsg3LLiWPZEH5C+HOJ2IVvQwaD7ECRhd63PCi6bgTMRMmtetY= X-Received: by 2002:a05:6000:40c9:b0:487:a87:24c9 with SMTP id ffacd0b85a97d-4871d98cc80mr4729666f8f.3.1789741476147; Fri, 18 Sep 2026 07:24:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Eric Farman , Pierrick Bouvier , Paolo Bonzini , Jared Rossi Subject: [PULL 03/17] configure: ensure it also honours container configuration Date: Fri, 18 Sep 2026 15:24:14 +0100 Message-ID: <20260918142429.336497-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:30::10; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-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: 1789741536201158500 This partially reverts the bits of 522b299ca43 (tests/tcg/meson.build: implement ./configure containers options) so the configure script can also honour the container config while keeping the plumbing to control containers within meson. Tested-by: Richard Henderson Tested-by: Eric Farman Reviewed-by: Pierrick Bouvier Suggested-by: Paolo Bonzini [AJB: untangle changes since] Tested-by: Jared Rossi Message-ID: <20260917165602.3405537-3-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index 1973f023b1e..8f8fec4efc8 100755 --- a/configure +++ b/configure @@ -246,6 +246,7 @@ ninja=3D"" python=3D download=3D"enabled" skip_meson=3Dno +use_containers=3D"yes" rust=3D"disabled" rust_target_triple=3D"" =20 @@ -722,11 +723,14 @@ for opt do ;; --disable-plugins) plugins=3D"no" ;; - --enable-containers) # enabled by default + --enable-containers) use_containers=3D"yes" + meson_option_add -Dcontainers=3Dtrue ;; - --disable-containers) meson_option_add -Dcontainers=3Dfalse + --disable-containers) use_containers=3D"no" + meson_option_add -Dcontainers=3Dfalse ;; - --container-command=3D*) meson_option_add -Dcontainer_command=3D"$optarg" + --container-command=3D*) container_command=3D"$optarg" + meson_option_add -Dcontainer_command=3D"$optarg" ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; @@ -1713,6 +1717,9 @@ echo all: >> $config_host_mak =20 echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak +if test "$container_command" !=3D ""; then + echo "CONTAINER_COMMAND=3D$container_command" >> $config_host_mak +fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "MKVENV_ENSUREGROUP=3D$mkvenv ensuregroup $mkvenv_online_flag" >> $co= nfig_host_mak --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741533; cv=none; d=zohomail.com; s=zohoarc; b=WXOK2qUG/fTrXwxNqNRGIACZZMZ+x3/q1O5K3Y0xErc3s6meC+B5exkp778u+Y/qDg3EIYhfixtHJZyEVcTh/J2LYmNEEumKCzt8lgyLl4RpSQYddAaEjAO3cwpKabWC3Yd3Y2xTxlnw2TtYwdzrwgkVVkxzYP9j/xlg6C3CDR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741533; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xbxC2j4wcYFekiRIr5rG3ctSTMf4NNM4fAwgS1HeBx8=; b=S0b1+JG0Goy0S35ffRY6QSKB+XfYUraHb/3nt+P3YdZ1fKMWGB6lvF5Lj/H+rPDKn6HBRfGgEHg22CDExaqOwEFa9g+wN4BOmV4fU9Xa9AsvjRn0NpyTPTIPGxth9BLruh9NRzGFvOyOnDqiG75Q+G92cXlWtYGzPlpmR0SfOVc= 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 1789741533652449.65039983403847; Fri, 18 Sep 2026 07:25:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZW8-0005mO-AS; Fri, 18 Sep 2026 10:24:44 -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 1x7ZW4-0005lO-Kk for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:40 -0400 Received: from mail-wr2-x1f.google.com ([2a00:1450:4864:30::1f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZW2-0007pG-PH for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:40 -0400 Received: by mail-wr2-x1f.google.com with SMTP id ffacd0b85a97d-48583cc7ab1so423244f8f.2 for ; Fri, 18 Sep 2026 07:24:38 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-487200829e1sm4905492f8f.34.2026.09.18.07.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:32 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 05F385FA62; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741477; x=1790346277; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=xbxC2j4wcYFekiRIr5rG3ctSTMf4NNM4fAwgS1HeBx8=; b=bGI0ibzBhDF/ngY4kWeiE8uVMs3JShX+HzXVcFxSMeXwST9YJb3tKEeO/hNsTp+t+E CdlPManSUsX1p9e8OKtWIj1H+koNxQLMcdj1WBWPiFvDg/73qNpBdVeMGJ9PjfhFwsmf i4zK9Itj/RTU9oEDCIJV6QBA1XQCZ3CJE6kwRl6pf9ERUa+1hBzo8VO4AyQRCD8Fh97/ +GNbaGGK3QAnZ4lE5rXnq+rRJZQxW2NdVhdb7jcaDmpnSXYHlqPlugFmCl7+frsYVV9A 0CXO5UnhUPXNp7BAh3f8PJopRjqwt/nIac29uKudBBO9PybGUanqMpWcOCvayjJm1FoI vDdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741477; x=1790346277; h=content-transfer-encoding:content-type: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 :content-type; bh=xbxC2j4wcYFekiRIr5rG3ctSTMf4NNM4fAwgS1HeBx8=; b=HcIR2kbvyM+XCUrs3A6oT1mDgMweBHv+//WIWWUQXK7RTuWryVWRH6CH0kAXeU86kk kc8u1Ko0szCCMcx+/ww6ZO7yfhvtfiMEwjDKVkxlhbBGLzioDLl/YWHxRdJBLA47gAxa WudxfIq81ovtcpN3GFvriLlJnHaI6fuJNQdJJewTI58MA0kCeyI2JraNF3phrIzkFZ1N oThZYFiegJRinChblthWPwbv3e+fS+xzbkrOXhI6WJFNnRNqGZqGGxCe3+wZVubYT3gO T26vxZ3dM+Woy8oaQZVkP9Ll3PRwAk5Gj/zXiiYg+VMnOZkN952uPug3mo3iKxPdZeSz Sq7w== X-Gm-Message-State: AFuF++k/Nlji6LkuwimvMSi0p/L99mw0KY1IYvX3EcNO9Lk8gxGKmuyC qt1o7LJwbwWo5SnWGNG9ls3h3WTaEHrOxEHZ4tIisniPB0gWW7/HEfX8OtQW1vGMXWY= X-Gm-Gg: AYBFou3JhQa/CgEmxcI9kViQSJVEM3mUqLQ83Kys+PyykRu8CxT2T3OXgcZ1lmyf3Iu fAQhcwr4dBGqGcwJUjB6uwh3HmIOZ58/bOZgAPA+vDNVZ7CUedxyjSPEbwWSfIJHM7M9CNEc8QT KGrLEUHvGh52Q+bExvGNlWeMFqkivTZGOIie36neTfM5akLiDnQKgE7Y35YvG7mkdD+g965Vh+6 9KKYqv+ILdN1cdAwZcznwHgARjtHR1zj5ClsD8dDHlERHgJk/tYOvycUjTESCvvBOVGkOPlUn3b 5rfSG5HtM+d/2B40O0y/efWi1ObUFKXDudmtVqCmBitxwW1QSwq62i4fl1J3b4k6oThwpItQDpZ ImDDOzP8sCds6gMOqkhoAnsCgZAyP5694Y5fB0bKyE9oK9AOSw3tBIuvR7rxzzj5DmbOB6KUNSe jVV/50x0Elk1Z1ZeHE41qHXKKwdmdWC4pm4SGugUcn+8JEvEpHNx+geBYbDI/XT5LaotedCS8= X-Received: by 2002:a05:6000:490d:b0:485:8a47:5b91 with SMTP id ffacd0b85a97d-4871e36cb87mr3443956f8f.46.1789741477096; Fri, 18 Sep 2026 07:24:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini Subject: [PULL 04/17] configure: correctly honour --disable-containers Date: Fri, 18 Sep 2026 15:24:15 +0100 Message-ID: <20260918142429.336497-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:30::1f; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-x1f.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, 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: 1789741534370158500 From: Daniel P. Berrang=C3=A9 The configure script originally only probed for 'runc' command in order to handle cross-compilation containers. The Makefile under tests/docker would then probe again when used. In order to eliminate the additional probeing, we changed configure in commit c4ce04cfb7460d46c0262d437a7f35bb5c5fc449 to always probe for 'runc', so the result could be passed along to tests/docker make rules. That commit overlooked that the 'probe_target_compiler' func was relying on '$runc' =3D=3D 'no' as a proxy for the state of the --disable-containers arg. When we started unconditionally probing, that short cut no longer works and we must explicitly check "$use_containers" too. Fixes: c4ce04cfb7460d46c0262d437a7f35bb5c5fc449 Reported-by: Alex Benn=C3=A9e Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Message-ID: <20260917165602.3405537-4-alex.bennee@linaro.org> diff --git a/configure b/configure index 8f8fec4efc8..04e312a111a 100755 --- a/configure +++ b/configure @@ -1397,6 +1397,7 @@ probe_target_compiler() { esac =20 for host in $container_hosts; do + test "$use_containers" =3D "yes" || continue test "$container_command" !=3D "" || continue test "$host" =3D "$cpu" || continue case $target_arch in --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741528; cv=none; d=zohomail.com; s=zohoarc; b=ivNfrNWMjIsuGzYnJ9jowc9GFi20mSMRapaVLjDfLZ8sYnCf6zMSriQy+s1xyRM/gF//DLNUo1z15evWmIUYW+zdCfwHfjmVG2rOid28IbqmW5btcmigqe6ck9qNKU+eRRgrubqlFVLNWH7R46h4Ue9x+mJqi3YWGOj2lwJ+oHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741528; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SnYcimLBLjJKyUug4vC26WZ+96K4j0kjrDY3usL+SPI=; b=nXR/NtbUQITuiTDR1u04/FVAVvJzefPcoeVfXE/+9el/Bi+SqUMDYbEF8KvhCkg0cCi6smvuGKQTOWYbq7TQQR9t2tqQYznakKZFzYlg0fZCZd1iyZhFZ4vMJS5TJmS/nYAUV0Tpfxoi/0OPWvYJ5dMsd+CjzOzUeX94QsOpunc= 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 1789741528125441.0744636562688; Fri, 18 Sep 2026 07:25:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWS-0005sa-TN; Fri, 18 Sep 2026 10:25:06 -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 1x7ZW9-0005mp-Bd for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:48 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZW6-0007pz-Mj for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:45 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49ccead2aecso4382775e9.0 for ; Fri, 18 Sep 2026 07:24:42 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4871ff3b186sm3833874f8f.12.2026.09.18.07.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 28DFF5FA6C; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741481; x=1790346281; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=SnYcimLBLjJKyUug4vC26WZ+96K4j0kjrDY3usL+SPI=; b=owMuf7/GPBUYlpM7P0vgTbBthBev5uF0tCj7z/7Hz/HuVvVIx3XVHBv7/JfvQcdsqx f48GFoarbpTyvWx6Gfj9aIvqziu1YWSYJYEtFFtlZb9uKvNXMMpijBWVEYC/UnrunzNT /RHX9yWUTDtnCZir3ap5D6mhpZfEEb5IX7mBPBDVoiypXce8t9GFpBDSvVdC+MQ3VllE OyKTvQPYQ55b9zDymh1Hp0+br6w8nxwHK+/ATrCdX3Rz6/U7g+Ulc0EwgfyGiimA75xK SQXk76XsyaeNTn60m6UHCmXR6Lw7hi+UJDYLiAe377aaO/EA7WXBc6WTSrXZUGczCEnY Jsmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741481; x=1790346281; h=content-transfer-encoding:content-type: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 :content-type; bh=SnYcimLBLjJKyUug4vC26WZ+96K4j0kjrDY3usL+SPI=; b=liCm+r9n4uKtCMNkDMS8XWJKuveSnrwQufu2UFYDf9RQxBDGA5K4lMGuY3Y9JQ9yQI JOjed31HoLMpjWil6aFw2vAJh+WCzKHPHsu3ShBZsUVwC6YHr6Publ7jYzKpbd/rhq76 uPv6L12h1smLwjc7O98nYeKRPZc/jBbCn5xVTHb57wE8f6O4D5o7sTt4CfanXa8nUTNE DDtEHgN4vxyFSSR6bPpUk9UR++m2Vde/QhjvbSd0upEzcUgi6GHRIesN0V6uMUw61R1u 6unQ7AeQkViQZHLyIWDr0XrM47XVIKgRSg9hpAgGCxQah2cEuW5DYQDY2e5G7vhjQiwe YMpA== X-Gm-Message-State: AFuF++mjDV9U8tUtRhY6+y61BWbHxiM7LyxVh1DXedDLjeIEWBkpGaSc F6JBi9AZkzV81qm7Td+6gARMkUPGExPYbxEYctlFh/GmUhdRH8Ywkfx2SFQ3KXvJH8o= X-Gm-Gg: AYBFou083EhcgzNoQ6wo6p1UKJWcPARtwAKywLWsS5JDWUa7caaenbpEoBYEKq47Azf FfvN6bQqUDgpguDCwPc6i+LkubYMBPLjsx/B63G23Xa7H4y9SuV1M6JYZZsMe7LVlp42uuqSlZk 39rBCAj8D7DwtdMZr2yaCyuS506i6aO3T1UR+Ox5w9/urwS2KMJyZstYFaefMf9HALGqm7AsTwG 0SOdDoZt/uCsFVkHWuVDHeIPwDAsCeSpxcwIEjkP1uh1xyx6iWHoUzo8DK260lujWTlMSbVpPj6 IIZXGlGMMmu5JpnzMJUhQPcTz0U6zhDFoLwV4GtkavT6+DOZCQLdceXjBZTd+bqPfe9YoG6QKpC J8V/ZIXrzL7h9Q8MA+DhLuBsIHT8Evbdr4PA1s3ycNHK8SPFsX93q8ndi7c2FUKUKBC2fFsy9vi 0o/JUvltYNQRG6tR6zBCtazT0FNUCaH0MPpaDcOUd50D9TCbA4uW0z5yxvTgviwILllMRn4WQ= X-Received: by 2002:a05:600c:4505:b0:49a:a101:4157 with SMTP id 5b1f17b1804b1-49fc56db92fmr37615645e9.7.1789741481332; Fri, 18 Sep 2026 07:24:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Paolo Bonzini , Laurent Vivier , Helge Deller Subject: [PULL 05/17] configure: re-purpose the tcg test compiler configs for vdso building Date: Fri, 18 Sep 2026 15:24:16 +0100 Message-ID: <20260918142429.336497-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.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, 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: 1789741530435158500 All the tcg tests are in meson now so there is no reason to put the config-target.mak files in those directories. We also don't need the GDB feature tests or to emit prerequsistes. The vdso re-build blob does use the compiler definitions though so we can emit the details for that and tweak the vdso makefiles to point at the right place. Note some of the vdso makefiles build both 32 and 64 bit versions from the same compiler. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Message-ID: <20260917165602.3405537-5-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index 04e312a111a..667fc7ca19b 100755 --- a/configure +++ b/configure @@ -1732,65 +1732,48 @@ if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi =20 -tcg_tests_with_compilers=3D +# Export the compiler details needed for rebuilding the vdso blobs for target in $target_list; do - arch=3D${target%%-*} =20 + # Skip anything that is not a linux-user target case $target in + *-linux-user) + ;; + *) + continue + ;; + esac + + arch=3D${target%%-*} + + case $arch in xtensa*-linux-user) - # the toolchain is not complete with headers, only build system tests + # the toolchain can only build system tests due to missing headers + continue + ;; + aarch64_be-linux-user) + # there is no BE user space continue ;; - *-softmmu) - test -f "$source_path/tests/tcg/$arch/Makefile.softmmu-target" || co= ntinue - qemu=3D"qemu-system-$arch" + aarch64|arm|hppa|i386|loongarch64|ppc64|riscv64|s390x|sh4|x86_64) + # arches which need a vdso, some 64 bit arches build both ;; - *-linux-user|*-bsd-user) - qemu=3D"qemu-$arch" + *) + continue ;; esac =20 - if probe_target_compiler $target || test -n "$container_image"; then - test -n "$container_image" && build_static=3Dy - mkdir -p "tests/tcg/$target" - config_target_mak=3Dtests/tcg/$target/config-target.mak - ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/M= akefile" + # note container_image is set by a successful call to probe_target_compi= ler + if probe_target_compiler "$target" || test -n "$container_image"; then + mkdir -p "linux-user/$arch" + config_target_mak=3Dlinux-user/$arch/config-target.mak echo "# Automatically generated by configure - do not modify" > "$co= nfig_target_mak" echo "TARGET_NAME=3D$arch" >> "$config_target_mak" echo "TARGET=3D$target" >> "$config_target_mak" - write_target_makefile "build-tcg-tests-$target" >> "$config_target_m= ak" - echo "BUILD_STATIC=3D$build_static" >> "$config_target_mak" - echo "QEMU=3D$PWD/$qemu" >> "$config_target_mak" - - # will GDB work with these binaries? - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches"; then - echo "GDB=3D$gdb_bin" >> $config_target_mak - fi - - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches" && version_ge $gdb= _version 14.1; then - echo "GDB_HAS_SME_TILES=3Dy" >> $config_target_mak - else - echo "GDB_HAS_SME_TILES=3Dn" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 15.1; then - echo "GDB_HAS_MTE=3Dy" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 16.0; then - # GDB has to support MTE in baremetal to allow debugging MTE in = QEMU system mode - echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=3Dy" >> $config_target_mak - fi - - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs - tcg_tests_with_compilers=3D"$tcg_tests_with_compilers $target" + write_target_makefile "update-linux-vdso" >> "$config_target_mak" fi done =20 -if test "$tcg" =3D "enabled"; then - echo "TCG_TESTS_WITH_COMPILERS=3D$tcg_tests_with_compilers" >> $config= _host_mak -fi - if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { diff --git a/linux-user/aarch64/Makefile.vdso b/linux-user/aarch64/Makefile= .vdso index c33a679c0f2..82ed2011087 100644 --- a/linux-user/aarch64/Makefile.vdso +++ b/linux-user/aarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/aarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/aarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/aarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/arm/Makefile.vdso b/linux-user/arm/Makefile.vdso index ede489e2363..16ae8d7aaae 100644 --- a/linux-user/arm/Makefile.vdso +++ b/linux-user/arm/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/arm-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/arm/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/arm VPATH +=3D $(SUBDIR) diff --git a/linux-user/hppa/Makefile.vdso b/linux-user/hppa/Makefile.vdso index f4537ae7169..78642c42661 100644 --- a/linux-user/hppa/Makefile.vdso +++ b/linux-user/hppa/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/hppa-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/hppa/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/hppa VPATH +=3D $(SUBDIR) diff --git a/linux-user/i386/Makefile.vdso b/linux-user/i386/Makefile.vdso index 95bc616f6d6..ca2e37fa6b6 100644 --- a/linux-user/i386/Makefile.vdso +++ b/linux-user/i386/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/i386-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/i386/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/i386 VPATH +=3D $(SUBDIR) diff --git a/linux-user/loongarch64/Makefile.vdso b/linux-user/loongarch64/= Makefile.vdso index 1d760b1e47e..ceb61101209 100644 --- a/linux-user/loongarch64/Makefile.vdso +++ b/linux-user/loongarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/loongarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/loongarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/loongarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/ppc/Makefile.vdso b/linux-user/ppc/Makefile.vdso index e2b8facbb50..6b9be843817 100644 --- a/linux-user/ppc/Makefile.vdso +++ b/linux-user/ppc/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/ppc64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/ppc64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/ppc VPATH +=3D $(SUBDIR) diff --git a/linux-user/riscv/Makefile.vdso b/linux-user/riscv/Makefile.vdso index 2c257dbfda5..2eefdb70cf9 100644 --- a/linux-user/riscv/Makefile.vdso +++ b/linux-user/riscv/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/riscv64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/riscv64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/riscv VPATH +=3D $(SUBDIR) diff --git a/linux-user/s390x/Makefile.vdso b/linux-user/s390x/Makefile.vdso index e82bf9e29ff..51f7c50a2de 100644 --- a/linux-user/s390x/Makefile.vdso +++ b/linux-user/s390x/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/s390x-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/s390x/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/s390x VPATH +=3D $(SUBDIR) diff --git a/linux-user/sh4/Makefile.vdso b/linux-user/sh4/Makefile.vdso index 272c5d262de..ed2cc11b825 100644 --- a/linux-user/sh4/Makefile.vdso +++ b/linux-user/sh4/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/sh4-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/sh4/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/sh4 VPATH +=3D $(SUBDIR) diff --git a/linux-user/x86_64/Makefile.vdso b/linux-user/x86_64/Makefile.v= dso index 26552b66dba..56fe87af72b 100644 --- a/linux-user/x86_64/Makefile.vdso +++ b/linux-user/x86_64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/x86_64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/x86_64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/x86_64 VPATH +=3D $(SUBDIR) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741549; cv=none; d=zohomail.com; s=zohoarc; b=DOfyoXiFAweqwFlI5o/7pISuJjzjL1AAFCNZMPpMjjTOcUYTx548cORwMm7dG+lOgSuNX9pi9ZMQm0+imWxGXsEKEhkJkd6bD2MZRbU6wuPuUeSaj4vEhq5vwwwF1bon4mWKrK/yMbhPmKjM5PwWcwqVHseVQUk24Oo5sHSQ7kM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741549; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oWAJUZu655m1aKS80ThOnRI0ZvPTEOFh17G+teRw+uQ=; b=JGSph2jynHmJZtM1DDikllHMX3bFZVzW0idJX3pnAE90whQQ7Q2ovsnlH1c4LTqeLSwN+JDrlnghEwpw6LkHWMq1y7uCItgebrGfq9eZCpCvnMMS5UC2pv+EpcTMSZ095vR9a30zMRxBg5ryf9eF6wRwhBDGBmvqRXGSkPx7F+Y= 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 1789741549277453.77433252716276; Fri, 18 Sep 2026 07:25:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWe-0006BD-GG; Fri, 18 Sep 2026 10:25:16 -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 1x7ZW7-0005mY-Kj for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:44 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZW5-0007pp-Su for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:43 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49ccff31419so7020565e9.3 for ; Fri, 18 Sep 2026 07:24:41 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc7cfd1dasm60818585e9.9.2026.09.18.07.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 446405FA8E; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741480; x=1790346280; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=oWAJUZu655m1aKS80ThOnRI0ZvPTEOFh17G+teRw+uQ=; b=zoQddMPKbi4DVYgsrDW6l61WskPk2NAFT+qC+G6SCdkWRB6F4spdKOpfhhQWgYu6iw DvOMFqCMccWKDDuW2ygI7KdEumVQMd4ckdJ980yQEUswpEFNo8qku/KqfPh7gPnkNMSZ 48hhKF7RJTtXaYCmptx1ZfDkPrhXfo4usli66ujLnXRbbRB4kuIg0jCnQVnHBTaUBkzz Qx39ej+q9AKyzen9HtMh9QhLwdM2CAmQ4xBZQBPKQl6nMV8jsM4++MGD7vAwEDAbDAB8 2NkBR/xSZoywM6pvPYALEpn6kkTVpNsAaN6KSNKdikGUxN5k5EyrZIccYXOO9BmvcyjV 7i0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741480; x=1790346280; h=content-transfer-encoding:content-type: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 :content-type; bh=oWAJUZu655m1aKS80ThOnRI0ZvPTEOFh17G+teRw+uQ=; b=ScYRmDJe2L4pnlGTDHh7rIk4HikyvA3z2jhfVHftDS6J9QodqW2YtJd9CpZBK8mNEk EUBi4DPnTbLMeZ4nGYFs9UdSlHaa/dXQG6OOwUKNWHY+t0uRV1iBOa27P+z0S75HkbLI ml7FZAu2KqPgLx7qfx0FRddA+xPxrDwbyuUzIGxchsuOh3HxOzCkUdNol+rm7si5c+NP jlouewrzKjEyqyWhUkvbhTm9eRoQ6ggPOQXMuJymE8dCyKfWYIp4e2VYip9LXjMeh6qg HVVP4wO9+FwaW5QMnNCih2r0PcQVsxhjk/CfhMpxH9j3qCTDv+mO7vOhi1avGu0IzojN Ugfg== X-Gm-Message-State: AFuF++mCYXM+8vGPhOELsymdh9j0d6hXMJbjnnj2S5mFjPVLfhvO0VXu i8lrOtPPMYxgJMMFOqqZ7xU9l08B2Q+ueiZ2V1cHBOZzxXK8NpH5R7VQbpvZ3LVyhJg= X-Gm-Gg: AYBFou2TYEe7ry5DqlOUk3w2WNx8ZTaVN8v3DxU9Use2ZRM6RtgAy/xxw7tMKyHgnkL StFsicIsgjJOAZwMMud9/f5/pcSOA7gC6Wf87Ti+K6zrrxqYyJmFHGjeLc5cprqarphySWyTsiD kKhNn+ykb6I4tWC2B/LVCOJQCwp859AG8frSzAu+ocb2pDeiFz25YCFrhtCcFoRlAO7sK553PBN rN9jkFnnqaLgnWzZKakFZjWjNXnRMPxWuW5AuUSuH0N6057JKq13U7Uq2/kyXjIDGX+TkfbBY9R Cc1aioKqNinsKWlobSUvwSt9fTHYhHBskj8TxCZUaT3oHvX1dg510zHLJkjVLSjeQhLW00+mRmA 4ZABgKuLu35pDjWWJMDwEKhWPIOYp8moi0jqlN2bdBqxbrrMbEyYADJ1rfmFWrlap6aRUMvKIFl rE1DXqx1msG7yjKHMHYye4i9dmmn2Br5zsB4CPkuQD9Myr+NypMdXwQO6qpPzO5dv9t5VG0Iw= X-Received: by 2002:a05:600c:1f87:b0:49d:99:1d98 with SMTP id 5b1f17b1804b1-49fc56ae924mr39995105e9.9.1789741480487; Fri, 18 Sep 2026 07:24:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , David Hildenbrand , Cornelia Huck , Eric Farman , Matthew Rosato , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PULL 06/17] tests/tcg/s390x: Provide the libc bits needed by the system tests Date: Fri, 18 Sep 2026 15:24:17 +0100 Message-ID: <20260918142429.336497-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL=1.623 autolearn=no 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: 1789741550334158500 From: Ilya Leoshkevich The meson conversion dropped the SLOF libc include path that commit 3fa010d5317 ("tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests") had added, breaking the build on systems without a cross-libc, such as Fedora. Rather than reintroducing a dependency on the SLOF submodule, which no other tcg test has, declare the three functions that the reused pc-bios code actually needs: memcpy(), memset(), and printf(). Reported-by: Daniel P. Berrang=C3=A9 Reported-by: Alex Benn=C3=A9e Closes: https://patchew.org/QEMU/20260910100120.2076092-1-berrange@redhat.c= om/ Suggested-by: Pierrick Bouvier Fixes: cd81cf86834 ("tests/tcg/s390x: system tests") Signed-off-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Message-ID: <20260915110959.492195-1-iii@linux.ibm.com> Message-ID: <20260917165602.3405537-6-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/s390x/libc/stdio.h b/tests/tcg/s390x/libc/stdio.h new file mode 100644 index 00000000000..c3e45995f65 --- /dev/null +++ b/tests/tcg/s390x/libc/stdio.h @@ -0,0 +1,11 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STDIO_H +#define QEMU_TESTS_S390X_STDIO_H + +#include + +#define printf ml_printf + +#endif diff --git a/tests/tcg/s390x/libc/string.h b/tests/tcg/s390x/libc/string.h new file mode 100644 index 00000000000..1cabeb90adf --- /dev/null +++ b/tests/tcg/s390x/libc/string.h @@ -0,0 +1,12 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STRING_H +#define QEMU_TESTS_S390X_STRING_H + +#include + +void *memcpy(void *dest, const void *src, size_t n); +void *memset(void *dest, int c, size_t size); + +#endif diff --git a/tests/tcg/s390x/system/meson.build b/tests/tcg/s390x/system/me= son.build index ca07f503058..1e360e70821 100644 --- a/tests/tcg/s390x/system/meson.build +++ b/tests/tcg/s390x/system/meson.build @@ -6,11 +6,13 @@ link_script =3D files('../softmmu.ld')[0] head64 =3D files('../head64.S')[0] console =3D files('../console.c')[0] ipl_inc =3D meson.project_source_root()/'include'/'hw'/'s390x'/'ipl' +libc_inc =3D meson.current_source_dir()/'..'/'libc' cflags =3D ['-nostdlib', '-ffreestanding', '-Wa,--noexecstack', '-I', minilib_dir, minilib_printf, '-I', ipl_inc, + '-I', libc_inc, '-march=3Dz13', head64, console] asmflags =3D ['-nostdlib', --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741556; cv=none; d=zohomail.com; s=zohoarc; b=Qyk9QPCzuMvPndhbUVdOO5WBAQVn0Row0t/nDEv70IjqbYaTX8uu/vPjdTjsFmM567PAdJzb015+WGFIsKO68GifDwOOZtoTpriXn7P4pI0hZF/6pWVfqiSEOsm57rCzRbCTz/4DpVS42kgu3MzZPyqqfD12YiKwB7dYXt/jwhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741556; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ASTm/YOo+kNQKpxTKvr6w86Tke+vQk9M5QNLP09G1mU=; b=MxrHTM7bbr4TcSjorlQfjVA9GmjO/AyFFu10IWSm5QIKqYh+X0hRrFDR2SKTsiaShW4Q+Hi2OCSWuLZaCa/Q50E6/zd5kh1b0xfuKH1PpU15ngfWmDp3WdtHWrY85Bo1d11MNDjsZwKi+OqSPuSugM4dFnCALxTBcCEbVaxpykY= 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 1789741556392183.2095523268996; Fri, 18 Sep 2026 07:25:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWc-00068z-OT; Fri, 18 Sep 2026 10:25:14 -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 1x7ZW9-0005mo-7l for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:48 -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 1x7ZW7-0007q7-Ka for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:44 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccf3ca626so4136385e9.0 for ; Fri, 18 Sep 2026 07:24:43 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd2160c2sm166863355e9.6.2026.09.18.07.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 580625FBDB; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741482; x=1790346282; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ASTm/YOo+kNQKpxTKvr6w86Tke+vQk9M5QNLP09G1mU=; b=T3AydBefiZ4JZP+jtsjFMcEAUa+RI8ybGYQ8rMagjIuZeh6EXQyKZZehjW5R6F/eV8 PMFlAQ191OucXnwMU3NE7vqXb6vZriZ7svcVL9CH2TCZp2etu8spCTky8TbRZLIkpyy7 Q1vhFddg966Y0sQ5UwlsKP/q1faFGW0XC1dY/3+cgVY2OvKQc0QamBmIZV+2ECrmV3/Q Hxdk6TZM4ERbzOXhTQLqrw2q8l/oP1+dwG7e/89C7iPKpaEqMdTiQePfwE10Vu54QbDm GeviywiNGQGfhh9wdR1w/XABE7iMWzDdB2vVBwfNvF9K0DqJO4XVoler+l5uHgsA6Eoz CGAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741482; x=1790346282; h=content-transfer-encoding:content-type: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 :content-type; bh=ASTm/YOo+kNQKpxTKvr6w86Tke+vQk9M5QNLP09G1mU=; b=M5Wkt9x4EOREH3FdJjwhkkoPQc3ehEV6u6NrJ3JpdGOnHJx4Cu6BFRABgNw1O3Vz4V dsJINcLyVm+VqqgW6LQxILavg+rcKGsMjwGp6wQFQSBCcHlndEOF+/qD/63PsvtgnYAG nAWiuP3pVq+xvVo4i2R5FeTHlW8crUqQpAFnpsOeOuaVn1GfJNFcSyHzAtFkmtMxkp94 rH1xQVMK9HS3Yr2H4AwNy8p5RPL++0bN2ubHgMigzjZAp4UeLrkw6DuZ7zfnnqIOVjCd 9J5rWS4K1HXTIhrXOkQCYcdfqu3VTvHgUi71BtHJ4NcSnUpnm5qSBd+R0kljn3UsIlYq QPgA== X-Gm-Message-State: AFuF++k33B8ekYOTawld7AQ3QjKewqLZQGZT4IeS151z3LFTgQbdJS0U EZSr85AA6y2RauhhtkbRgOdseeIm59JyjOe/Q82GvM2r3aPy++UeYP2vbeVs5FHRMj8= X-Gm-Gg: AYBFou2g6+r8WIf2qneRx77DvMxgzKvPjV3lnq+49cMP17wqEkQ5gnbYKorDW0/LuBy /XIHhsFN5XVbHrK5FUBQNvLuTEcwSKtRrcCWIyCMm/HBPuGhLNPbDj7zp0LZsptjA0ccrj8HEQb jFuYc5NLMdQtlBg9UfBnfz45oevV98W5fOJO+3aUr8hTeNzCzyen1Nw9X3KzFFo4u4AC7mJy4ho W0OhuCxvqcDndix1wMuKrZY//n1TK42vDJata4g35hb8g8v9wq6nlV9ULGSahDqP69fLCam6oFO FQolnC9NKxJI1KTBhbjCOxMjEdybY5o02JemIT1lQBBAoAeMr1Krf8FK9LJIzEDKjBRl+9mBTEJ 8KPaDMo6e9QZ55iyMhIWATiDL8v37fC/iQa1H2YPpRJx+q0dmZpQx/NcnQ1se5JXPenWD+aAJMp ICoAOiu4pTqxAoyjZVjSe4f9X4O7fD0HHaSjsznrdKjbKkR3KfhuISO8oTuhH0hGXw03D1GjQ= X-Received: by 2002:a05:600c:1908:b0:499:8aff:59b6 with SMTP id 5b1f17b1804b1-49fc56ad81cmr32759795e9.14.1789741482135; Fri, 18 Sep 2026 07:24:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Pierrick Bouvier Subject: [PULL 07/17] tests/tcg: prefix meson built docker tags with qemu/ Date: Fri, 18 Sep 2026 15:24:18 +0100 Message-ID: <20260918142429.336497-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789741558467158500 With the meson changes we now build the images directly by calling docker.py. However the Makefile.include builds prefix all the images with qemu/: # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ DOCKER_BUILDKIT=3D1 $(CONTAINER_COMMAND) build \ $(if $(DOCKER_V),,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REG= ISTRY)/qemu/$*)) \ --build-arg BUILDKIT_INLINE_CACHE=3D1 \ $(if $(NOUSER),, \ --build-arg USER=3D$(USER) \ --build-arg UID=3D$(UID)) \ -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\ "BUILD", $*) So to ensure we don't end up building every container twice make sure the naming conventions line up. Reviewed-by: Richard Henderson Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-7-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index d41a228fb3d..0604c4b90b9 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,7 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', cc_dockerf= ile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) @@ -270,7 +270,7 @@ foreach target, plan: tcg_tests here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '-w', here, '-v', mount, - cc_dockerfile, plan['cc']] + 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif endif @@ -279,7 +279,7 @@ foreach target, plan: tcg_tests if has_cc summary_cc =3D plan['cc'] if not cc_from_system - summary_cc +=3D ' (from \'' + plan['cc_dockerfile'] + '\' container)' + summary_cc +=3D ' (from \'qemu/' + plan['cc_dockerfile'] + '\' conta= iner)' endif endif tcg_tests_summary +=3D {'cc for ' + target: summary_cc} --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741527; cv=none; d=zohomail.com; s=zohoarc; b=OyIh3US5KgbbwzPmqQT7UasEMgb8VjXxjwjJrbFsElHP88SIz3RAsa6nSjTe1mPZ61s0mDMEOVtsIAAj73gqtDKkG74GJCFvDyK2YfYToZvjDWq6KawMmj2pHOJHcN0SqRH5uffsUclwgxbaQCzdWXHGDyBsXVx4AzCE4njMjl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741527; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jxff3xmmsE6KuWRYrIIbIyGuz0FUO2yvzlzbuIVyHAg=; b=EHjkHwNfbwb0QPvAtvI0laOOgPlDymeIKNBwkg8QgQdJvK2JKpxN2QbQR6fcM1UBKltZ4TnPafWW3kxAPzLiQOCI+FdZUwBlmYi+l70lGpOIqIJCrYviNZA6BovMuWXd7b/MfRcWf2WDe08YpK1VsCgoocbFTcNOXFb/QWkbreI= 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 1789741527634121.39583209154489; Fri, 18 Sep 2026 07:25:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWb-000681-Mp; Fri, 18 Sep 2026 10:25:13 -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 1x7ZWC-0005nF-7G for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:51 -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 1x7ZWA-0007qk-9n for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:47 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912df756so6059465e9.3 for ; Fri, 18 Sep 2026 07:24:45 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc7b7a6e6sm65793945e9.1.2026.09.18.07.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 730085FC17; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741485; x=1790346285; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=jxff3xmmsE6KuWRYrIIbIyGuz0FUO2yvzlzbuIVyHAg=; b=LFngSX3o09Ori48gZxKQymRxuEeV/h0toukwimZwb0BQItOjJ0EhYqls8y/q97U2Ay TTMg3hlDuT6mlf9aOQpKWoH6UrjrT8tTWftNk4iYe9d5pm+DSMzvx4UhjDBBGd2ZkFYf d41ph0lIrMDPPREPBLfIBmd2gi7X10fGZSUGGXgppoKVPz5p3nHezsennqH1u+F8Pwsk XMapg9DOT9miXAiE2IKYTOvTYkmdqnGh290YGXdWzi0fo6GCXzzVVh5ov1i17+AspUAQ TlIx7yhgYaUrFeD58C/nSIsgVEn2kK1fqOmh2mE4OPBOBOrHzZm3tjbr8AFcp6jNeak9 pcqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741485; x=1790346285; h=content-transfer-encoding:content-type: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 :content-type; bh=jxff3xmmsE6KuWRYrIIbIyGuz0FUO2yvzlzbuIVyHAg=; b=deP4/vOUWEJpM+jU02To5aWX+HuKwoUFzEc0dkIQhothvf1KngGUacT7ycihbiQPuq lcJAze62yiVpM1SYhE0xO4hap4LcgB+K1S4fDHxXqRiKd7oQVfl89h+yCXWyKgttCvMC FliSHrptLL5Za3iw57N5Jb576PGnRlFTVW9Ep5EW7tnWmKwOQ0RgWBsVWP/Hd7g/Izqc uFpCgFNLkMFUWyiYgZt2LVFV11CCKGiWgy9JG0G7QDogFqZG7/6AVVPiuT+hB3SiRZ8E u/phLUE/YpR2150Doy8NKIuInrYZOdmDTvtbcDnkPYfy3JhxEMtRSZJz7b5OS/l0yco1 L41g== X-Gm-Message-State: AFuF++kzNlIqqVK40GEXS9zybj3Mzz+DPub2vOWJbZgC0S3FY2TMh3Gu nzJFoaxOCbRtL4DFF44zNh/AnZ13O8PObr4ApvwBLuth1Txqa5WE3tbPoQTuRxk6uh0= X-Gm-Gg: AYBFou3Kw6MHGdsS5030ukoNbH/JO9fES+8xbzvrnghjZQpJxkkiU7rPpatz1CwtWXq 3rbdSawA0V9yVw4qsPXnSTbUEox1zfV4JzaMyUmrs665pvBJDGUdQTIJvkPBje2ZOMrD/VYTbYt Yi7qBcCKg8w5nuUiWEzKmPO8JaH/YicmNXBVp5dLgZ6krFI43ASWLH+F31Dz+LxoHFdmPyRZapC 8r2KE5h9PPy7HrWLA1mQmNgvpA0Vf3NafUt0lQq7phZ3lyu4KE5ze/cCBliXdaQ8iSyM+q6NkKx gsNrIQ9cT4HcEdaD4wT2v6OP4KiXOXfOxfd5631rCujDIKf0ftUNhCDBgWGsWH3iHwDFXMn/0Bn 2S57STzMc33UK0V++SAwFv5aX/ZTQ2FLeg0J3OSun1gTGJ85CzWKpkjvXyFnnu0UM+oaSSu+lHH ZTKzNSpDXbPtJUNSOBMiz72GU/bqTtkA89cmo8e5yHiEUKU6uH9WzkEoVNOTebNg3CG85oXh4= X-Received: by 2002:a05:600c:6214:b0:49b:9202:6f80 with SMTP id 5b1f17b1804b1-49fc568129emr35618275e9.6.1789741484722; Fri, 18 Sep 2026 07:24:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson Subject: [PULL 08/17] tests/tcg: use --add-current-user when building containers Date: Fri, 18 Sep 2026 15:24:19 +0100 Message-ID: <20260918142429.336497-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789741528231158500 As the meson tcg build routes the container builds through docker.py we can also clean up its hack which involved appending a RUN line to the dockerfile. All the dockerfiles that care will work with the --build-arg. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Message-ID: <20260917165602.3405537-8-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 315fa2ff848..6090a9dc957 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -297,13 +297,6 @@ def build_image(self, tag, docker_dir, dockerfile, dir=3Ddocker_dir, suffix=3D".= docker") tmp_df.write(dockerfile) =20 - if user: - uid =3D os.getuid() - uname =3D getpass.getuser() - tmp_df.write("\n") - tmp_df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % - (uname, uid, uname)) - tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s\n" % (checks= um)) for f, c in extra_files_cksum: @@ -315,6 +308,12 @@ def build_image(self, tag, docker_dir, dockerfile, if self._buildkit: build_args +=3D ["--build-arg", "BUILDKIT_INLINE_CACHE=3D1"] =20 + if user: + uid =3D os.getuid() + uname =3D getpass.getuser() + build_args +=3D ["--build-arg", "USER=3D%s" % uname, + "--build-arg", "UID=3D%s" % uid] + if registry is not None: pull_args =3D ["pull", "%s/%s" % (registry, tag)] self._do(pull_args, quiet=3Dquiet) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 0604c4b90b9..814f2f8cd8c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,8 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, + '--add-current-user'] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741544; cv=none; d=zohomail.com; s=zohoarc; b=k5QLuG9CtBYjLKcNkCIEfehYct1ITulgpgokFZ4+q4S6D23OWymZNZrStEQqJ09HKTOIQxSp9tw4LYOPBa1n1aYNZYcwbucQfssCuNrAu/jeh6VSpHLdo0UzU91E6sq6uwzeSptZzn1EHcmypj3vQ3NFinmHyE3hg6Js/B75kkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741544; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Jj3J/kq8IdeZG8tbT+Qxq2YKCC9zfZ6KfN+WX4p5lYs=; b=RWDotbxAaTwAyz3OwpUeYVRKbPg/ycejqxN3jHm06T9zVrIsn8LRb5mknhGW3w/v62iM3T51OEG3CX48LibkadmRvfGsdgaYs5OeU+5AIWSoFh93IG6D2TevthglMDpZnZl9n34dm2lKUPoZSRDLok5mSLC1j3kNrQ/Agy8zgHo= 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 1789741544103931.6672924690743; Fri, 18 Sep 2026 07:25:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWn-0006VP-EQ; Fri, 18 Sep 2026 10:25:25 -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 1x7ZWC-0005nM-Q8 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:51 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZWB-0007qs-8q for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:48 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49cd38e0f79so5361545e9.3 for ; Fri, 18 Sep 2026 07:24:46 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc56aab7csm43854575e9.1.2026.09.18.07.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 892555FC28; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741486; x=1790346286; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Jj3J/kq8IdeZG8tbT+Qxq2YKCC9zfZ6KfN+WX4p5lYs=; b=I71F0Nu4f4hs0ZyOzg6p2geS+IhbJut1MIKVauGcSViBWXTeu+LNSRkSB0iMXpCVM5 hM54zJTsuwpmoVXUVxXGR1z7G7VDF2cCbsUzVT1hWC731GF9/8bl6tmBVwCmXFe2pWRj AsgZGZhDnW9UnqOZExlvPbUqlGnYB6Hz/ss/9XMUV/cjfaNxvAVbng5OCiN1N75u/CjE ouuC/YWH+KKEB6hPyN3yuCnQiDFnmFis9nN9UxZOzBrOn5NnCX5BwxscBKkeAjMXgjU2 buxd2u0UsdXU7yArh5KaUX+0JHem9aAYuqzviv9ykVxuaX/iqtEk1pFQ4aIHpfQ+JBOn 1W1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741486; x=1790346286; h=content-transfer-encoding:content-type: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 :content-type; bh=Jj3J/kq8IdeZG8tbT+Qxq2YKCC9zfZ6KfN+WX4p5lYs=; b=RQMTI9A4gAsAqTEk1ccEDc41Hr63dU5WeVxlZeTkMZEIUwWVn5WmpNkplmUGbIi4lV B6qKT/uk3D4KZ4LouDNHhPzJG/WrvtmmXi34KGtc2s7OEMRi+uDpT7O1DCDFJBGfRH0S oa2cuhqzHEVkra9W7BumotZ8t4PkJXDRqBXTZ5Xk4CGK/JD9VgKjvlHhm1HLfrasQKso qJUFvtjyt5LmDYM78FYanm/6l8knHHvU9FkySAncc+n5Sh3LA4O6mlOZ8Glvs/PMK0Rm HenJJEKQ3cUmb9wRBEj1U5lmhLwrnIQh/BdM4xS1R1qUYN3n7pJKnNH/1Ac055EH2uyz Sz+w== X-Gm-Message-State: AFuF++m63Ke9ye+L//W22OIysr4BEE6iD0O5qlYQsiAeN++LpudQ3Ln5 QUYsPYcYUR+SdSDHC0tBzBS4dqjoT9SPfGMAgzs/qkR2mL0O3DgLNg7JACCPy2hRrFo= X-Gm-Gg: AYBFou2LbH/lGNfrJxksJnq1OUpO30KvSHRA/7ff+8OkPAE3qZfgDy+61PxCMTW7MN1 4i+m+2GPm71g1ZqjjSo7/JaHiotUKbbSlwIAEA7Zm/Fu518b49EHQ6WPh3sv73MwJ7Jz6ouSJgn acB82fBy1Aeb7WXRhhZwD8W4a+jMaTnMdd0uVSHW+EsexeU3a0HncZHyabNJLDcZFdaL+TulLo/ 6zQc/tQlsVvrqbLIc0x8rO/TsG/USKa7p7yU2x94nPY5zDEuWYJQws03HBTkhJmcRCNE9N04VjE fofaCvfPLYJmVme6GEXoJ1qSe7CqJblQiUp1aTWdfUXn6sruvj9oorKEPTB5UHZ4zPrIuWWQ3TM NONE80PU5VLllHyZTuuB7s/AVH2UTvs6ERVHIfo57iyeMBjVycQ3syeAfiy6Bx/j9Psk4QNwQSC NuG0KP5GyhyYUKyhWtO1UKYvOLkA5nURdZAZM+TNUI5gm2RHW+EnQ69HW68Y/vCpWW52wUdkBiS Jfjs+HyDg== X-Received: by 2002:a05:600c:5020:b0:49d:726:cc9f with SMTP id 5b1f17b1804b1-49fc56716f3mr6615075e9.5.1789741485711; Fri, 18 Sep 2026 07:24:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PULL 09/17] tests/tcg: don't define tests when missing compilers Date: Fri, 18 Sep 2026 15:24:20 +0100 Message-ID: <20260918142429.336497-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.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, 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: 1789741546257158500 Skip defining the tests if we don't have a compiler to build them. Otherwise we add a bunch of noise to the reported results. We still do report when we skip because the compiler doesn't have the features we need to build. Suggested-by: Pierrick Bouvier Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-9-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 814f2f8cd8c..5819fdf0bf3 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -499,10 +499,14 @@ foreach target, plan: tcg_tests cmd =3D ['sh', '-c', 'echo "' + skip_test + '" && exit 77'] endif =20 - test(test_name, env, args: cmd, - depends: test_depends, - timeout: 120, - suite: ['tcg', 'tcg-' + target]) + # Do not add a skipped test when compiler is missing, + # though we still check all tests are correctly defined. + if has_cc + test(test_name, env, args: cmd, + depends: test_depends, + timeout: 120, + suite: ['tcg', 'tcg-' + target]) + endif added_tests +=3D {test_name: true} endforeach endforeach --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741552; cv=none; d=zohomail.com; s=zohoarc; b=DKzKPzLyO29OlOQr5ZWEWA/7SHHNh9Ag+mK5VfBl9+EGhqRFuTpVFCJM0K59hjIVfiA4qYQYf7I+HtZg3g6EvfrJOFGbu/7hIgoL4vt06kKAWUsq/Trx4QTPWUr1fWuwPQ6bIXt4V7l1gu3V+aQuwVT5rkpQYTQGVMDy7dSWFIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741552; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Tcotub2dz4LVURgEVs/Az7nuXWuCLmW3Um4pWzjy0uM=; b=QSXTpRi+4Weg7I+v1It3vqJs8qH5+rgUUvklzm6q+PgiP46xtgK/kbZiQ6qYJtgKM3A1TB58Xtk737qol/M2rZtU/Tgv8LUjd9uotGqjo+yZhqxg9k+5boC3j93LfQyZcYPyCXh/1vjLZ00escVPJeqyems7XXJG3gkC9CAC0G4= 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 1789741552515628.4148723116568; Fri, 18 Sep 2026 07:25:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWl-0006Lq-1Z; Fri, 18 Sep 2026 10:25:23 -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 1x7ZWE-0005nR-E2 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:55 -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 1x7ZWC-0007rB-Kv for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:50 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccfd61ecaso7772245e9.3 for ; Fri, 18 Sep 2026 07:24:48 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc7cfd1dasm60821765e9.9.2026.09.18.07.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A81345FC4B; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741487; x=1790346287; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Tcotub2dz4LVURgEVs/Az7nuXWuCLmW3Um4pWzjy0uM=; b=ap+ws+11h4q8B4lLaxLZvV8D/87BhbDdQy03/GKLoLxPSSlzsxTK55Ma6PSmF1oMT4 DZkAHrcUUBwnkG79Iqf2U6uhxg/hHhRm6bh+Rmpydv8xZtr3EAKS5hswVvDXNc80WwUz kHzkpCl23exRInGKKI+HWP1/ut0XjBkBNvWKuiJlSHLM4ulqoP5ruF2/sU0gu8xKZ4Uv L5AGciBo09vYbZF1YaEKquhvDgKP6SFgtSUBge0YUVZMO5APy0i1YuxaSsYFac6OxaxP Bfl1Pu5zq+Q8xMzsWFoFBRVCPLcqXN9enVKO/ng6DKjDz3zjcKzKRDcoK1fvEZxENFb0 bKFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741487; x=1790346287; h=content-transfer-encoding:content-type: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 :content-type; bh=Tcotub2dz4LVURgEVs/Az7nuXWuCLmW3Um4pWzjy0uM=; b=CSVDXZs4oGmTyJ0YP3KIeLfrjTa/RaTuUb3rWlFHNGFfQcoET5i1FVdhN+pZyGjwHE uFqPJCbQY6Uxme+XEGu0c/j/dvD6yBSJlaj+tX8/wcC/VskcyrT29iUnWKO3366MU/BE aFqAJ24CtlJ9rBut8w7O7pCgeeOtQ0GjNOxFBxxD6a2xIAZdhSKWmrdeHppL3V2KxOkT 3Bdc0igW2oF3a9R5An/PFB2M/q1QT7FbuttZtCdT7/PgwwfrmOELE8AeJ4kc48lciGY2 xa1L+tnfLazeATDA3S6STYswuGPlC5nr9Ke1P/OFB6szu1NzKGQX4DcGAUhVbYEgCyBi Xuyw== X-Gm-Message-State: AFuF++kyFQWVwNQtao9S7HQf9ZW5aUtO9l39XybJBePp8arCvNhoLjxn CupK1eE3xjxEMyeGIXciAOPZebbnbmaJP96VnEvxuyY3D+1MU996EhhRawOSOBW3oQI= X-Gm-Gg: AYBFou09FZCFK2eZFv6QbXmNtl7F/Eyug3idwEu/GFVkr/fVMBahOHf/0qeIdOs9YkQ NsMwByV+qxgzVn73277cFq3nuIJsYaIes9PLOZU105daLqV+V2nGL3HeoK4sWJrwFC8zbwv/v3c uY3VqEdBCsn6DLR1nHbFU966J37yPT71gkHb2iRM+LDgAXwWCC3dHa+bYwuiCYb9r2Wk002/YBB 2y3OBmNR7Tajkhz7sWohBihUQHToAI4zr8jrnj23qV+hkobw9uEeYVgv9akHBh1Kk2gFD4Mh2X0 1umTt7lWbXdfPwysisYVbfJySMfQWe99qeArdIHN7eDL4VEwOEeNlXAroYPiKsJPwWWhcoxeYHM 7pGxTwWjdSfyZK0MUIlBEEHgRO21I9pT8J76uVjetvpCr6gB8nTVqPaQhUzsFud2a7xT+EclWLk TR/DUvhgT19WKX0MOrj7Cu2lY7lfeGbDSJS4RBUgUE2lRiaB2Lqg2MuqxOIVT2Ze/HtIThVKw= X-Received: by 2002:a05:600c:a013:b0:49e:6891:27a8 with SMTP id 5b1f17b1804b1-49fc574a9bcmr30207485e9.25.1789741487268; Fri, 18 Sep 2026 07:24:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 10/17] tests/docker: add container registry to configure and use Date: Fri, 18 Sep 2026 15:24:21 +0100 Message-ID: <20260918142429.336497-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789741554378158501 Previously we had the default baked into Makefile.include but as the meson container logic will also benefit from it we update the configure machinery. For now we allow direct make invocations to override but for the normal case it is in one place now. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Message-ID: <20260917165602.3405537-10-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index 667fc7ca19b..af14a9c23ef 100755 --- a/configure +++ b/configure @@ -172,6 +172,7 @@ fi # some defaults, based on the host environment =20 # default parameters +container_registry=3D"registry.gitlab.com/qemu-project/qemu" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -732,6 +733,9 @@ for opt do --container-command=3D*) container_command=3D"$optarg" meson_option_add -Dcontainer_command=3D"$optarg" ;; + --container-registry=3D*) container_registry=3D"$optarg" + meson_option_add -Dcontainer_registry=3D"$optarg" + ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; --gdb=3D*) meson_option_add -Dgdb=3D"$optarg" @@ -1728,6 +1732,9 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak +if test -n "$container_registry"; then + echo "DOCKER_DEFAULT_REGISTRY=3D$container_registry" >> $config_host_mak +fi if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi diff --git a/meson_options.txt b/meson_options.txt index e3570a418aa..6c2de6296f7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -393,6 +393,9 @@ option('containers', type: 'boolean', value: true, description: 'use containers to cross compile tcg tests') option('container_command', type: 'string', description: 'command to build/run containers') +option('container_registry', type: 'string', + value: 'registry.gitlab.com/qemu-project/qemu', + description: 'container registry to cache from') =20 option('tcg_tests_cross_cc_aarch64', type: 'string', description: 'cc for aarch64 tcg tests') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 4ad8c1c5d35..08c9fbb62cd 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -12,6 +12,9 @@ meson_options_help() { 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" ' --container-registry=3DVALUE' + printf "%s\n" ' container registry to cache fr= om' + printf "%s\n" ' [registry.gitlab.com/qemu-proj= ect/qemu]' 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)' @@ -286,6 +289,7 @@ _meson_option_parse() { --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" ;; + --container-registry=3D*) quote_sh "-Dcontainer_registry=3D$2" ;; --enable-containers) printf "%s" -Dcontainers=3Dtrue ;; --disable-containers) printf "%s" -Dcontainers=3Dfalse ;; --enable-coreaudio) printf "%s" -Dcoreaudio=3Denabled ;; diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0adddb6a5c6..74bf471f171 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,9 +11,7 @@ USER =3D $(if $(NOUSER),,$(shell id -un)) UID =3D $(if $(NOUSER),,$(shell id -u)) =20 DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles -ifeq ($(HOST_ARCH),x86_64) -DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-project/qemu -endif +DOCKER_DEFAULT_REGISTRY ?=3D registry.gitlab.com/qemu-project/qemu DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 CONTAINER_COMMAND ?=3D $(shell $(SRC_PATH)/tests/docker/docker.py probe) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 5819fdf0bf3..482de73ac72 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -101,6 +101,9 @@ if get_option('containers') endif endif tcg_tests_summary +=3D {'container command': container_command} +if get_option('container_registry') !=3D '' + tcg_tests_summary +=3D {'container registry': get_option('container_regi= stry')} +endif =20 # plugins come first, as we need to build the list test_plugins =3D {} @@ -257,6 +260,9 @@ foreach target, plan: tcg_tests if cc_dockerfile not in image_targets and has_docker cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, '--add-current-user'] + if get_option('container_registry') !=3D '' + cmd +=3D ['--registry', get_option('container_registry')] + endif t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741545; cv=none; d=zohomail.com; s=zohoarc; b=AU4ikcJLNFpCqTFef4RzWhG92v+lM8hd9UNJWN6jso2nZE0oRbdJfDcy03Q9cH3lQghRbxTEa/Mocoe1mWdQPym+uZV5anyQFJHX7LxHdRaHVrvUEsdvxTe70EQvxrtxrNTGbSNFh7wxpQ/hkfDzXejg3GnaEAnxGefSWd4HViA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741545; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3wung1AfGiKZuM1H9CX1YqJ2dUNZTd8PQRVx9YSOo6M=; b=V2oku6S+My2Qg8t+Z1CFSFc4mea3dZRmRwNX1hQurR7G8IMUdfmj5yiwGICKXRK5qWdzBw8IjfWeXyYnq5aopjpXrcUoja6FBkT8gdrbS5O2UkdOfms6SDMSlCzM5fbl1GXLdIWHCJVmt+HJ3d1mws6doB7xIegI0N4IQWvS29g= 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 1789741545119372.6057084958386; Fri, 18 Sep 2026 07:25:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWj-0006Gp-34; Fri, 18 Sep 2026 10:25:21 -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 1x7ZWD-0005nQ-VA for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:55 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZWB-0007r5-Ru for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:49 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e8185e037so4909635e9.3 for ; Fri, 18 Sep 2026 07:24:47 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc7d46399sm77551175e9.12.2026.09.18.07.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C0AA95FC7A; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741486; x=1790346286; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=3wung1AfGiKZuM1H9CX1YqJ2dUNZTd8PQRVx9YSOo6M=; b=sUwhpVh2mLYkBlvqXvd1YOmAmJMOi2Kr9n2rtZfg+Z/zXNUKJisI0wJKzPU/lnVjfK XWxXWBkRKN+Wm6f4IC/ohsaJWEyeDMObvwdiSmMy9XAh62IjaWM+UvMOSltmh73bo3Rj ugPO3pqpXtWlTgazGpK1jGPjf6LmmPKfmesGxV+juLnfU+org3/OCU1EmZVAoFre86hQ RW/ujcYP4bqOUy4pyYfBT2ZAA2Of1P3eO1bJxfUZPxWxNS1JFXpncJ+GsUeyHws5sNUA dq0TkI3oGQ7YWhJJrCI1r/FY7FBTXhALSChaY+hFl0MAHD84H/xQql2CK+5qfvtQVxw4 sslw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741486; x=1790346286; h=content-transfer-encoding:content-type: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 :content-type; bh=3wung1AfGiKZuM1H9CX1YqJ2dUNZTd8PQRVx9YSOo6M=; b=066IOrQCdur7QY6xA+hWPO8VLG+TQx+ngkIZeOqZ5g49wiUqvxp8rFIwNEOGJuKkUC r71wE2RRKC2XlTk8PAJsLYTbFHcvhJco1SyGhlCVP2WZ5vyqm0qu+G9IkwEV5Rq6faNK rHxargfVO34KPDCh1d7H1g/+iwB3u+mVDai6m+faQAiZ/apGNfShA6faGwfne8WY3oa4 Qg+DkUOaeDaRnZh4rigxPQlFQqUsx3sVOcDykasz0450ldGXmrEe/Nr3/pzNkkTt0RJG aLgI1+akhTGVvTHUfCgTowY1LhjEMppEtR49ktRIC7vTHBLd/Rc04AIksxBDm6SHOiab sxbg== X-Gm-Message-State: AFuF++ldIT9a3FGhv8wwWuB8AP85jwCwZ72PKLldvC/pFmb3vqQU15nx 7ykfe276xykvttBg4bfFfn2nQJxp89oS50PewDKs+HOlVI59zIxbRe/ufEjtj1xTleM= X-Gm-Gg: AYBFou3AzJ6DNuhbbslLmJSvSOEZVHWXkg7BgYzt3nUYFL0klFVDr0iOcwtJsN60TWN ii2LvJ8UhzkUfQAL2GmALEUPsAMP13qV5oA41rdlzPj3P6g9a2MIuCHRG30QM9yT/pXZZqyEI18 T4NTBDz8M73QFLP1E9HQNIweQ3Y0hGxCZhA5ORoNJO01xwkaIUWsmyIPuljlN+mpcKjkl2xUGYS IRLUmoOjugi9a9Df7TX4cZ4XzlOHcTDVKwl4+GEIWZ0OR8cY5QqVe9lYZn3bwVaugbKtXGkL9uB WA+NFD6zPLSiePSkWch6IFxkiT0uh7tbuV0eBYEZOjdmAPXW+p1MqEZzA8xRCBhyZ3/xu8tuuWV 6BIQW6VFF8o6sLFkDvD1kcA0li5ci7myLRN8PBlz2beDG73NNHqJLuXDTPNtf+CX2bKjk4p7Lmk suDOxU4fabmqpERmsSwDmMl6DWFH1y1o5x4gyAyY/MYvn5yLx0vYaOQYt1PlfNbCDBX8+RHu1kJ LwYtkQmSg== X-Received: by 2002:a05:600c:1989:b0:49c:e42b:a4ac with SMTP id 5b1f17b1804b1-49fc5714d14mr37659425e9.11.1789741486482; Fri, 18 Sep 2026 07:24:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Pierrick Bouvier Subject: [PULL 11/17] tests/docker: remove used _read_qemu_dockerfile Date: Fri, 18 Sep 2026 15:24:22 +0100 Message-ID: <20260918142429.336497-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.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, 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: 1789741546254158500 This is no longer needed since the functionality using it was removed. Fixes: 07056db1b50 (tests/docker: remove FROM qemu/ support from docker.py) Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-11-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6090a9dc957..fd0cbdfe856 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -175,16 +175,6 @@ def _check_binfmt_misc(executable): return interp, True =20 =20 -def _read_qemu_dockerfile(img_name): - # special case for Debian linux-user images - if img_name.startswith("debian") and img_name.endswith("user"): - img_name =3D "debian-bootstrap" - - df =3D os.path.join(os.path.dirname(__file__), "dockerfiles", - img_name + ".docker") - return _read_dockerfile(df) - - def _dockerfile_verify_flat(df): "Verify we do not include other qemu/ layers" for l in df.splitlines(): --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741577; cv=none; d=zohomail.com; s=zohoarc; b=Dho3xTtUltiaCYpspIQ7pFSlc8OfgHl3uljo5P1mGxneDCBXxUJ8wmkJad92O6+6do0DfBwMsPZuHZ5d8Ce2AWvcdkEgcjbpaBAhfbIUjYSZ2j3GSK2ijeCbOpyiDuQ+dZreFtNqROBVC9MiFx3WicuidmJOusY42uyi5KuXgjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741577; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Bb+3yGL+ssGZS3JwUTq61gT9ppntoVMqPfYZY4KfhEc=; b=DV2UCssI8CNV0Xf9vA2Yw9xhVLzbKtb/o/oI3uQTkk2jy/hh+osb9f8fH9gk2K/ZlhmUxzqyxSAKwLjGmy43ypT2Hy5BQFfztDbwsaPui/3cRo0z1J+fN3oCgkJakMke0dxY4YFC8CMqbkCjvxlYgLNUBCHEoPJIQS12DbrXIvM= 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 1789741577324250.77193218098603; Fri, 18 Sep 2026 07:26:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWj-0006Jb-QU; Fri, 18 Sep 2026 10:25:21 -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 1x7ZWF-0005nS-E3 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:55 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZWD-0007rP-Nt for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:51 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e6b885ef8so4829855e9.1 for ; Fri, 18 Sep 2026 07:24:49 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd1d0d0bsm158133615e9.1.2026.09.18.07.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:37 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D913E5FC99; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741488; x=1790346288; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Bb+3yGL+ssGZS3JwUTq61gT9ppntoVMqPfYZY4KfhEc=; b=NugKNE7pIfLgtYXgi1nqujcxDXWo4G3FxpV8vPkbuK4jqbL/3XGOqLoxWd5lo2s425 79C+QSIx9phuiYMMFha/Hw6l5pc+PQkbPyE30svHSHk7+nVfyID4EZniXtWRuN3aqtjK RkdPtVBdOFrHwqLh9MXVBEc12wtlrCmRPc2R96gtTNukgnkBVB0Rlg9ajWSVPG/b0URk PitjyY5E2k8WzAl81cU5JnrIpuRnfzrw8d/uxYoz5kYdpfzsPjPoCFt4kj/d5VMK72tB zwyhvxiZ6k2v7LryDs/mFmPD/ht74UBMOlooCyqSxs1v+EGkVYiWC5D0SICBoajdmwwu bA5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741488; x=1790346288; h=content-transfer-encoding:content-type: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 :content-type; bh=Bb+3yGL+ssGZS3JwUTq61gT9ppntoVMqPfYZY4KfhEc=; b=FGBl189U2+zvVrh7C21WG7dtODWQ6mwkJR4Skv9zJNeAQRNDrtvFIZqTSa0R1QUH05 P8kpMKuAd6UW0whXEs0aXgYCsuXgDmh0hZ4WvvqF/Ppmi7H4JU3nfwwo70F+TuccITqy nrt4pdSbOZGNoGGDhXLC9sGn9z6+N5rK5YD3hKDkWrd25QYskNu4blr86xCdAKrojxoZ BaIo3kaOP1+flLajz9UewIeICUeAdERPNLMC32xiZowRNnEwDULxX+lzNPieqoiKq/XC eNzr80rHEKj/VQ0ziDvtTDmc7jttXKVMY9jwEvnFyeptJr2bzLBmh4OluB3mwuZj3vUQ 8Luw== X-Gm-Message-State: AFuF++lhEzSaWa5/jxEXqNalESW9SrcnEFgD8PPX0nqxmmTVQ6vkUszq tWKfP70A3coNyGya97jgYCHBQ62OvIFY86HkeU320hkQ27iSqGOHvgpcFiIhUXRcxNs= X-Gm-Gg: AYBFou2PRYymnlMYamm/ezw8eawRtmmUIqh1XBU2aDN6Kmjeo+642YgCxpd4IhSLpAs URts9eM9jF0oQ/6cPq+cCBF9ba7T9Yh16iP3fvrCRMBfaeXQrbexocUJFyeE7fKb4jU2pzp95Qc KqbudqGU+1b7OlOhFNwUzR/qtTRyKIjm0dt00jwYnfk6qxutFPuZNqMrIM1qKRLc8V/WfPyUKCG jWuRNSCtHB+Cj12fU473WKhDyUIzZ6Hyl/Ffkz8bqpnwsMngfoarXrEO26XkadpwRpVR3R2IPjy eiHA8JCWN36rdHBEjwvvFmqKzczqDM8nao/8aNS2lhfPWZoF85dcrZFXyf673ZPO00N1Zd4Q2xo cOR9iYkCuNvUdk1MaKhuWEDcH8nDcv4JaUF3ETkrLNydDI5HLUKTbL3Beu4CyZ5mrQdcnjSn/Aj lzQHFjeNYdk+LBrsLd3yi1PuU7G7Ec7vnLb2ofDKRxZJ+i9fftZqlR5iC+Md+9Gvw/dJtG71c= X-Received: by 2002:a05:600c:4e53:b0:49e:715e:ec1f with SMTP id 5b1f17b1804b1-49fc5757378mr36044745e9.30.1789741488074; Fri, 18 Sep 2026 07:24:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Pierrick Bouvier , Peter Maydell Subject: [PULL 12/17] tests/docker: add specific command to parser Date: Fri, 18 Sep 2026 15:24:23 +0100 Message-ID: <20260918142429.336497-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.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, 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: 1789741578633158500 A future change will want to use additional flags which clash with docker/podman command lines. Currently they would get snarfed up by argparser. Make the pass-through commands explicit to avoid this. Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-13-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-sca= n/run-coverity-scan index 2f9ccd5e44b..0e1361606e0 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -381,7 +381,7 @@ if [ "$DOCKER" =3D yes ]; then # Arrange for this docker run to get access to the sources with -v. # We pass through all the configuration from the outer script to the i= nner. export COVERITY_EMAIL COVERITY_BUILD_CMD - tests/docker/docker.py run -it --env COVERITY_EMAIL --env COVERITY_BUI= LD_CMD \ + tests/docker/docker.py run -- -it --env COVERITY_EMAIL --env COVERITY_= BUILD_CMD \ -v "$SECRETDIR:/work" coverity-scanner \ ./run-coverity-scan --version "$VERSION" \ --description "$DESCRIPTION" $ARGS --tokenfile /work/token \ diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fd0cbdfe856..d97dda26967 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -379,9 +379,12 @@ def args(self, parser): help=3D"Don't remove image when command comple= tes") parser.add_argument("--run-as-current-user", action=3D"store_true", help=3D"Run container using the current user's= uid") + parser.add_argument('cmd', nargs=3D'*', + help=3D"""The command to run. You should prece= de with + -- to avoid confusion about its flags""") =20 def run(self, args, argv): - return Docker(args.command).run(argv, args.keep, quiet=3Dargs.quie= t, + return Docker(args.command).run(args.cmd, args.keep, quiet=3Dargs.= quiet, as_user=3Dargs.run_as_current_user) =20 =20 diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 482de73ac72..053ef147df0 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -275,7 +275,7 @@ foreach target, plan: tcg_tests mount =3D meson.project_source_root() mount =3D mount + ':' + mount here =3D meson.project_build_root() - cc =3D [docker_wrapper, 'run', '--run-as-current-user', + cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', '-w', here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741601; cv=none; d=zohomail.com; s=zohoarc; b=fUtsZgh1pfrsAqZTh3xGnAueFcXpEbRxksVzqjW1YbGP4QWLp1/OniPvEw/HHAuqjTwwuD8ttUoi6CfHUJWLzLjfwEJXIbMamS9qyklTC13O5YU1aLfFWdNOB4OVL2dS+V5vMLURtsnfFpQJrO/1fknsThZZSNnY2tPu2h5tRRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741601; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=X+YjhGcrQ+GJnmWZAYA/s/pZF92nX5g568920hp4YVI=; b=RQ4dBkQEsdiEbrUinW1yYxhgOusoK5xVY8f/vRs2QI7NYfOuMaejfB5du3gh40K5ta7eK3SBn2oieogAKn8iACWKRKM9p8eDxjELqfGS7JhsDS+tY3UeeVMR6jO17h3uxmk6WOSDWv70+NApcAIA7Ei7FBSi7sXCGUjk/uG11SY= 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 1789741601502423.8637799161751; Fri, 18 Sep 2026 07:26:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWh-0006Eb-5g; Fri, 18 Sep 2026 10:25:19 -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 1x7ZWJ-0005oK-PZ for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:57 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZWI-0007rz-4N for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:55 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso6528725e9.2 for ; Fri, 18 Sep 2026 07:24:53 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc471b9a2sm34670595e9.0.2026.09.18.07.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EE9725FCA7; Fri, 18 Sep 2026 15:24:30 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741493; x=1790346293; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=X+YjhGcrQ+GJnmWZAYA/s/pZF92nX5g568920hp4YVI=; b=qnFhte+zRyy5CQ6W+AH6a+G1JX0BnOe7GuCxICuz9H11zWvCy2rh/QPX0LjCFEZ5jT KVQPfm6No9wbHSdXhpLPh+liYV5bs5Ic/ohyUPh8/kCmGhBxl4xpSJNd7DUwmC0cQFUf YhVhsMMD6SzkzRA5+pPcxqAJBIbT64BBdgQv7LwGjfGOLEOuQne3nM6HBfBbqfeZRjT9 fUWI+QX740mGAxvbmzs3weAQrSNy4U1i2cncV+RdtYqKYumNyutgi3J2Q6/RfwtNZ6Yw Og2zrqbLNIaio4guADqpsAHdxhhpzMjHRaFIg209KeHaC3Ud76Ia76O2czCjieBjJnJs Ua2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741493; x=1790346293; h=content-transfer-encoding:content-type: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 :content-type; bh=X+YjhGcrQ+GJnmWZAYA/s/pZF92nX5g568920hp4YVI=; b=1VYoecrDqJjY/IcFTt6sYSow498M9CcnhTkMXNqTEuICXSAKFFZPxm904tJ/Rw9I70 VQa8XmLjAPSa/hEc3mgmL5+7kIMEO/hOb/s9lOybBv5bEj+sSXX58LDD1uq7E9xuBpVc Suqg10NRezsExS8lw1jgl4p1QSb6B9hLolOO2fEQ7AfqLUB26eD2Dz/NVEpOOp9ZUo52 wU1tH3CDPMgYbyXxh4drrAxFfHwKOo/mdbwkDRqB5Tn7pByH6bZihD0yUg43AxZLWVQ+ lOkdYAV1qh+/ry5GqTkH+sb0Dj1W1rwrT/uUhVq5kOT6VLxAfohxZ081eiDHCgJ6pN99 8Bzg== X-Gm-Message-State: AFuF++nfEkqTsN/6qc4KJ4Om8tiZMJMXNskKBNK58V4z/PbVjYgXM7/z xhaolDKqGULiRQlBe81qeuhhVyPXvAUkXjLCqO6UaEKFijLDzmuaCR8HJXKD3s6/gD1YGC4JOUg QNvaX X-Gm-Gg: AYBFou3AYBdYhJ1qi0U/irUNzJPOyD5XgzYx8HARH6aTewxZoYlDack7WF/LlDofooe wqOdZOERZh84TY5WgVuyNXFmlpnSmJJHtAFp4BGg88b+zlril8WbPPdk0x40xLBx2almTm09BU5 s6n4QEV6FlsMI23vaePCPeJSWLf2L/DiUDFi7bI04Jjl+7nLsEwi2Bm6LIQGAjmy7ugeHKXA0gZ tX/xYsZ+0yoRLOD9MeY9MhUOyh9IZsEzJNnF4WQ3odmh1RJVtxzCVvmgAwzZmNL+Y2y//GDMwUM vFD/2deYx1FLW2jtuEyUmg3U+8kf196LW9a7EFvXanjMKd5aXld4i/OI4zC4USpPzJXOBtcbTjS XBTomCUEaTC3FzWOxgHRXfpurrthFPzcpkIqi46f0M2JwBEWjeyAjfG1SbskhwkFHPDhVNJgYBh gEn7buBvKbOslSk5VPXYo6r0aBylwru1NL19pnekCFYvsWW1w1WzGNf7bwivDu2WvMROPK8mU= X-Received: by 2002:a05:600c:1d29:b0:49e:7c8c:361d with SMTP id 5b1f17b1804b1-49fc572b7afmr38102395e9.22.1789741492780; Fri, 18 Sep 2026 07:24:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Anders Roxell , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 13/17] tests/docker: fix ccache directory variable expansion Date: Fri, 18 Sep 2026 15:24:24 +0100 Message-ID: <20260918142429.336497-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.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, 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: 1789741602573158500 From: Anders Roxell DOCKER_QEMU_CCACHE_DIR is missing $() around DOCKER_QEMU_CACHE_DIR, so $HOME/.cache/qemu is never created. podman then fails to mount it: Error: statfs /home/user/.cache/qemu: no such file or directory It only works if the directory already exists. Add the missing $(). Fixes: 8a1975e4d44b ("tests/docker: expose $HOME/.cache/qemu as docker volu= me") Signed-off-by: Anders Roxell Message-ID: <20260915072403.347639-1-anders.roxell@linaro.org> Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-14-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74bf471f171..9237a0dbe7f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -197,7 +197,7 @@ docker-help: docker # Where QEMU caches build artefacts DOCKER_QEMU_CACHE_DIR :=3D $$HOME/.cache/qemu # Use a global constant ccache directory to speed up repetitive builds -DOCKER_QEMU_CCACHE_DIR :=3D DOCKER_QEMU_CACHE_DIR/docker-ccache +DOCKER_QEMU_CCACHE_DIR :=3D $(DOCKER_QEMU_CACHE_DIR)/docker-ccache =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789741601; cv=none; d=zohomail.com; s=zohoarc; b=Sk7ZIF6TcPoACEDRVPSpEoKdFrSAR6i7xKDiZKMosKjytHzRNPuDfVpW9uj6Zw5wezVyGPq3rJLhauZu98/x2LH0fqcy67x3novgXHCoDgdw4GnM+riXvLG8i8qYe+3zI3Q4MW9R91FvtTAWhhK3NCQRwqn22b10TQnhC2HodLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789741601; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XdDcSvYFLlowF6oq4e9Gb43a2+KrP1+9GG5FmheqJ8o=; b=K3RiJiYSE8PK4ONRCMP8SftGycosX/RgLpt0LkTyt5oDKo/r16sLxoiQsSifHFSe+v2XDGQ7ykmJ9szpjWGvEiZ+Ud2wkRsLyMiw0tKZZoz4AFsmAP4sE2W4dQLTh0ce1IB9kMw2FAKQrvhnkLn1XdeLitKWoEh2auVIAptIBoU= 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 1789741601542266.6623631384806; Fri, 18 Sep 2026 07:26:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZWm-0006Qq-15; Fri, 18 Sep 2026 10:25:24 -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 1x7ZWK-0005oS-OT for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:58 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZWJ-0007s3-26 for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:24:56 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-485933b2522so561805f8f.0 for ; Fri, 18 Sep 2026 07:24:54 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4872008023dsm4350217f8f.29.2026.09.18.07.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:24:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1192C5FCA8; Fri, 18 Sep 2026 15:24:31 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741493; x=1790346293; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=XdDcSvYFLlowF6oq4e9Gb43a2+KrP1+9GG5FmheqJ8o=; b=fKIu0Tui2X1jBUXD5XI0Fj8LdoCejQ9I2yoKvY9e972wAzIjlEsyKzKPJbh9V8Jsao AfmnNCtJd7L5OWhLINOLh5r3DL6ocGxHXOHSSVQRROo+FNuhaY3PINihv0iXAQMw60KJ T9hHe0H6K4OxwCqtpYmOVPd8uSh+TCdWDtKn0ZfSJU46FxTKnph7Bll13e5AA8R4Kvre VfV/Z3guGxq1MdgpZCaFiLt04WUzUGvPD10JictWzeU0o2VPcBjAwGB0tBz9KfawSH4m 16wJiqDuuG3i5ZvzKsL7Tcc9fdnwiqTIDLKn0c4UuoqhfcwFYzPt4uVlbsaL4r2k7vbR t49g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741493; x=1790346293; h=content-transfer-encoding:content-type: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 :content-type; bh=XdDcSvYFLlowF6oq4e9Gb43a2+KrP1+9GG5FmheqJ8o=; b=UVwfmXy5n2oJZ/09oiJkxKGr3DxRDzDPmrGcwTE/BQ+vztgoNy91kuLv7vtoiGCwST 5LrufO57CYs6RqeOrOM6oODbpDgy3PPnZChx8cBX8BVnvH5/qY+oFb3HCnF4nJZ1Ew4e ufU/7Tw+MBSXUvNRqdo0/8Sz6osC5bdXg+796dNdXyzZBNRbmW9VMYfb61YU4Cec95P0 TdRFjF5txuB3w/ZEtbCkZtOZotSrjKxEx0T32X1wFRyDn/kUM+LcPYUh+gnN/0Rg+uFC F/WAzXJ/oehjCF7p+xR7raWHxLjkRMHcIHu9F8h7aGy9LPPWegA6t1GXX+CkG+yQjIo1 /QZg== X-Gm-Message-State: AFuF++kvhN/lrh4r6RM/nA3ZODREUdhhV5uX1LqNYs/ioEcozv7k+WaD Wu8PqQr3QCivfhFnwUGSX9+BNsMxRivMGta7nNGuyW1BpGWum+lQuD40mxnhummagFM= X-Gm-Gg: AYBFou1uBVkG1fZ0Gr0rnprqqZGP57cCUHxPhRcQKSdaJP5FTizHaqDuCn9yFT+ZbfZ pzCiA+jGe5dYN+U8a71tbzvsQFkJRuhurBILsldJ71SiauEUKzY4GwwxuUq4xl4rKBo0N5a0vWq IhmELA0Dwaxc0rfo5BlH6RZnwGyu4VZl/enV9DIGNKuBjafeqtFqPEPRx5zCL9C5bmqq/87MITe FJ7M5ON3XqVOKKXGcsVztCAUmpxpvSaogpNbdODlYJyL80BNlZPcUcAFIPXJkulGIam+RepYmcp 4V52jK8k2gLTJlnWF+e8/JFqofChUk0uKFTDJW32mx2k4mzZ1Tcisqr8Dut3vJTFm+ZhWqVhrkh vQgIdyWjKS4bmIx+3hJDCb1FQo5g8ToGfr02JMiMvTDX7T1ESjj4koZMzsYVbfxdh2WGeLStM4F W+xTjEV0VsmvYtK9rw8U0OmFOwaCLHNWqXK+m0puByaWJfX8RTOCbHTV6T1IL9OOl/Be1Tk3o= X-Received: by 2002:a05:6000:4283:b0:487:bef:31cb with SMTP id ffacd0b85a97d-4871e377669mr7967851f8f.22.1789741493626; Fri, 18 Sep 2026 07:24:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Richard Henderson , Amit Machhiwal Subject: [PULL 14/17] gitlab: update the @user id mapping file Date: Fri, 18 Sep 2026 15:24:25 +0100 Message-ID: <20260918142429.336497-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:30::10; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-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: 1789741602596158500 I needed to fix a POSIX-ism in the script as well. Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Richard Henderson Acked-by: Amit Machhiwal Message-ID: <20260917165602.3405537-15-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/.gitlab-map-auto b/.gitlab-map-auto index 28ce448f1bf..3f717a15d4e 100644 --- a/.gitlab-map-auto +++ b/.gitlab-map-auto @@ -12,11 +12,12 @@ a1xndr Alexander Bulekov adi-g15-ibm Aditya Gupta agraf Alexander Graf alex.williamson Alex Williamson -aliang1 Aihua Liang alistair23 Alistair Francis +amachhiw Amit Machhiwal anisinha Ani Sinha anthony-linaro Anthony Roberts anthonyper Anthony PERARD +aroxell Anders Roxell berrange Daniel P. Berrang=C3=A9 birkelund Klaus Jensen bonzini Paolo Bonzini @@ -36,10 +37,10 @@ dwmw2 David Woodhouse eauger1 Eric Auger ebblake Eric Blake edgar.iglesias Edgar E. Iglesias +efarman Eric Farman ehabkost Eduardo Habkost eldondev Eldon epilys Manos Pitsidianakis -famzheng Fam Zheng farosas Fabiano Rosas gautammenghani Gautam Menghani gkurz Greg Kurz @@ -51,7 +52,6 @@ imammedo Igor Mammedov jasowang Jason Wang jmacarthur Jim MacArthur jsnow John Snow -juan.quintela Juan Quintela kbastian-qemu Bastian Koppelmann kmwolf Kevin Wolf kostyanf14 Kostiantyn Kostiuk @@ -67,6 +67,7 @@ mauromatteo.cascella Mauro Matteo Cascella mcayland Mark Cave-Ayland mdroth Michael Roth mediouni-m M. Mediouni +mjrosato Matthew Rosato mjt0k Michael Tokarev mstredhat MST npiggin npiggin @@ -79,6 +80,7 @@ pipo.sk Peter Krempa pkrempa Peter Krempa (work) pm215 Peter Maydell qemu-janitor Qemu Janitor +raphael.s.norwitz Raphael Norwitz rathc Chinmay Rath rth7680 Richard Henderson schoenebeck Christian Schoenebeck diff --git a/scripts/gitlab-map-update b/scripts/gitlab-map-update index c134c226aa2..743ad11900d 100755 --- a/scripts/gitlab-map-update +++ b/scripts/gitlab-map-update @@ -33,7 +33,7 @@ glab api --paginate /projects/qemu-project%2fqemu/members= | \ .gitlab-map-auto.tmp test $? !=3D 0 && fail=3D1 =20 -if test $fail =3D=3D 0 +if test $fail -eq 0 then grep '^#' .gitlab-map-auto > .gitlab-map-auto.new LC_ALL=3DC sort .gitlab-map-auto.tmp | uniq >> .gitlab-map-auto.new --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789742023; cv=none; d=zohomail.com; s=zohoarc; b=HW1QRp4qauyb1vGnPa96hh82QPnpEnUsXXwS8xcZ3ia10ht/6lzSpe0eWQo5cm8v69bb5HjHZbt+hx4ol0GOExfX/hTNa4CTqHbmF8RtY8Ty2QwW5DEa6YmlVLsv1UvxJDJoVznVnJDs4Nt5W91isWd7amNE0+e1SC0lPaSuoCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789742023; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XiDM53/ykS6QcI60fFUTaIdtnIPywKAHlvgyNFnLQMw=; b=FD6FLkUBpw/mu0HroXEf7UqMydVwjO4YsfLFN2DzR7XSeAxHsRwyUnRnmRqDhLrSKbsalV65ap7kF49Eda+6QQUyPtU6vE8PTgLx5u5hrj3Y2VNTVfqrS9FvU/tlqoK5r7vkiXjdaLo/+hvFW+bOEhjsHHfj/NwRaSzdFljWK3w= 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 1789742023048768.6085846058032; Fri, 18 Sep 2026 07:33:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZeP-0003F4-FJ; Fri, 18 Sep 2026 10:33:17 -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 1x7ZeM-0003Eg-9U for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:14 -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 1x7ZeK-00010n-SP for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:14 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b965f447cso7169155e9.3 for ; Fri, 18 Sep 2026 07:33:12 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc56aab7csm44241325e9.1.2026.09.18.07.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:33:09 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2B0805FCB8; Fri, 18 Sep 2026 15:24:31 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741991; x=1790346791; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=XiDM53/ykS6QcI60fFUTaIdtnIPywKAHlvgyNFnLQMw=; b=zV9+1AfneEETGUz/EfZTvDutnWpGnY2Y9QjQ/ZNd+4VO2hF/E8rNcIXkWVOWBc00+K ujIGSAiWeyeb0tGlwY3U/jjLVv6pCAi2kJ5Br9TQksiyVT5r+JyGo2r4nyPnNiHMMnna J5clN59Vpmb2SoKKyfrtymHl4oXYv1p+N4UbposCkeN8KZVZrb/3CGKP+YGY47CzJc2b rvNeeTUJChEk/pJ8nvEz3phLREZYvHSJQXYibScgQZkhDmDYPc1i+xrTN8wj/o/0jPw7 Dhvu4LTw6FV7gkTWvgAFrGgKKFhUhqYpGpPg56J/eY07z1NTcj/g8lqf1N/vQDQmZYLr Xtlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741991; x=1790346791; h=content-transfer-encoding:content-type: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 :content-type; bh=XiDM53/ykS6QcI60fFUTaIdtnIPywKAHlvgyNFnLQMw=; b=Pv8S3UAQPVVDcqSl6ZZS3s86u/v8WDbNiLOqO2Kci72kLuvD+zDbV2vGzp9vUq97Xw lp6XyU2fkCn0Csc/CfW72CRtMcri2Lvqy0NK+qMI0BIua9J/PLZRdvoPFpk2thgATJvW dLFDVtB8fL296IzjYTcDMV3sVhBjj3nEREmPlMIx5JNYwnVRXt+EZNIhXk5EtZLpSlec AHqgQC+vF254E8pmfcF4O3qRYpdVyheEuZ46gYySHkYHjB8xXAJmq6cD7AIfI11QWcZH 9rfzJLrd/3MNBxVZhmJMhoie2P3NTGyBJSTsGl4VHaz9FDecdY2rZyr4LLvHq2k3GJWM SnLw== X-Gm-Message-State: AFuF++mVRaJThDZzo2M8y3ryoa52p/h7AI9AMtymOnaz867o6kSZBCcd gCMUFfkK7SMwPvj0/CwMTsZEC4r4UzL1VNdXLYei4/GPlMdLPX0mnP1FJcnSnvPPxu9LUXdk5eV +TfbE X-Gm-Gg: AYBFou1EkRs9nmMKbLk2aNl574JXcIqIXv8LLlfk8RZjOBfwB5pVN4kvfpFUw6oUaK1 /AnoJEoAdsS/kZSyNCaNJWeBNd2dw+4CfO7MG6VuJBf0/w1CNoFMhWzorww0A1FAkiSoOiCvVjr 5xSMGQXByR6/0sOtqTrIiepSuZ+ei5xQLsJ3W/P1TXKm3v9tNGwAS6Tv9MTnWwxD7tujQn3f/Sw /orQN66hp1leFQwUIyVnYF7Z8mgPhgS8KmdoO41KR8J9DeukKsWcIhFbhE469rgvc+q9lWHzOHj b/Tahz2sht5q0xpSpvnoSaP5lq9pF8RO/u7Z9tWIGA9oSNUpZkJqHMsSB5+Y26MPbcSwJbFeZ1b NiO4Z5vk2kcAFd0rro5tZG2LPrUPPNaMqbxV3U6vPVBRfWq5+xR3JRxHloeMpz97Dip7YWczXZI j3px+2focGEJwESJeADhE5N1Ra+bGL/cJjhe/NvKHS1ESW9LMBP36TEtPbyRIyfm1QNQjLBVY= X-Received: by 2002:a05:600c:358a:b0:49c:fa20:cc08 with SMTP id 5b1f17b1804b1-49fc5741844mr43849115e9.31.1789741991530; Fri, 18 Sep 2026 07:33:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 15/17] tests/tcg: add console property to docker image custom target Date: Fri, 18 Sep 2026 15:24:26 +0100 Message-ID: <20260918142429.336497-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789742024058158500 According to the meson docs this serialises the target in a special "console" pool which also disables the buffering of stdout. This helps avoid the appearance of a massive stall when a docker image is built. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Suggested-by: Daniel P. Berrang=C3=A9 Message-ID: <20260917165602.3405537-16-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 053ef147df0..95f533b0ab5 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -265,6 +265,7 @@ foreach target, plan: tcg_tests endif t =3D custom_target(image_name, command: cmd, build_by_default: false, + console: true, output: 'no_output_' + image_name) image_targets +=3D {cc_dockerfile: t} endif --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789742042; cv=none; d=zohomail.com; s=zohoarc; b=bkVf7T9jhMwrVd7hMeqVMW2UUSLu6yCdV2QR62Sve1viM3uhALO9RyP/o/nN2hX1dQ/9yY8qZHSVU2TC5sLRCQ6g+dnQUmJ80k18z9Ke375sgNv4mKR0/5+ERMPsCcfbxYVp8/hyvjfWrf5jw8JqGkSgiwcrBC02sTcQVe2eFTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789742042; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RwP+h7pDqlYb0NaLEwModw+C9+r42ewNCJmmzgjaCls=; b=buVJjjdYqJRMcmLmjVVy0J5EIP3+J3BCQsXuq+e3b7ac4Ph6t69jJeoDh3H/J/Zby8Zpubh4KButbXLtS8t9C4coSACEaBYIREbGWLXeAMuKcT+b5Tbqdle5Tkrdn48ENZSdRWPENOVLa1BSrZO5f0JKxd4iw9QMauuiQliYiz0= 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 178974204199775.40640741749337; Fri, 18 Sep 2026 07:34:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZeS-0003Ge-5U; Fri, 18 Sep 2026 10:33:20 -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 1x7ZeO-0003F3-MN for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:16 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7ZeN-00010y-6m for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:16 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-485ac898fa4so705104f8f.0 for ; Fri, 18 Sep 2026 07:33:14 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48720072501sm4457218f8f.22.2026.09.18.07.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:33:09 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4062A5FCC6; Fri, 18 Sep 2026 15:24:31 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741993; x=1790346793; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=RwP+h7pDqlYb0NaLEwModw+C9+r42ewNCJmmzgjaCls=; b=T3EBEmbByW09LlYn3M7BtJsf3NZ9HNyOY9spUV8lbMYode7ACusQoZ1gMgpI0/0Y15 bKapAwusJpZjT0jr7GyjsCazfTqTpZnCE/k/BmkSffa7UPWWQ4iNI0hVNeUorTde/S9m /9d3ke/Hkb9V5BnZqEXWWlUUifBnWCby4kEv/t/qDzmvNVhq+0UR6q06cxLBPHt3eWfD pU+NmbJeQZtrGTUpqoZzteZ0b9DnWq3M5+yoTs126/19CGXAgnZtQ6v7Y73T5eDSzXmm qse2L6DyAOwWahjSJPQFyo5zmk2PNopulzagndVaSV+uoPP4wsRVgO+szdklghRU/UaF L0lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741993; x=1790346793; h=content-transfer-encoding:content-type: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 :content-type; bh=RwP+h7pDqlYb0NaLEwModw+C9+r42ewNCJmmzgjaCls=; b=j1oR4aovD/qPtEIYLoPib9KIT3/dm26qguD1unkoW/HouAILwqsx9SpLON5oXxrKjC 0H7ltoXx3UCM9TDYjmKhljkN8amQ+d9GyDuifO6f63+5FCY/sm5YwErkeknfMAdsy039 3ta2toUA0b4l9pVeP3WDdbsSA7FRS0nwyM+UhPdnlFsWnsv8VlT3xLFs85aQpR/xVUjt B6l0+bZbnNeRVsvETxOYSFCZCp86/Wk1jQNpW+F7d8mhbYts0gsY7RcD1RzZKyh7noxG 3XTm6Ay3jBsoi7Rtik2uBmUyyjV3G/bwh75euDISswHcQDhchzXf0B6p0L8p96CZaEly Wirw== X-Gm-Message-State: AFuF++l59nCT4HTJ4mmpwR6on405McSQKaZ1KnJSBWwTAPxIBYRvznLa RD/ZjyitN4FsaaD8Lis/0/LX08bQBuwDEH9GISzmyJ/QZEfbYkgCtv4s2hIOABqReBM= X-Gm-Gg: AYBFou3l3xRhNQHFCvfpA7uEzFlZjTPIGhVj386g0dVZIBFcTSMGHC8D0xDQp4MzlAn bNKFu/w2JPpOx6i4o80IeJm/c3xV++YC0Cw+rI/5LxOrnpbKVfbi28UJOoDdmiWkRz72wQm3exL nYWMIBUH4XKuiSH68dF7Zccf0MRiUfD+sDO9fJmVsjNY9g+MaBs/TOGNi/y1iJ86OVgOPl35hs6 SWt6gIwR3TgdwiRkql3Va3jMa45igaz2He4zeJGy3ZRgwXsm7lgkxVCnXtqi8d+A+XLKhoc7gLD qC8FNcNspoGOWs2gz3BE9Ah8YWzfNJzl0plsUaS7dmS1F9GoTLTotmvEzfBe0WrM/yV/PEaVHrl nRDGFkOLBw7bE/S6ovxGqZ/fEL+bjqFKPea/x1+5odZTtrBnRjlEGyg6XqNN+b4XL+NefSTGzSU LA4oURdJwz7KMYe/gflQOi119MXV7orwhKOCamAwjH1LXx8OX3aUF694grVGhLLqr8MEnzi32Nr My8zn9UBQ== X-Received: by 2002:a5d:5d09:0:b0:486:f770:787 with SMTP id ffacd0b85a97d-4871e266034mr3709025f8f.31.1789741993303; Fri, 18 Sep 2026 07:33:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , Pierrick Bouvier , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 16/17] tests/tcg: Fix building outside of the source tree Date: Fri, 18 Sep 2026 15:24:27 +0100 Message-ID: <20260918142429.336497-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:30::10; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-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: 1789742045945158500 From: Ilya Leoshkevich Running TCG tests from a build directory that is outside of the source tree fails with: [...]/qemu/tests/tcg/multiarch/libs/float_helpers.c:228:1: fatal error:= opening dependency file tests/tcg/s390x-linux-user-float_convs.d: No such = file or directory This is because the build directory is not mounted into the container. Add this mount. Do not bother with preventing overlapping mounts, they are harmless. Fixes: 27939ad414ca ("tests/tcg/meson.build: introduce cc_dockerfile and cc= _docker_host_arch") Signed-off-by: Ilya Leoshkevich Message-ID: <20260915110855.491985-1-iii@linux.ibm.com> Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Reviewed-by: Richard Henderson Message-ID: <20260917165602.3405537-17-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 95f533b0ab5..a5e0462732d 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -277,7 +277,7 @@ foreach target, plan: tcg_tests mount =3D mount + ':' + mount here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', - '-w', here, '-v', mount, + '-w', here, '-v', here + ':' + here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif --=20 2.47.3 From nobody Sat Sep 26 20:51:55 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=1789742039; cv=none; d=zohomail.com; s=zohoarc; b=V23kdvNYrO1tZlckcgbfgdJmjIxOZWj0kNSWbLzhmOO27LS4Flo1Y3tqWT7fq7PpG87qQgiGs8/SLyeviCu4mPkle/P7TxdZ6ImXCCJJPEGFQfLfvPpmCrDWajVVDV7gNxzzeLzHwm0unVEzT33DFhl1mv+ivCHU7lSlgpomB0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789742039; 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:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oQOylOhcR1gLWw7VoNLMF7sUgVCYqtoo/7yW7qxOJo4=; b=ZDdfqFLTKRL8Xp2jwZhhCTwTOe2PDG0kTD7D1U7zpFfpCw/Z4Ngmxms6r1sj6acl8/cOcI1Rf4P/F8H54Lfei1k2cewgFogRnkm+O60jkw1N+oNO0EUeeupuff6M47tFsGj+oij5EoesiGAkNs1nk6bVotw8mmONs3ovKOPAk4I= 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 1789742039106472.40588319280516; Fri, 18 Sep 2026 07:33:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7ZeR-0003GA-VK; Fri, 18 Sep 2026 10:33:19 -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 1x7ZeL-0003Ed-PN for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:14 -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 1x7ZeK-00010j-Bo for qemu-devel@nongnu.org; Fri, 18 Sep 2026 10:33:13 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49e6598dd44so4819365e9.1 for ; Fri, 18 Sep 2026 07:33:11 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc7d1cca3sm56479365e9.11.2026.09.18.07.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 07:33:09 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5604D5FEF7; Fri, 18 Sep 2026 15:24:31 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789741991; x=1790346791; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=oQOylOhcR1gLWw7VoNLMF7sUgVCYqtoo/7yW7qxOJo4=; b=FKFJ2CEIcLUhZoRrOEyt8yi6eN+CHMITHaXLGuvgPsmECO7xr2S5DKf6Q9wqmo+Ye3 9YidJaZgoZlZQBmpw97+fnbM7rxXiUisW6gzEiQR017HJaoDmCm+j0f18E2lbvYsWxgM ogSbmBpoDUBK3YhnCOTouGNI8jPGzY5ZJpydDLiIlNwiByFvGxE8GG6N+0muNKAI0fxP +4ObhB88Re1RFT4yBFS8AcyDCTJEFNhpWvxbfidWlM5vipuLbacWd4/ZX9T4n3Z/JfUZ D7qeQTJDYHfPw2Rx4eYwpFJSQIvUIAqbFS9h8AWhGC75BvQ0Y20akB99jsOOxTSDXLtH mjuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789741991; x=1790346791; h=content-transfer-encoding:content-type: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 :content-type; bh=oQOylOhcR1gLWw7VoNLMF7sUgVCYqtoo/7yW7qxOJo4=; b=VvsoUgRbz4JTjmiui35anIWwMm1+SkpE+NFPhdl4H0WtDILnkdmYagJTT5WNH6Lo2C O38LqSN7tpHn8GOIAxjSzhTaJ+KN7CJcNPlZ+GBEnV4j5EDq9gVjwgUxYLLXW6j3S55o cLwtYKX99yD8JDhOUbn7CoimCjqhHPn+DYC6QzY81mJ2vhZt0a16Qvf1yMfths3O4PFm obQ3vxHgOzkaUW8nZngw6jZ7OhvP2A0d0Gd86Kv3GcG4J4Hn7+pH4a0iz6qEHuCl+NH3 FPbJ+quI8f6onFcGowHl0TdI/qrGO4h/KOreOR5pz2J02OfxgX69NYtioQvQHEkWJ3Vg gdiA== X-Gm-Message-State: AFuF++kqFQesjl5ZdqgIeWS8YvJIz//ClX/ew/0duYjhEI2++ADITqBd Cm6JTqJ/qBHWH0IkvCqd1rSaJdsf/zZ22NadPLp68WMLhR4hsJgPxGVZ8DF4GFc2PdU= X-Gm-Gg: AYBFou2A0OoS+YeQaygjMuqMhwUft3i0w1tOhQ9WpWHZvGVUUuBm2DXGUoboUTDswpv jRQ5lE2lQgXNdjB8HAGQoCkSTGXt8BtG1YCYx8XLZuf3Gac1IQNvUcS+YKE2QkV0XKC+HJ+YKtz gPnoAC+/d3XYqumnhAw1Wb26ovP80v8mlgqPTCIitZwoffGFdrHLZdBIoBzmQgrZMyAQNSGgbI1 7XgJb7Vh25TUa6Jkjx+ubTlNSaHhYRTwtIGfNx2mA6L0VBiEL9Q244HucUdkrfIWKEBqPIN3f2u GskUjYT9E7WVyPNTLu06hF0YaS4me0ZhV9ZRS52cuvuKiAyssj1B6TjJ3EVEq2kCV+sceIZyQZW vftYrNIsbDgkhQP/y3ujprYHQPxOWWpsIRNPloIygrYYuScaGlr45gKSuYWIdke8ItAcVko6uEs 19JNaL4+3a7E5P72MdKFZyKRluCvTaU9jXlXMuuAo8m/Dc35X2tMoqaDc0Eljvr8e8Tb6oqz8= X-Received: by 2002:a05:600c:3ba9:b0:49c:f504:2af5 with SMTP id 5b1f17b1804b1-49fc566939emr40358375e9.1.1789741990751; Fri, 18 Sep 2026 07:33:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PULL 17/17] gitlab: drop check-tcg from clang-system job Date: Fri, 18 Sep 2026 15:24:28 +0100 Message-ID: <20260918142429.336497-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918142429.336497-1-alex.bennee@linaro.org> References: <20260918142429.336497-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=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: 1789742039817158500 We have no cross-compilers in the fedora image so don't bother trying to run the tests. Reviewed-by: Pierrick Bouvier Message-ID: <20260917165602.3405537-18-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5f21703645b..a97cc0b20b8 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -441,7 +441,7 @@ clang-system: CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-ubsan --extra-cflags=3D-fno-sanitize-recover=3Dundefined TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu s390x-s= oftmmu - MAKE_CHECK_ARGS: check-qtest check-tcg + MAKE_CHECK_ARGS: check-qtest =20 clang-user: extends: .native_build_job_template --=20 2.47.3