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=1789572673; cv=none; d=zohomail.com; s=zohoarc; b=C2Ew7bNs3ibJRcbQarjv6t2yQra/hQII+7xxbejSR5fpurcDVsnwjTALoplW9PtJ82Ohjq8ou5+ig7k+ZCrdGKaWteelyHKYKE83rW1iBcYa+5Ym8zv5FwFgQAfkW5AQf120tnx+mt9pFrtLtx2BUf47IGxW9PDe13sIsnl1KCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572673; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Pz6D5LdjE3kJJTO4sUmd2SawfSM3Mp74GJqeo4tLsQA=; b=kC3U8DfO5sx1pyCGIJ6Sg6ceditt6+SV8pPSMBXswQxQXMyZ8bGDbMU/J3h0+DYr/lhHt7BVXxYCxAjhfusMgKMb533qUWEWq2WDPo9BeX1KYJWxMNclQwiZ+u6tA3LjGTTOUa9v65zFHZCY4mve9acfPqo+O7zYWb8AbGAIQSA= 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 1789572673560911.6117131527288; Wed, 16 Sep 2026 08:31:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ras-0002BQ-57; Wed, 16 Sep 2026 11:30:47 -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 1x6raY-00023x-F0 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:22 -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 1x6raU-0001KK-RX for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:22 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4843172bff4so559280f8f.0 for ; Wed, 16 Sep 2026 08:30:17 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf462cesm7892077f8f.37.2026.09.16.08.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4E272618C3; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572616; x=1790177416; 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=Pz6D5LdjE3kJJTO4sUmd2SawfSM3Mp74GJqeo4tLsQA=; b=zL0+5R/9HFDM3ulKMsSGfpeV0LgN0krn1RBZM1fHQ9ZPZcGYRs9IEQ5F+78gtXqbpp rNRZx778rDxxmM3Uy9jqfKV6eOwm0PgUCOSGeBIKUN2Rqwl063cuJdhO657PXQSq/Ttg vWWYA8Sunpy/1cdC8+nsyIaQQ78rHIza4mzLXxuMGmSn8XZ/zNkeUjUDWCJfduTW714/ e3ZL2wd3ZbQB381YgsoY+JP4KzIYF4JNFdyzNoxrYQGrCxNrKaGV95sM5Z1oUhOif+xx HXiRIo/HI7iUudOtDakghhV9/zpN0hnqJBlaRaMRzjLOtves/hc0DLJWObGPEKk/45Uk S9Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572616; x=1790177416; 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=Pz6D5LdjE3kJJTO4sUmd2SawfSM3Mp74GJqeo4tLsQA=; b=cjmuaG3Wqim0vQ7uk0N99xzcbq7Owb1CbNPE7olob5Vv6hTFJ8rPDMIBHi2ZmpyVKT rLkNXkjLACpB3qlzOZdFr/o2Uj5Xqpe1KoQ3dcEKCS5Z3abCVmSnfg2F7XvwbAE3r4lB k8v4MAkB3X6P7X3L6iJ1RfdOxjnl1wsN5P9+snFHC0zIgzZ6ZS6YOFL+tGyHumIX/XDH jXGVXKSV3BeKtev8N9JBIXwBbfK6qPKxoOhf8tGN7c8U04Wz+KNCXgceA8tap1eb/JDV JhU6oPsrBn6vmF7yiIP0nhQorW4/OLstgYxDIDu7XOrn8HIYhJz7n48sfzMkCYqexuSr pTZA== X-Gm-Message-State: AFuF++k2XzECpWI9e5RfBfsEaSAVzmv0KZsTHrmyAMF67uAf4fdmIzVD UIeVuWTif20V/kSWvsEBNNaAoaZ6zvILZ8zhEYjYsdKvBYHKqYG5P/YiEu9LRW+eu+c= X-Gm-Gg: AYBFou1Q03sFS0ib9b5YR4UyEsZdG5cdMBAglih8ediuDipZuekJlYejV6ZEdQp07Ll r+A73ncRCgPB4ddGLUlN+MMyQpVJ5hBRmV6LElVLfZq67tXUkA8CsWUvPmeg19L/98bGwtxLWpV 9KN+x2p4AtIgfaDqdeaLgrvC88w1wkuss/6fyiUT35uFlMZqUnmFIsMv+hW0zgtifGOL5IqSEch LxsS1M1R9gdumUwg1uUvm8wwgTyDeMedu72grEsEDx0KMqAunXcdq3nv1Lbou5iRC5GpU765sBx mq5ke/8Ec/mLOB5qPWn7JsN5rh/Y7GmNbkDKQofHvSCS5xWtlolpr2nAy7KziABqJlIsG45/xvz fvIk0SgK7fpfWruuiTWSzMhRMw8+jOg8mlvQlu7xBHipHH/VNB5JLNteoPmzmhJvAiFmJmWiZ/x IMsqq/u4xDdoiWhkSPFZZkOagOXOiqgFgqXimb8Uxw2LvrE1X0MndaNehWglGNWlqSOuSQQsY= X-Received: by 2002:a05:6000:25f9:b0:486:e722:f3c1 with SMTP id ffacd0b85a97d-4870cef72ecmr4331991f8f.7.1789572616153; Wed, 16 Sep 2026 08:30:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 01/19] Revert "configure: remove cross_cc and gdb detection logic" Date: Wed, 16 Sep 2026 16:29:54 +0100 Message-ID: <20260916153013.2134555-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572675006158500 We want to restore the logic to configure as it's also used by the firmware builds. This reverts commit 031f935567ab8abfa4e84682ecea08915ca9656d. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- configure | 461 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 461 insertions(+) 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: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=1789572857; cv=none; d=zohomail.com; s=zohoarc; b=XKppA4dAHaNpLdl14SuGHw1zN/9o9R5LlLcsU70uIeS6aE4P4Fy6se+As8lHlgrHE/+4sl8V9YdzN4aLq4DSUoiinxJg8meFC5k8sAW11R4r3OhpzE6xxwmnSJqly9kogv0ju4VfGtDkc9JP9TjPNEuT07m5Ti5oClCpjg8E4rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572857; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AJwEWFJNlhZhHGtBDzm5rjgGSC2PicgfXm/bmyyHSjI=; b=kLdQKjO7Y6DRiAH3Cwa6F8aYPF448AfPAGklsKsT1uYxRZCtcVPJX5ZNL6OlQP1LiyVGdbah/P2PrjKu4YuWcrv5yO59YQoi0Oohg/E+nj1YV0WyJLYl12D7YDq3ToI3GQ+tAS6fh1+PhNconWWa9QeYgIC4Ws5TzOw4bhjBsVg= 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 17895728573971015.7524049440881; Wed, 16 Sep 2026 08:34:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbH-0002TS-4I; Wed, 16 Sep 2026 11:31:07 -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 1x6rac-00025L-Cu for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:26 -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 1x6raY-0001MV-58 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:24 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49e66390995so6635345e9.2 for ; Wed, 16 Sep 2026 08:30:21 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd0fef38sm1392095e9.9.2026.09.16.08.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 698AA618D2; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572621; x=1790177421; 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=AJwEWFJNlhZhHGtBDzm5rjgGSC2PicgfXm/bmyyHSjI=; b=Lwbigcn2WKYLnBFPG/QIJw1p8T6pYbD7zGZIG/eeXt558H8M05MAcw0FebYGb70S+H up7m1GZVeLbHGtIayzsMcU79ohdu5ho6OEs1gfGdLqq9VUseRtbExjZpGUGsQ3mCzWpu Bj16FYhZMrM8SfeXilSgTZjUpUhMngqhy2ic4fbfoWiRHByCuW3F/vn6hMhBSc/Yh4bg nhOEAkFtpacLDr50tU0mz+tKupF/RwruErpu+ybPMbFuRkllITTnDikYXj0mWc1jhr/+ TdFOvJCWfb5TLoD7D4v7u9CDrrfy/LJvhubjfz/ZU7Za54D+desDIOxs+Rj9ACE3ivZJ BP4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572621; x=1790177421; 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=AJwEWFJNlhZhHGtBDzm5rjgGSC2PicgfXm/bmyyHSjI=; b=PvmIcH+s9OsUmgmp2HMS5ZXWf1qJel8UgYOkRytjxwYzROefL02DL5wY7q8y+QhWJi izBUaDRysYPbXzyHpIe1jEJDBX9aPBo6cpfsVg98J67V18NrHm/+XlJf1vlvlghUipQ2 /AIEPGiwdrED/TfC0cUkItPcybS+LOyhzkPxCH6pTDzb1iH6Z/UTBuVxsh46zEXTXV4U rF4gyKn/i+otNzbVLzhDTM+wjjgzKGtywQ7/sZQp+MzTLtPYoov/6NPJCDketPKoMmSQ L0w4Qnt9Wh1MjnjmiV9aPXwHmywxgSlEIpYTtCWZc3qADJ/JAY9FbO/zMPqIfJMv1G9b IgZQ== X-Gm-Message-State: AFuF++lARBZsFkGA+UzXWLvUzCHHOsj3NdZf+IJQFprnc/cPNW1LMPd9 cUHyW/yyRXvMyt/tsFp8m4b/M+2ZfLD7YmYd+dbk5/1sAiTyv7jvorlPOuhlJ2as1YA= X-Gm-Gg: AYBFou3zlx21VIdpRQW06oxs6S15odldri3VVG8uhQPcJzSCcp7YxyH390c2ZPVBstD +x1r0/erNl1lb0UIAajF+nFMVS8FW68IEEP94lR8XPcQAaXsF/KZ2/iy0Z5eprCsOP2Rw6CDl3v pLQ8PI4eQ4UDPJh3A7nGMBFPDBmw5sbmxqLQo2Iu3BiYKgZKT0l7Z+DVMiHuni8/D/e2DEck+tU yHRJOBEWeignEkWRuBYOT0GVXgoKL0sdnQ8czMHIODqoA071mkxFR3Qtmy1j1XOr48uxQCrcIUA TIFMRPQ3q39kejQjiVbJ5N/GJT5y629OIXWncZctfBrsBHh2YRzr5OowgvK93kRWo2mXM/+g+/w L3S96ozk4u1gltUsBa7260p57+Y+yMRLTGXCYf0SihmwAT6O0fGH9GC+6wk8JxEdcmhU+sKdu1C pX59J0nhABFssNqTxWoad5qM8vf+7P9IveUqxxCYaqkMBSeHx7P4Xu7G9Q6sKnLema3JjI8Po= X-Received: by 2002:a05:600c:6085:b0:49c:dca2:ac47 with SMTP id 5b1f17b1804b1-49eac45c06bmr36770935e9.2.1789572620516; Wed, 16 Sep 2026 08:30:20 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 02/19] Revert "tests/tcg/meson.build: implement ./configure -cross-cc-* options" Date: Wed, 16 Sep 2026 16:29:55 +0100 Message-ID: <20260916153013.2134555-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572857838158500 We want to keep configuring of the cross compiler within configure so it can be used by the firmware. This reverts commit 7e1d54da6faf10e1fc70f6b3d8247068b80b1597. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- v3 - declare empty container_command/use_containers to avoid unref var --- configure | 31 ++++++++------- meson_options.txt | 89 ------------------------------------------- tests/tcg/meson.build | 31 +++------------ 3 files changed, 23 insertions(+), 128 deletions(-) diff --git a/configure b/configure index 1973f023b1e..bedde58b8cf 100755 --- a/configure +++ b/configure @@ -172,6 +172,7 @@ fi # some defaults, based on the host environment =20 # default parameters +container_command=3D"" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -227,6 +228,19 @@ for opt do ;; --extra-ldflags=3D*) EXTRA_LDFLAGS=3D"$EXTRA_LDFLAGS $optarg" ;; + --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" + ;; + --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-cflags-}; cc_arch=3D${cc= _arch%%=3D*} + eval "cross_cc_cflags_${cc_arch}=3D\$optarg" + ;; + --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} + eval "cross_cc_${cc_arch}=3D\$optarg" + ;; + --cross-prefix-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-pref= ix-FOO option" + ;; + --cross-prefix-*) cc_arch=3D${opt#--cross-prefix-}; cc_arch=3D${cc_arch%= %=3D*} + eval "cross_prefix_${cc_arch}=3D\$optarg" + ;; --without-default-features) default_feature=3D"no" ;; --wasm64-32bit-address-limit) wasm64_memory64=3D"2" @@ -246,6 +260,7 @@ ninja=3D"" python=3D download=3D"enabled" skip_meson=3Dno +use_containers=3D"" rust=3D"disabled" rust_target_triple=3D"" =20 @@ -618,19 +633,9 @@ for opt do ;; --extra-ldflags=3D*) ;; - --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" - ;; - --cross-cc-cflags-*) arch=3D${opt#--cross-cc-cflags-}; arch=3D${arch%%= =3D*} - meson_option_add "-Dtcg_tests_cross_cflags_${arch}= =3D${optarg}" - ;; - --cross-cc-*) arch=3D${opt#--cross-cc-}; arch=3D${arch%%=3D*} - meson_option_add "-Dtcg_tests_cross_cc_${arch}=3D${optarg}" - ;; - --cross-prefix-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-pref= ix-FOO option" + --cross-cc-*) ;; - # cross-prefix is just used as a syntactic sugar for -cross-cc. - --cross-prefix-*) arch=3D${opt#--cross-prefix-}; arch=3D${arch%%=3D*} - meson_option_add "-Dtcg_tests_cross_cc_${arch}=3D${opt= arg}gcc" + --cross-prefix-*) ;; --enable-docs) docs=3Denabled ;; @@ -1273,7 +1278,7 @@ 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 +if test "$use_containers" =3D "yes" && test "$container_command" !=3D ""; = then docker_py=3D"$python $source_path/tests/docker/docker.py --command $co= ntainer_command" fi =20 diff --git a/meson_options.txt b/meson_options.txt index e3570a418aa..66d3689d14c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -393,92 +393,3 @@ 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('tcg_tests_cross_cc_aarch64', type: 'string', - description: 'cc for aarch64 tcg tests') -option('tcg_tests_cross_cflags_aarch64', type: 'string', - description: 'cflags for aarch64 tcg tests') -option('tcg_tests_cross_cc_aarch64_be', type: 'string', - description: 'cc for aarch64_be tcg tests') -option('tcg_tests_cross_cflags_aarch64_be', type: 'string', - description: 'cflags for aarch64_be tcg tests') -option('tcg_tests_cross_cc_alpha', type: 'string', - description: 'cc for alpha tcg tests') -option('tcg_tests_cross_cflags_alpha', type: 'string', - description: 'cflags for alpha tcg tests') -option('tcg_tests_cross_cc_arm', type: 'string', - description: 'cc for arm tcg tests') -option('tcg_tests_cross_cflags_arm', type: 'string', - description: 'cflags for arm tcg tests') -option('tcg_tests_cross_cc_hexagon', type: 'string', - description: 'cc for hexagon tcg tests') -option('tcg_tests_cross_cflags_hexagon', type: 'string', - description: 'cflags for hexagon tcg tests') -option('tcg_tests_cross_cc_hppa', type: 'string', - description: 'cc for hppa tcg tests') -option('tcg_tests_cross_cflags_hppa', type: 'string', - description: 'cflags for hppa tcg tests') -option('tcg_tests_cross_cc_i386', type: 'string', - description: 'cc for i386 tcg tests') -option('tcg_tests_cross_cflags_i386', type: 'string', - description: 'cflags for i386 tcg tests') -option('tcg_tests_cross_cc_loongarch64', type: 'string', - description: 'cc for loongarch64 tcg tests') -option('tcg_tests_cross_cflags_loongarch64', type: 'string', - description: 'cflags for loongarch64 tcg tests') -option('tcg_tests_cross_cc_m68k', type: 'string', - description: 'cc for m68k tcg tests') -option('tcg_tests_cross_cflags_m68k', type: 'string', - description: 'cflags for m68k tcg tests') -option('tcg_tests_cross_cc_mips', type: 'string', - description: 'cc for mips tcg tests') -option('tcg_tests_cross_cflags_mips', type: 'string', - description: 'cflags for mips tcg tests') -option('tcg_tests_cross_cc_mips64', type: 'string', - description: 'cc for mips64 tcg tests') -option('tcg_tests_cross_cflags_mips64', type: 'string', - description: 'cflags for mips64 tcg tests') -option('tcg_tests_cross_cc_mips64el', type: 'string', - description: 'cc for mips64el tcg tests') -option('tcg_tests_cross_cflags_mips64el', type: 'string', - description: 'cflags for mips64el tcg tests') -option('tcg_tests_cross_cc_or1k', type: 'string', - description: 'cc for or1k tcg tests') -option('tcg_tests_cross_cflags_or1k', type: 'string', - description: 'cflags for or1k tcg tests') -option('tcg_tests_cross_cc_ppc64', type: 'string', - description: 'cc for ppc64 tcg tests') -option('tcg_tests_cross_cflags_ppc64', type: 'string', - description: 'cflags for ppc64 tcg tests') -option('tcg_tests_cross_cc_ppc64le', type: 'string', - description: 'cc for ppc64le tcg tests') -option('tcg_tests_cross_cflags_ppc64le', type: 'string', - description: 'cflags for ppc64le tcg tests') -option('tcg_tests_cross_cc_riscv64', type: 'string', - description: 'cc for riscv64 tcg tests') -option('tcg_tests_cross_cflags_riscv64', type: 'string', - description: 'cflags for riscv64 tcg tests') -option('tcg_tests_cross_cc_s390x', type: 'string', - description: 'cc for s390x tcg tests') -option('tcg_tests_cross_cflags_s390x', type: 'string', - description: 'cflags for s390x tcg tests') -option('tcg_tests_cross_cc_sh4', type: 'string', - description: 'cc for sh4 tcg tests') -option('tcg_tests_cross_cflags_sh4', type: 'string', - description: 'cflags for sh4 tcg tests') -option('tcg_tests_cross_cc_tricore', type: 'string', - description: 'cc for tricore tcg tests') -option('tcg_tests_cross_cflags_tricore', type: 'string', - description: 'cflags for tricore tcg tests') -option('tcg_tests_cross_cc_x86_64', type: 'string', - description: 'cc for x86_64 tcg tests') -option('tcg_tests_cross_cflags_x86_64', type: 'string', - description: 'cflags for x86_64 tcg tests') -option('tcg_tests_cross_cc_xtensa', type: 'string', - description: 'cc for xtensa tcg tests') -option('tcg_tests_cross_cflags_xtensa', type: 'string', - description: 'cflags for xtensa tcg tests') -option('tcg_tests_cross_cc_xtensaeb', type: 'string', - description: 'cc for xtensaeb tcg tests') -option('tcg_tests_cross_cflags_xtensaeb', type: 'string', - description: 'cflags for xtensaeb tcg tests') diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index d41a228fb3d..ce208e686ff 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -185,8 +185,6 @@ foreach target, plan: tcg_tests continue endif =20 - cc_arch =3D target.replace('-linux-user', '').replace('-softmmu', '') - # Detect duplicated executables/tests, and report an error to force user= to # choose how to deal with it. built_tests =3D {} @@ -204,35 +202,16 @@ foreach target, plan: tcg_tests endforeach =20 cc =3D find_program(plan['cc'], required : false) - cc_cflags =3D [] - - check_flags =3D [] - check_required =3D false - cross_cc =3D get_option('tcg_tests_cross_cc_' + cc_arch) - if cross_cc !=3D '' - # we make sure cross cc exists - cc =3D find_program(cross_cc, required: true) - check_required =3D true - endif - cross_cflags =3D get_option('tcg_tests_cross_cflags_' + cc_arch) - if cross_cflags !=3D '' - cc_cflags =3D cross_cflags.split() - # and that cross cc can compile programs - check_flags =3D cc_cflags - check_required =3D true - endif - cc_from_system =3D cc.found() has_cc =3D cc.found() if has_cc + check_flags =3D ['-static'] if target.endswith('softmmu') - check_flags +=3D ['-nostdlib', '-ffreestanding', '-r'] - else - check_flags +=3D ['-static'] + check_flags =3D ['-nostdlib', '-ffreestanding', '-r'] endif =20 cmd =3D run_command([cc, files('test_cc.c'), check_flags, '-o', '/dev/= null'], - check: check_required) + check: false) has_cc =3D cmd.returncode() =3D=3D 0 cc_from_system =3D has_cc endif @@ -368,9 +347,9 @@ foreach target, plan: tcg_tests endif endif =20 - cflags =3D cc_cflags + cflags =3D [] if 'cflags' in setup - cflags +=3D setup['cflags'] + cflags =3D setup['cflags'] endif =20 if 'cc_feat' in setup --=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=1789572673; cv=none; d=zohomail.com; s=zohoarc; b=Dv1XOsoug2HB3WtaEegNnkdjs213PSZkDlN4/OHsNv5fXrgofDlU3S9l6ISllxO4bCym7RTyAVsWllvu5+5W5QtI3AZQYfamnU5wrg1VD3lgfYhF/k60mLSTmyRkKlc+Tj4fYf8PShOQ72nBQMOYT2ROJL7ywLCD1IGYvHO1iKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572673; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A8yhkYrv3xvM3F7NcGJheQJxr1oV0vuUzhu9GRaxQgc=; b=XmqgEXZe+VP6AZDuQd+KixlDqxn1n8yno8cgsDpaTNQojlfPkxcxgwanX8KGFg/0z+ND2vUr5SmO2icgmDdqbSuL2eKtKvAiabdcOANqD9EHncBkz2bfo2qrhR/qF6rk2yagEVXmKnUAqfIX2rR2fvNVAaQFU4K586VDM5L/CbI= 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 1789572672955596.3185943978265; Wed, 16 Sep 2026 08:31:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rae-00027p-4V; Wed, 16 Sep 2026 11:30:28 -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 1x6rac-00025G-Bt for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:26 -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 1x6raY-0001MZ-Cg for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:24 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cd5462b69so6595825e9.1 for ; Wed, 16 Sep 2026 08:30:21 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd1b147asm135475e9.10.2026.09.16.08.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 82668618D5; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572621; x=1790177421; 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=A8yhkYrv3xvM3F7NcGJheQJxr1oV0vuUzhu9GRaxQgc=; b=DZLiSTK57q6yUhozdz7jVZ3bTx3BlkbcXxPXvKZhtflpapT6711uwNuqFoeJNjl3V7 5oSGtm21agiDiEvrli9TUbsP9c2HwXhIkwFkaHKQ2wMq3zEdZ4GCYbUteYhSC8JaJlsP dODtdsu8jSeuhlufBaf2CJwa4MuATiQCt6YyJSHZWmPWBRBwxwXVe0trm/CfkgdmifXT RuDpeN4eBnUARvTyPU1ARpW7uFKXxMWr0O2uYFRrVC2LvKxuOqdVCKJJou+EJupGaLzi su/vTmmb4D50dB30wTmp6crvle6kBFEcYy2qAGvL/1CrWXMaPpyrM/R5sNKISGVXFsVd R6Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572621; x=1790177421; 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=A8yhkYrv3xvM3F7NcGJheQJxr1oV0vuUzhu9GRaxQgc=; b=0Vw8t6LSEMlP53HsgIGTtE6tTgPQ/FQSMFnTvjW+9djaxUcLjhsyH/LtPlb8x8twZs TEPoRLDQWa9KyIM4vqsDEHIu98Wsbdsfu74O8LMy+O61dlTrVFBMEX1hs44y3Ji1Crcp I1G/yk04Y9xtBe8l94l2u1hVC2vwYBZtUiW1ZJGgep+/5mweRFy11rINuA6cJmh50+I+ JP8f11nBe+wh84KnyS0XRXV1RK6NYD9rag0pvqibCUZ7LtGh6H+oKzpRzHs1IzUJep+N rXQ+URFEvOfoseHjMqkkd1azzXFH2/ePRT8dwkywVdU2BYNMXCzKhdJ5NzeNeTFcxe2V ZtUA== X-Gm-Message-State: AFuF++lJEZeGVvHdX3bwKuh4elMAMvwsUqgdNEHeEG8DpqiUVA3jMvTg 1oxh1JjVTXIytUR2tRMRTrymST6tDKUK3P4Wn4jTgiZyS0pxSq4s06hlj/CZ+LPkZYo= X-Gm-Gg: AYBFou0HsGjdboAIT2zsXIv9cOWAkQq6avWme/v2DjaLGJ6SgkHke33p7XO1orQRpBO l3xvDrsVMnV4h7DQ9HqLVGrb8HoiHFBa0/YKfMAaO91YIJtmzeyuINsrH5GEApXH0BmO95EdDTN 4hpB8op/nfmJqC2czm8NHhbEjP2c6vOAtw00c0+gx1h3+Bae9j0KODyaabF1aBEMQKcHYXoIxzl uH1lrUtkwM4YC/UV99lnwlDPtW+hAZA0K6Lf0tCjEoLHAxrmJS+bgxg8NqzkSda10d5Q44/AxP8 23873TPrSPtJdiEr5Q1lION+kTM126MatFwHc8hyXOJGppM77HDy9dmHDf0REhOUKqHB7QvS11B 3+WiF5kVgwmScN0RFekPwDt/KLX3RSH0cGl2HSMNOsJGUjlOOkeZaTrGdbZmeSutyI2MENLJxVl avYlh9oGrsnhT1QhVegvELrcZV3Cq7p+WytuvynB7lAt8c24Y8CCnI9odCfs0hBHP0PCLFL7Q= X-Received: by 2002:a05:600c:4f49:b0:49c:ed94:cdd8 with SMTP id 5b1f17b1804b1-49fbca1a8ddmr15963845e9.6.1789572619617; Wed, 16 Sep 2026 08:30:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , Jared Rossi Subject: [PATCH v4 03/19] Revert "tests/tcg/meson.build: implement ./configure containers options" Date: Wed, 16 Sep 2026 16:29:56 +0100 Message-ID: <20260916153013.2134555-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572674920158500 We want to keep the container configuration inside configure for the firmware builds. This partially reverts commit 522b299ca4316d8cad57f9496ffcba87dcc20719 while keeping the plumbing to disable containers within meson. Tested-by: Eric Farman Reviewed-by: Pierrick Bouvier Suggested-by: Paolo Bonzini [AJB: untangle changes since] Signed-off-by: Alex Benn=C3=A9e Tested-by: Jared Rossi Tested-by: Richard Henderson --- v4 - tweak revert to keep disable reported - update commit msg --- configure | 14 ++++++++++---- meson_options.txt | 3 +++ tests/tcg/meson.build | 3 +++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/configure b/configure index bedde58b8cf..6084a7a065e 100755 --- a/configure +++ b/configure @@ -260,7 +260,7 @@ ninja=3D"" python=3D download=3D"enabled" skip_meson=3Dno -use_containers=3D"" +use_containers=3D"yes" rust=3D"disabled" rust_target_triple=3D"" =20 @@ -727,11 +727,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" ;; @@ -1718,6 +1721,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 diff --git a/meson_options.txt b/meson_options.txt index 66d3689d14c..daf301ed48a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -389,6 +389,9 @@ option('rust', type: 'feature', value: 'disabled', description: 'Rust support') option('strict_rust_lints', type: 'boolean', value: false, description: 'Enable stricter set of Rust warnings') +option('container_registry', type: 'string', + value: 'registry.gitlab.com/qemu-project/qemu', + description: 'container registry to cache from') option('containers', type: 'boolean', value: true, description: 'use containers to cross compile tcg tests') option('container_command', type: 'string', diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index ce208e686ff..890da7b81e9 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 {} --=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=1789572713; cv=none; d=zohomail.com; s=zohoarc; b=TyKAhH0G4L4/usaIxhgDUYk7MlS+NoJUSfyWwFefcYPR4oWwdnGg2D8rLmYdsI1bxRw8rFIgdaAaHF4jpBaBMxxobIZyW9yMgpssJJFOzi/f9dFts3r1NKQOdtZxv1sv0V7l1VWNdBwSsM6tHDqMEYn7GupQGP0vxDRMnHYfNw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572713; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7FptWd5Jg1/aZvBoGje7ZffIe7jR1suwzb5Czmj9/aE=; b=I4fCssA/pP+q7tJ2pDU7LRPEPqNO1hiR34hXb/GBeYHfZdZcMiQYfiLhCf1zL6NwBIb93Ofqmf14ipoZGG5Y7R9lpNehoFHAsMmEbyg3T74xVQyurAyv5gGAuKExP7LYI0dqx3BZnRbR0ugYDR2Lh15V0GSAunH3/LIKXbm0z40= 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 1789572713208182.89062572683497; Wed, 16 Sep 2026 08:31:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbB-0002PG-0z; Wed, 16 Sep 2026 11:31: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 1x6rac-00025I-Cb for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:26 -0400 Received: from mail-wr2-x20.google.com ([2a00:1450:4864:30::20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6raZ-0001NC-RX for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:25 -0400 Received: by mail-wr2-x20.google.com with SMTP id ffacd0b85a97d-482f6356256so353287f8f.1 for ; Wed, 16 Sep 2026 08:30:23 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd0efce2sm1100205e9.6.2026.09.16.08.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 99223618F9; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572622; x=1790177422; 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=7FptWd5Jg1/aZvBoGje7ZffIe7jR1suwzb5Czmj9/aE=; b=hwZ91cCz2N9uNeiRNPrY2F6lCfoolTl7/XprI4NmDK98wVkupIS5IB3GS1NrZWSi+C G0UMaYtdPtBhkLSPogTygNvohDia3wK+uZ/8AMkFWTUARNpWdOiH7TnOyM0+b6JHWj9w dRBT/7cJ1ButmyN1419Wmn6wKcx5m8NG6B2DXXry8rhiy9cvYapwhFx9SpdFp4Dn3oxV Vq9cpozVx6vD1WMJ/d3Tpm4WM/WRpIy0w9o1uf9HkWNsdrnCcu8iX24By/V2HpsKE0OG 4gtwR/numxei1UnGwaJ0SXDSfq1njX/yrtkc+nWnmySm3FhakqNbhR6xvQtKwSzqyuRG 1gDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572622; x=1790177422; 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=7FptWd5Jg1/aZvBoGje7ZffIe7jR1suwzb5Czmj9/aE=; b=PQOr7x2N2yyy5juaocM80SY2yqRe0lLCPQkq2zsY7cpUMWDcXp4koqHjO8mNTEjajz C9uriM1w6P+niTwCGyBaybAzcGtJ4c0b2R4SkEaijIj9WUtf+y5PK70SGP8OFDK/h39M ao6pxHIpHanfV8cPe+KMKiT8tL2MtTLamiU++svZRfbXsF2C2l8sncCQn8Jnf/H3+XsV WGLlJ4qtBBHvY5pTchL3ZNeC1zxYrzbcMvzWQHVQlWWHFJIPxfFCawPW05CcvBWTZYjB /YDwYDCs6hjNZTkQtSTp4CbaUk2qXY/bprb/7XAYJXNP7w2CglMCt5hsplAPJZ+tUA7M Vt2Q== X-Gm-Message-State: AFuF++ngGF7lPGQu4zPheL8FgFS5azW26eKRJB4r/OnN8FUSyDm7RegI 5VkJ6L+vijQeNnd2kfpEbUMnZlq17DB5EBTjoul60VQ7M9iNjwxt9A0CFG9VZ/AGfFk= X-Gm-Gg: AYBFou0GWXQouMg2YfJsnU4V6wf6HPegIFm22/5zowwqcbxi+9WFg5ZOWFMIbNddoTG n592HoOUCcmK6QGFzBnG7yIS82AFeEqrj481BjgbYkVGPBbmOWAWcAo4NBIoNVsxJj7guGD7y8L uMcraBmxcy1MDhuk/dmyCFWZ9N0dd+qeMRYX8uywWQdQtc358O5c70yV/n9UmM6D6yOqcZdYscI rY80zH8jrYa1G54xYVZtQEcqi/gPBRSsTAaoAHryrH+n7+u9uSju4Jz0PIF75XvPNKlgLGLUpEn 8P6P0a47N+7lLT5h4tzqEuutlWGZHLtKCy/f1asC63HEyMER/gbSow5KtW8FDCnCy0Q+21EMiWS yIpGf1iQJzlE4igdqt1nAujD5Wl28hECrJNuXtp14A2O/Xm/1Mgt7WsOqtXkPuD7OGleFcd1r7Z 4GngLWYES/N/5Qm54qXiwgrl7w5iaKXuW4xqu1zhkmyY6Wgy7hmS1GTlTONblLkCooxidprRU= X-Received: by 2002:a05:600c:3e16:b0:49e:8222:3451 with SMTP id 5b1f17b1804b1-49ea20b46ebmr40693715e9.14.1789572622122; Wed, 16 Sep 2026 08:30:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 04/19] configure: correctly honour --disable-containers Date: Wed, 16 Sep 2026 16:29:57 +0100 Message-ID: <20260916153013.2134555-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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::20; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-x20.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=unavailable 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: 1789572715353158500 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 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 6084a7a065e..4c7bf406b88 100755 --- a/configure +++ b/configure @@ -1401,6 +1401,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=1789572848; cv=none; d=zohomail.com; s=zohoarc; b=hkD5yksnhg+nWqPgjXHd4QWKYxAByccyNr8LXsMQ2MFc1YoNfS5DmRiJHQVuL739yqslxaxRpVnL2EJICaX59WvQpiV+eI1VJoGu1F2T1tf8oZur8Q2ZvNV61hQfSZhW5erPYA9/3vL7PhCAqzfeUvyD7CBZ0hYVAGdOYPzg3ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572848; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gwlxe/ftx0pHehXwbKVnrhXAcQYcmg6mCdmQFjqdGEY=; b=agNHLeT0UzEzWfwoYwqgtycnKLIM2YUPctYEnOnr+NpsCaKsPwX6tKus/QZEyYiIB7Uo2X7/vW6v08ZurkXozEkla9mjQl+OOeU0+H14LZdDb2ipBHUBh2wa6vAAA3tKitRFco30mfp/XDEm3fisfJ3z4AorzXvViOziB4/ITM4= 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 1789572848545939.1170673690548; Wed, 16 Sep 2026 08:34:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbH-0002TV-5Q; Wed, 16 Sep 2026 11:31:07 -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 1x6rao-0002Cx-OW for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:42 -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 1x6raj-0001Rp-Ek for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:38 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccfd61ecaso9926375e9.3 for ; Wed, 16 Sep 2026 08:30:32 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e847e89f3sm30371715e9.3.2026.09.16.08.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BE8F761901; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572632; x=1790177432; 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=gwlxe/ftx0pHehXwbKVnrhXAcQYcmg6mCdmQFjqdGEY=; b=PxbpSlPorMVoCHb141w6dV4BPE8XSpJqXfVDP3Z5ujNSCczWPsoqSkqRW79YrgEpxD 5YcJC/H4UI1799mqTdd/5RdDxJnHq9/UdUOgpgVp/NHbejpWFR3B7h4/PW547zD8XWf/ rUcIZE2ykMVCAZX2riL0wo2C1TGedeEzUZCD/5pI5D6TYJOhIgLPhgAXbvCL/4+0GHKz dRUk+6kqma4+IuefbA9Q1TBwwk0D1i86lWzvBJbaMFjEf/ROYz9M9OyKeo6fCLqG0JOX UAb0SVb5ThnY2l749OkKcoP3nDVnb6tphMh4Bk/gibZj4ZheKl743ca45v0bE8sT31sh MxSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572632; x=1790177432; 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=gwlxe/ftx0pHehXwbKVnrhXAcQYcmg6mCdmQFjqdGEY=; b=HtASh4pH3hlJGfgRZseAoPvW7cMbswBVX+9fwfabLJcSVeO6TCfMGck2Cyo7eTJmc0 vR/bl+IhFLGXaxtj6P0klcP+u6Oqi67EkyXlnO8W3jFK/SoUuutnYbHrMi8hUKvjCsrf wz5IT5FfcCSsOVhCgwQAbIfDyje/5CEXlb0pJKVTaXK9GLpnOqHjhy4kMaEJJDg2ksnH 0E4HDAvLAh0NEzdzabhPWQK7bUVzn6unXAKu+etRbYAp9zopV1kMB7eT3RvmkBKHDCq9 hyVTNVSVmFtAIDbvteW1HhTMC8W3dB8Ra2jadhPTpUlkQPOUZeY/6A17i5c5hzhR2YJM vdxw== X-Gm-Message-State: AFuF++mGMhgd/L3CNHg0ZGdoq1TRFsbnHKLczJC/yFEvDhbQ9WIYAWk2 E27Y/J7py9NLnA6jctSIXqgMqqoyFeZ6xQV8NHtvcpAOZPLkwzhr3mePWBVAm2OQ8l0= X-Gm-Gg: AYBFou0Namo5VEfN9nQGv77plLrIv5Gi/wFOrxK53tlAsZ+wX8jzFKchEtCxZllTmWw +icZpMevvWO0dgX3EDBWorYiZU9lFr9YxVOVrINuIoeoLD4/vBAUvpiBme+ellqsdxoLASYPDKu SuA9Bj5P9c811N1zo2Xpq3FiVfX4BVMzz8bYd/ISI310bPwPbWfVvX8BmO1fneCcUbbsAP+29pZ KEi/cQL14DeO0IOcrDRI/1ZRv68j7DiX+8dWJEP7s2fqKHoRplK0NTygUFIagdfObKf0+OeA9fq PdJ7t5306iORRt5jWEV4erymYHFFLWnyZwfe29ien8cXEHSXQs1g/R6Cp6clEqElGA9oMZFi5jf l0VE0qnC/OdvVZW6O11kXzWSVjlqGJL5MkeZt+JvW4ByNIy/muWPk4COQTm2LUVUHPtYaATP2Qk O2dFbifwhOktx4OjMZQ7tvRb7vgorlfAI4rwLLLmg08UGH1ytNnHYEbygz2wruiNlOz9r+1Cw= X-Received: by 2002:a05:600c:6290:b0:49d:1f32:c911 with SMTP id 5b1f17b1804b1-49eac462565mr33754665e9.3.1789572631761; Wed, 16 Sep 2026 08:30:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 05/19] configure: re-purpose the tcg test compiler configs for vdso building Date: Wed, 16 Sep 2026 16:29:58 +0100 Message-ID: <20260916153013.2134555-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572850102158500 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- configure | 69 +++++++++++----------------- linux-user/aarch64/Makefile.vdso | 2 +- linux-user/arm/Makefile.vdso | 2 +- linux-user/hppa/Makefile.vdso | 2 +- linux-user/i386/Makefile.vdso | 2 +- linux-user/loongarch64/Makefile.vdso | 2 +- linux-user/ppc/Makefile.vdso | 2 +- linux-user/riscv/Makefile.vdso | 2 +- linux-user/s390x/Makefile.vdso | 2 +- linux-user/sh4/Makefile.vdso | 2 +- linux-user/x86_64/Makefile.vdso | 2 +- 11 files changed, 36 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 4c7bf406b88..67967cd294c 100755 --- a/configure +++ b/configure @@ -1736,65 +1736,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=1789572744; cv=none; d=zohomail.com; s=zohoarc; b=KNygar7OsnAbYFwroz/JZzGJibzIHdQ/HHZ1xB2/nsA+XCIjds2PYyQPWLoyT2IUaQ9pxlJpGZuz7tEtcWxLAh+jhT/zYFgfTr1HRuiICXC/Aovfl/Xx0L2cZmnV+dS3i8N6doS20Dbg1gHaC+SFyAULWtmtSf2HlW8g3mQW0H4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572744; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TzPZ0Kw3U1piRUlkV8dXwbUvUko3iq9aG6DE/6nhXq4=; b=i4fQNep6U67vQGbFSKhXFZ9ATjSeYoUOQOZyzZH6QqyfKB5dJmOK7LECfxI6oHv3vwDMkGH/Z2r4AZ2w3qFHBW/3OOWVxrwkfsO+BI4a9IrQASlJmbgJjTvtT1lCtndHJ+OaZXunwn9Hn0uvM3rYivc/9n8HwB+CB3ZXRzWaq3o= 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 1789572744690280.99524470730034; Wed, 16 Sep 2026 08:32:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbC-0002QL-P0; Wed, 16 Sep 2026 11:31:02 -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 1x6rau-0002EY-Dw for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:47 -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 1x6raq-0001UR-9O for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:43 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cd38e0e5dso12080555e9.2 for ; Wed, 16 Sep 2026 08:30:39 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e847fcbdfsm51415865e9.4.2026.09.16.08.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D93176191C; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572639; x=1790177439; 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=TzPZ0Kw3U1piRUlkV8dXwbUvUko3iq9aG6DE/6nhXq4=; b=Dds+l+TskSFa7o8JjBl69tRXoBqkqhq1BYZ8cxlgx33VGI6ZDtA+Mc6CiWInKpwBd6 J70D0Rnr6NQVowenB5lHKzxSzyjdlKReTgTqkFTahmEi4YAE9Y39oxhjXa/hzCEEbOph tzc9J0A7Vpkyf1bn5C1Ec+j5UcvAwKHl5LGefgnOvkOxZLyCjxZPSA6NSQx9RPT8mOEo CB96wxV4WXSFTQD+v1DkLKViB9vY+GTkh+e/nR+k7tfaSk02JkJJIXAg+OxivuGnwiW2 evzspFCmnJPzxUQJeMJ3o8oXZxT/89aXnOCYIrlZchuynyfeEr/zzitFx+rVlfKt39yU LwNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572639; x=1790177439; 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=TzPZ0Kw3U1piRUlkV8dXwbUvUko3iq9aG6DE/6nhXq4=; b=x4CYhVROowcOvWtJsaVHCcy4KLNtRSfZrTmZ/qsU7bRQ88bt/pfCi+NuyIbodrgPFC 43YB1UYWeUd7Ja7uJhKqh/wFXaRch/qHcqq154BdCVGXPBe5fmCdtcYM6o4Tb1R/6KvH a3SIA79iQ/OQ3/mCX0fYw4hj84UTYi4oLMI7MOcV58Jff2SuewAKfe13eZWVI1MYFXda L0yM46+qHne0SDs1DvuQvnR7HOv4lwG0Pq1c149K4cBH5PGUWFFXWAYt5WGABqqaGqS2 3fS+m3Lj9hjswrc7zuAfRYj4h/ltir0QetmfGg4LHRjy+M2cXNIZ9v3pnLI5H5QsNtVY BM7A== X-Gm-Message-State: AFuF++m7CUJbdeLNoyAas0M4otew5KNgmo4RdT6zMUhv7Iug8ubF+/MX MW+RPOff7H49Hy3cDT5JsxGCK8bgB9JCqns2ZKvwwOWI6NpN7ux+GNIiCfbBcYH/928= X-Gm-Gg: AYBFou2sO3DxUdlfhfnF8Y4oJ1Dm0Ziu699Ic2Dujh/d/MzzF/hncSSGrUvj4shqHKD L7tH/jeAhsQP3mhmD2e5axnyibCmr7JegFHfc2uKBlINJWxXDoD6S4Dq9tE4XiX8ZNAgxiZHGFt A78jtDxkdH/0wzRC8Umv/h9PmI6T0ogwZovI9A1KbjeR8tbd6nvXbfV8XYnjYlQIg/7/kLUiIym RFaWpjsClEAQdHdo4RRd/slBzj9fOqK7m5dtKXzo3Wxwsb3hiBALYyJeJETqA1AdMbI3Es7PHOT teyprFnKWk/bbop9+4bCs7PwmVnJPzbCGV78WrGfeYo+Tb8vJBqgKEqK0hnCCFcaCeRxJTzjudr WukreypnFJViYnDrtN2++K5/0XFxsvboe3zt5lKGnPLlSGxenFsdbAgdW/J7ZW5enns6G9jXA+L muw6te6p4BuERJ5e/zbZMepV0lWkFtzHP4bVkBPuF2BUyYYeOrsLgVBkoZ+S9qLj60FpWR2Os= X-Received: by 2002:a05:600c:c16a:b0:493:f140:c3fb with SMTP id 5b1f17b1804b1-49eb7302175mr82400805e9.7.1789572638711; Wed, 16 Sep 2026 08:30:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 06/19] tests/tcg/s390x: Provide the libc bits needed by the system tests Date: Wed, 16 Sep 2026 16:29:59 +0100 Message-ID: <20260916153013.2134555-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: -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, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1789572745600158500 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 Message-ID: <20260915110959.492195-1-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- tests/tcg/s390x/libc/stdio.h | 11 +++++++++++ tests/tcg/s390x/libc/string.h | 12 ++++++++++++ tests/tcg/s390x/system/meson.build | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 tests/tcg/s390x/libc/stdio.h create mode 100644 tests/tcg/s390x/libc/string.h 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=1789572746; cv=none; d=zohomail.com; s=zohoarc; b=SPzq4G2MeqHMae9gsmXF8Lht/erIsKLxclkYIfO8agGTahRU4VGw1hhu2FMnR+T8daL/wwUKNbAWQVlM6ekdxqmpp/yWYF6rj4HpWQayP2hhpgaBP0ukVsdw6fSasRF01M8pqbm4Ehi9DK4aK9/fGXbeYoeKW8nictrV3fXeupo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572746; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XDBeIItyJVXMmWM9fFuyv25JigkWsWFtvmOqP+mqtyk=; b=jfHxjS19deG0AgxSjD+6vA60UKSQoYJuohWXsWykSDGxy1095WT/BIw1v6pFp1AcYHxdIEwCd1Tg3DbAxTizdCaJ/GgTRBYy2JAjx6rdimFqHd31Gbn9adUw4ctJkbRU9AR0N1Lf9UqJIA7kpi7ORkN2J/zZW6oEGTg9jk+HI70= 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 1789572746856111.51685416561861; Wed, 16 Sep 2026 08:32:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbI-0002UF-6L; Wed, 16 Sep 2026 11:31:08 -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 1x6raq-0002D3-5C for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:45 -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 1x6ran-0001Sz-ME for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:39 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b965f447cso9945505e9.3 for ; Wed, 16 Sep 2026 08:30:37 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e847ecf52sm61569685e9.2.2026.09.16.08.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EE64861926; Wed, 16 Sep 2026 16:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572636; x=1790177436; 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=XDBeIItyJVXMmWM9fFuyv25JigkWsWFtvmOqP+mqtyk=; b=vuDojsTOtpQDKzUm9WkWqIQEaiBPMPCzWcM2RGZ1aVNypa6OX6fNIcxVv4sJy4FsPO V34g9VGILaRvDGxMUk78a4tHtCm4OuvZEcpmKGDHL5ShiPRoG529OV0oGsmADQ3EDyf3 JIxJjDbGpYljsmn3KYQTu8UlWgGPwknIMbIRosZ0LesEz79/ZIYgnK5ud9gsiVqmuW6E X+dHZTAWpsGrtrG9gmysug3elr2XR1v3uu+em5PQssiITH1TJNPXELbj51Of6M8k0zQ9 rPijSXFkqe3oSbulj9+hVovzJx67+ilxYzORr6GPpycpBJa3tAfWOJ0F2KL8idAa6HhL 3C/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572636; x=1790177436; 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=XDBeIItyJVXMmWM9fFuyv25JigkWsWFtvmOqP+mqtyk=; b=dVh2Z9Kd9D946t9RVgsOamUxR/LjRPn+DEZmwXwprByWZDCj/nuaiJdYx2W7xkOmm0 4ctVnn/VByIDwL4ypMvagtY+qBRG0b4xdlZckT00FY7z3n7l8/e3TwL8GlWt0kJLL0GS zHJgL8ViYb2UBhyVbGP0djCGtk25sousSXDYkHb2EdrSkMOuOMVLcoWf6mvUVqYzBeOX TFrjjslX64s0DKK3ea7UJY4WVQ9gOurdPlUQpirUqfakURIWKsNNAO3B5Kn7F8RKDgnH XOUEFuvxvcb4WCNP9197ux0z2Oe9AhgkauifsT303fE3R2tJ8h+kCQg8JRhOys/xKupL JqPg== X-Gm-Message-State: AFuF++mkLKPel2f2HFVjy6++Dlfthj5PF1aF3ciI+q/ryfg6BZzw0CWb v4qtheE8UOJKDI4AMjI7ruyINz8IVPStlAE2dBrJd+y/dyChDY3f7vniUL5sLw+uDn2tuw57ZhQ bSSnpp+E= X-Gm-Gg: AYBFou1+DqUdd865vhkg/M4NpFT0Lc7ppU2OzMx1Vd2HsWAdhGLzClo+b76q+5mNavx HbtMEn8QytxR4Q73FRc65y00R93AaVw4DncuBZBr6FAeJjj/NvzETxnQSO3oObcEvDE3ydcmZwG OS+Gh6VbViLcIx+OwH74010AjVojwPvGKb4Uygjxr70f7PV6QuBLgBOP5R2LLsBn7bYDoDhugNn sNW2I1owRsv4geMqPkRzqYbUva7nhBugs09+ArlzLApqB4kvxCjitJ57JqpMpa2QlqWFIJcdLsf faIMnDiU0VlQ4jU8rsUk4ZeYcOK3/5acEr434eEAgfopum8icQL9TZKnDVkKtzm66vR7at9+KD5 sm150P3mfEdEe3IQWOJjp/pYcGusNg223ksiMoROGS/cNObzUspqcEhxedoy/sC2kROw/zxo/TY MuvGHTKpJ6cPlPAbk/KhGdaOjAxopluyqAndaEgijtKzOekx38RCVnRAxbcoz+viQ8bLnWgXs= X-Received: by 2002:a05:600c:83c4:b0:49c:ff9f:f6b6 with SMTP id 5b1f17b1804b1-49eac463960mr39184175e9.6.1789572636125; Wed, 16 Sep 2026 08:30:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 07/19] tests/tcg: prefix meson built docker tags with qemu/ Date: Wed, 16 Sep 2026 16:30:00 +0100 Message-ID: <20260916153013.2134555-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: 1789572747471158500 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: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- tests/tcg/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 890da7b81e9..d2a837f103d 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -237,7 +237,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) @@ -252,7 +252,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 @@ -261,7 +261,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=1789572770; cv=none; d=zohomail.com; s=zohoarc; b=iDVjoOVV6Bwv3f3rqgYUPFjQfCauXmoyA6xJmgddYeqqUmLUhwewh8JLpV78T3n4DOHn6ioX2ua7jgEvqrbSc0/M8jLQegi6xI2RrSX9scu9bdQGU/oYAt9g7hKQx3pFeqqHCNBTLW1ph7M9lNslHRaqJkxnAGDap0Srb7sALWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572770; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ia1iqu2U+qZi5N8AovWb2KY0ZeNa8fN7byR+SUBWsVY=; b=gsehDjomxF6LCVmPFFNa7z4LISUCFqPIb94+Nyub+W7D3o7kiwjDhx5cxFOymxZ7NMdYQDBsHYywDii1n9T8P/moiKvaeFDQRhqfzIn2o53ph0CBmbilm8X4myQbETcXqhVnDoMhyx9na+Gd+MWi76uDOUHhTze9SI2yhnNlm7g= 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 1789572770571719.3129833044443; Wed, 16 Sep 2026 08:32:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbD-0002Qu-4u; Wed, 16 Sep 2026 11:31:03 -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 1x6raf-00028g-Ve for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:30 -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 1x6rac-0001Ok-UU for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:29 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912d3931so7760255e9.3 for ; Wed, 16 Sep 2026 08:30:26 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e847fcbdfsm51416285e9.4.2026.09.16.08.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1659361929; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572625; x=1790177425; 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=ia1iqu2U+qZi5N8AovWb2KY0ZeNa8fN7byR+SUBWsVY=; b=MWH8/Cm9/067adQ9Y0PkLl1yqbuBnd+xWsGngW3q6uruQkB9MlDUrotOwFwP2QcYuK L8Z9N14Ih0RVnXsPg7OcmXePoASWrISqDB9edJG1kPQUZZX/PcBfh2fQ3N0gZjasBgAl aml1m9if2LD07iUTfWIFt4heA0AsDyfa72LtwXZBqhMaJyTyLmdIDYE5IKDfMrwWDtxV D6uX7AukmaVYU5N3bIEKTm25slLx8Zmoyhyu6SzOl3hoZyaDc5FoQBoqM5nEiAaBlHZI tU4+IeIThW95cNMKeuD6CAFvoN9rM5zzleMgkDuOYTAqwwbJShsb9Cd77NBoebu4c8dt SF4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572625; x=1790177425; 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=ia1iqu2U+qZi5N8AovWb2KY0ZeNa8fN7byR+SUBWsVY=; b=0bm8nm8x+bQVR49cUbzc5DUodqEagCMGiD6zNMGuigoyEKI9gMUt/641piFtB2Ptu0 olsrjCFkOMzbloBYxUSpcmq0Fu9QuIuosWkkbZ5EZIopzd32pm2+yIoTY9Rmv8pkDxti bHovUG9/OSBR0JTNmMzoNdurVq7H+bO/FDAS8n7IuQNknJBG5ZehhXM6MLoiDdrHaqVe s6X450KFxpVMIilsfoieJP4oDMju54yCylrL2MtpQhJresK6p00uVXB/3GelA19ZAWAL UX+gdPylhLvlBEtpPZ+3UB0gtL0+Ctam+ZFAfTajAOk6aegNpOmvLLBTrbB8x7JCctqr cVSA== X-Gm-Message-State: AFuF++kBvMaRwhsEtpYI/1j4VNL70aGFNCzfA7JBy9gyXqDWBew4cV0h AIaFbe8qujtIeu9JK7VRul7NFZxJ59vGku9YtzNhw5B1UVt1nLyNda7I4N/2QM9jsPE= X-Gm-Gg: AYBFou1RhqbQcqlZS2tfFJ0F7EhiRUqodJTYp2ZTVCWVWrQYPUtsAm15dTo++ygKfFL ip3B8pYQLVOvbx1vnhSRB/J7uAQgvU7ny8HigIM8HD4wO2Htn7Gd86I/Rps9wwm8RG7WKkf7tYc GsQ/4y53CCbTGpsH2Zp4zAtYYIS0Ko+yngYEMTNoF3NFS+sVImLtYha7yR3+MR9h9Rcv4VPku1j 3a+n05kK02faJbUq7vxktsf7Gi1stx7Ayf0DnACjt+6PYJ8ZulUHF2VJWU3iIUGWJCh5FTjNQl8 tnG1CZsTl5Q6wAfeAN4HOyPlPNJ7mfzMEbuIZDfJmG1NazDAzCEdE808uDt7mX9/Z9aMbf2WS9K 0jJ1Y/t9AnQukLDOaLszUNq+xHX1PY5r1gYam/mCjnUXG4YaoQJKslCB83dXgyhAZNbTSS16rEv i190ABGVVOFqAmnbo/eZcz02xXsUcPseBIiajO3w1t83v6d/u9uyCiKkwA2cJ27qqY8/F/j83f X-Received: by 2002:a05:600c:4686:b0:499:8b13:3a98 with SMTP id 5b1f17b1804b1-49eac46396bmr36048685e9.4.1789572624964; Wed, 16 Sep 2026 08:30:24 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 08/19] tests/tcg: use --add-current-user when building containers Date: Wed, 16 Sep 2026 16:30:01 +0100 Message-ID: <20260916153013.2134555-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572771786158500 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- tests/docker/docker.py | 13 ++++++------- tests/tcg/meson.build | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) 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 d2a837f103d..d317f0ee310 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -237,7 +237,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=1789572754; cv=none; d=zohomail.com; s=zohoarc; b=lnt6mp7wuU4JIVSJR58H/maf2S6+CfXBCNpoMbT4uhnbZ3kcxqZWoAicMLhALfkaIpTD+b/usx9vAhCTX3X5MdPWzqbiBSMPZY7uqIDgNO5uDHSAAF160irPyZH/F3eYlLVWBylF07JFLtxdo9z2VCzSsbTC7O3d4+dDDBJt9ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572754; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5VZ9WHBeOITZkYlGYis/Zw/ne4HgXN9leet0uUIp4tI=; b=YYRZtv20fvV90VOwlCZkVv3FCSKo3uiI4iJk7cRaAqCKXAEGkIfFG+HHaPvsVNK7kXQU5Hodt7uzQkIs+V3mYqHqeoGs+fTRzfU7Db8yntqUNa62pfuJruVBdZO3+BrN8N7a5ba+9d0BxuYLoDs/BJ7Gqd1D4AcgV/io8F7FYvQ= 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 1789572754365780.6944751087341; Wed, 16 Sep 2026 08:32:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbE-0002RM-9K; Wed, 16 Sep 2026 11:31:04 -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 1x6rao-0002CX-8j for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:39 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6raj-0001R1-Fn for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:37 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-495437bb891so15207065e9.1 for ; Wed, 16 Sep 2026 08:30:30 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf37e69sm7898928f8f.29.2026.09.16.08.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2DFFE61971; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572629; x=1790177429; 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=5VZ9WHBeOITZkYlGYis/Zw/ne4HgXN9leet0uUIp4tI=; b=hWQxGPpk0FmhdLTdAJ18uGd6lCs3JYCe+/0k3Oq7pu423VUCwFRnqJdjUSTMIbbAhd oMiEkYNepc9h70jqtnNxif5ExRX5woyApoZCCSXGJXX0bB7Yn/HsOrSWQRgmwpKFbAWE j9N8PeBLJYr+NdZFGbkqFGTI9qkm79l9wfV631zTE8DCNC8qSCfEpfEWrsssfNlB+oEa kwmOEWwTySGRBqMnSZktYU/ZXs3T9TvQ4v5rap/6e1/G9dyIV2n6l8NhyduqI28ijFNi qQxAl0rCCMw2hAziZuBM+UGYDVhtOmloHClb9/Jps1PQpUFI3fp64kezpedJP5RHQJ4A bS1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572629; x=1790177429; 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=5VZ9WHBeOITZkYlGYis/Zw/ne4HgXN9leet0uUIp4tI=; b=PT+PeWCBaBxk4HSUWxpceLF60grok1l3Ovgm6a2yFafRtkwJ1Rgm/2UUqnMxQkAHM8 QBmm7ZHjnH6L3yxVE6aPckjwpksVrEc8KTtH4gk3NHZqK9TTk6A6AxVjlaiVs7JFKpmy fsl8Ho9ciof0+bK5kli+7FDwGPFPdSHlTpqu02gMPYCfdYMYvk3X+0o/rej6XZM8w1gk 40d8DpcIX6mH4/dlW11nPDh+EE388BInjFVeo0PKOC3kgAFal7negix9F3QzuCZLA5hj GTLz0N14MVf/IFr+Ip/NBAuEkVqLy4rwHeErGxM6V0qAxH6u6wTbEvLitRifj8eUrx1F nnPA== X-Gm-Message-State: AFuF++k4P3aFjTDzAgdFzWSZbSx3mVk2Z4I1IJy7JZYXN6cHCWPjucul 8npD/vyLFsW8cyNsppReJ2jXrJ2VGCW0Sl5l1SxhOmsrkR6wR1f/A6aeVt26z6rgeP8= X-Gm-Gg: AYBFou2/LbRMDBlNPzBWN568MKHuGaDuzfht6YtYntKz+4aZXLP7RXuUAWs8cefbz9U yTZKIVEAkAxywB1ONHW8bDYaTxkfPZBMprdOj+CXYgcyVv4rDg/JJMgEDvG+XjpGBgiprMgZT60 WYG9f3ByP7vI9qdAVkMxDhg00YOrN8mjNdO0nLJHoEnEe1PL/24ST7V8KWG3MIOkvOr14MoVo1G fGlKE6r+OoT3tdFNNUuP0iQ8aHkfRh5ajKMzzZYVFn92yDZusRoD5JNCTMVTrwzsw3mnChAJ4rI QM6SPFrXQWePfGs+KLdBdnVvanv1LbhD/ySQBhNiOubrczbzA12O5RpqvWilD9X6+Q9CMactXTU GbapTD/PgGebo9CLuqo9ulzK5mokDviYQo2eVa8chyScdmsTGFyS5uiJ6XzSwqEywVAnGBdAbgR mp2/l9wsLo4YvTUASLKvDUuO/EHYhfgaU7BjwQl5/L+BTFNfthEbOHtpVcTOE00RW3IcZulzw= X-Received: by 2002:a05:600c:e555:20b0:49d:27ee:79c9 with SMTP id 5b1f17b1804b1-49fbd1c4afamr22145e9.8.1789572629187; Wed, 16 Sep 2026 08:30:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 09/19] tests/tcg: don't define tests when missing compilers Date: Wed, 16 Sep 2026 16:30:02 +0100 Message-ID: <20260916153013.2134555-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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=unavailable 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: 1789572755459158500 Skip defining the tests for an architecture if we can't 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. Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- tests/tcg/meson.build | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index d317f0ee310..904a5a02242 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -264,8 +264,11 @@ foreach target, plan: tcg_tests if not cc_from_system summary_cc +=3D ' (from \'qemu/' + plan['cc_dockerfile'] + '\' conta= iner)' endif + tcg_tests_summary +=3D {'cc for ' + target: summary_cc} + else + # no compiler, skip this target + continue endif - tcg_tests_summary +=3D {'cc for ' + target: summary_cc} =20 folder =3D plan['folder'] gdb_arch =3D plan['gdb_arch'] @@ -373,6 +376,9 @@ foreach target, plan: tcg_tests cc_has_feat +=3D {cc_feat: avail} endif =20 + # While we skip defining tests for whole architectures if we + # don't have the compiler we do skip individual tests where + # the compiler is missing a feature. if not cc_has_feat[cc_feat] skip_test =3D 'compiler feature ' + cc_feat + ' not supported' built_tests +=3D {exe_name: exe_name} @@ -380,10 +386,8 @@ foreach target, plan: tcg_tests cflags +=3D cc_feat_cflags[cc_feat] endif =20 - if not has_cc - skip_test =3D 'compiler ' + plan['cc'] + ' not available' - built_tests +=3D {exe_name: exe_name} - endif + # We should either have a compiler or have skipped the whole target + assert(has_cc) =20 exe_depends =3D build_test_depends if 'depends' in setup --=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=1789572786; cv=none; d=zohomail.com; s=zohoarc; b=c4okUoOsu3m+WWpDXE8sqU8RxuY4FEFHj12Mxgzi5H26NjAxSQSue2Fup4MjnX6VSuxDQnhor4uNd6H1IMt0GZdE1mETC9K5aqMw4Gy41UC/4SWnWzFs8CMw5LWU78U4QrqSeIJuog6wSVNAc6qFicbYCKlaXyJ5F5qO0GDZZuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572786; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Dj+ZspCM6J9NNrIvMuGuEdHfeVjGm1hpFjFQh39bi48=; b=PO29Q1E+0Bd3fp6Zz67JIOoS8LhOvbvoYXDT4whoYWjbaopq7wmjVogd2mBYPFS7OL+bvqTkeDi8m60PRaDaaHWxEtM6hR8I/kEUWiYAcmvAbNyb9LE58Bb/7aXZP0lsilDywqefvDzSW80ppfoykCqJoH668LdsZo/KEvJvX9A= 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 1789572785986193.84066263424393; Wed, 16 Sep 2026 08:33:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbA-0002Ns-G4; Wed, 16 Sep 2026 11:31:00 -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 1x6ran-0002Bq-Me for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:38 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6raj-0001Rl-Ei for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:36 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-48442ea8f59so965569f8f.1 for ; Wed, 16 Sep 2026 08:30:32 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1fa7dsm8078982f8f.8.2026.09.16.08.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4A65B61982; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572631; x=1790177431; 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=Dj+ZspCM6J9NNrIvMuGuEdHfeVjGm1hpFjFQh39bi48=; b=Kox+fHh3gxv2sXLX4dvkeA66iB2DAguxNj7X7wlxxFiZEYP+xdugX3b0j7a9yIBcIu dtuBvm3RJsj76hRAxd1z5fDF/khxBmL6/c8jvVqBOBA8tDa6d61m08W0fu7vMtXrTqA6 SEND3nDUgAyw1q2lbvmprHfQ9SpyWIVB5j0Jv6xn3+r0aSvLXH4urCL3CqHE6Sm2Wksz 34jjLf7g78EgyMZF0Z4PF82qNGkOmuRT97z8zf+rjUrqX1+2uma9EvQ8Yo77KiK/HH3u Bp6KtfAInkSacYd34+doKTUDNTjqhalWm1mMpmUTjL9A+943x44uKIwQY7eIW7DCswck uYyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572631; x=1790177431; 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=Dj+ZspCM6J9NNrIvMuGuEdHfeVjGm1hpFjFQh39bi48=; b=mZ3bdStlok+sAlopZB1tOon+8Y9dpZ6Rm08jhObx7/FApeopstoTdD5fa5DOdebOGx +UswTN8hVk4JkIO+kEncWsv69zmGSUMTHXnIHbFTemavGZh1U0SYZwaJjv1n0tQIGtEH WX/0MwNRyMQeDLfHK5YHg/t0kdV+HoNyhCEgE2LPphNKzCSZo4uNQWEU4bnWVl3CmlLY tA5xWUl7q79kQxW8wdfHNIAkCldR/cH6C5IHubw38DloYSCosqFbCiqTY5rcXMYE6VnI 8oJM7jdXCkgYgny0KEcr8HqdJtMfrZZV0JaXBC5YqTaY3EfRiZ1AWP7NpSLFCwmdtZyG wzPw== X-Gm-Message-State: AFuF++krgtV2mO59kEdPgmSTqvkY1xLR+DvuZMIKkvSQERF7LPCba858 RLyzSkB3TTwosrfWxZmJUWBKb7N4ThQl18bmhY+xs6yNQj5dgVlcuc2SZwC/3kWAORk= X-Gm-Gg: AYBFou0oyMAP1yZN46/yeYCrUKo3S08mmAXxmiz9e8BDrJSaBVhdoQWu4K8EGpyy9Q4 WlRI1tva2SGR8y3i6WK4N+/h0WpVvLWz9ogURLEDiULBTbetXoxuOHhLEeX+1W1E9OFFTGV4I5j nnr/uwMeJWSY4pxo2V4/qrAonz2FbipZ6E3l/IF/YKsBAOviLzzJ16/RHy9ER/vzpqSdNlfyaCC em4ZbUOTKbI1kfRXnILfFve/f7h8rvvs9P+bQM81PrnedqCsQhx3RuUCf3bUa7HuqdwpuDMNnnk iSF5KsZg4XQFyX3lSFA+e5SrqjjmBJJmjhzM0DipSk4BPtLTpmWLbG9hWJ9nJ3bznoXIS2953lT PgYoCi1t03DJKhden+tYddO/lHQnxvVtdk+OeRU7RGi8dCOjxPq8VfDf4LXMGAO/U61U1wRFZQr cXlDfjXi0NH/U9gigGnvhObqhMkodG7AKCgjBL3YKIH3scPSPX1wZpXNKifMZ862rFa5G2LWE= X-Received: by 2002:a05:6000:46c6:b0:487:5:9cae with SMTP id ffacd0b85a97d-48705b9108emr8827727f8f.16.1789572630195; Wed, 16 Sep 2026 08:30:30 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 10/19] tests/docker: add container registry to configure and use Date: Wed, 16 Sep 2026 16:30:03 +0100 Message-ID: <20260916153013.2134555-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: 1789572787703158501 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- v2 - fixed conflicts from the revert. v3 - regen meson-buildoptions.sh v4 - merge conflicts --- configure | 8 ++++++++ scripts/meson-buildoptions.sh | 3 +++ tests/docker/Makefile.include | 4 +--- tests/tcg/meson.build | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 67967cd294c..b0e1e694a6c 100755 --- a/configure +++ b/configure @@ -173,6 +173,7 @@ fi =20 # default parameters container_command=3D"" +container_registry=3D"registry.gitlab.com/qemu-project/qemu" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -736,6 +737,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" @@ -870,6 +874,7 @@ Advanced options (experts only): --cpu=3DCPU Build for host CPU [$cpu] --disable-containers don't use containers for cross-building --container-command=3DCMD which container command to use [autodetect] + --container-registry=3DURL which container registry to cache from [$cont= ainer_registry] --gdb=3DGDB-path gdb to use for gdbstub tests [autodetect] --wasm64-32bit-address-limit Restrict wasm64 address space to 32-bit (de= fault is to use the whole 64-bit range). @@ -1732,6 +1737,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/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ba3c9de216b..0cb1d48c982 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -10,6 +10,9 @@ 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-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-coroutine-pool coroutine freelist (better per= formance)' printf "%s\n" ' --disable-debug-info Enable debug symbols and other= information' 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 904a5a02242..87e5614fc83 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -104,6 +104,9 @@ 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 +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 {} @@ -239,6 +242,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=1789572743; cv=none; d=zohomail.com; s=zohoarc; b=DmiR512/gWs33FUuiAnwtxap/ZfMTleLVcJkSeYkZ3JWJDc+aE0KaqZN4mg9o0ZABJUAVwYbhKZACZOvD/y/vKiAfn7eQuW4cRdJjHdgG+4QAZwd5ZS5qmDzLD/fHNwUIh+kkoV+/jfch6pxFLSoC6umU91pb+NYH91WeaQvzgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572743; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=FohqtHLwqIj+DhhXf8aiKI2OxkwlpnQVJjR8rlpvvSi0gkw4tXr5J5BTqBu2sW8ql8DciV29QsTBp/dlVG344AI1EbR+sT+tjydisu1cbyhDqCAiXYhALSSClgjALHecYLtVuMiac2+0OZhQ9WPnuLtB3TmalSffD3FoeZyWq0I= 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 1789572743124966.1830679193615; Wed, 16 Sep 2026 08:32:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbE-0002Rj-Bp; Wed, 16 Sep 2026 11:31:04 -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 1x6rag-00028i-5Z for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:30 -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 1x6rad-0001PS-E4 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:29 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49ccead2aecso4964905e9.0 for ; Wed, 16 Sep 2026 08:30:26 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd1a56d6sm194715e9.8.2026.09.16.08.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 63CA361996; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572626; x=1790177426; 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=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=NPjFly3mrT+eoFe+HhAwN4yYTIO49np8T8/2umCwwbr9PIL48rZ5+WI/XMLpoftnVo pABC0oIZN5LA/BQl5BOerAMDKpBSERt5uNKdPg6M7XGUS2UUpzNZt6TtPlRS9wYMn3Xh qN3lVzLkoUEVwou7yU3sChL61StubG6oiFO0/EEMzgAtDP14iTov3SeovpcFJwLIOYG1 hvJ9qK7fO2tdO6JYcQTYgpVtnlGWV7V8fgF4BvNcnFZcBC9XYyFLN36PzKNA3KhT1Sjj AgPsBYp+oJzwWgaYDuVqV7v4UDi4335NN//GWPNPN39aIdzP/pbaSVH9fo8P7Ix9YA4P SCBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572626; x=1790177426; 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=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=A1ZUnGsuliFK1hzyPx2WkIHLxD/dsFoeWhCdIyyRevDjGUIm0KHe+SUJ8COMIBjBk6 RwoZ7Qfu2i4rIx9AiJvvvP/B6R9R380ynHmtQk1IGKswcVH6+ObcoEgUCER8AhIKMIIe mxpJXIXAoee+yidv5kvZjXP+izzD0PGDJuZ3UDLeafdbV5eUHvMyU4xBAO46KTfCnMc8 HRbH9n02rWEGGeOJsUXJMaiP/rc+hWb72mnaYJFnS+UuK3QmsCzRm6Cb3UzhTqgLZUxH Yvn7zwXTOUKkXrnppj7ZXFLqSHzfElg9B9jAaQ0hO8ioBKg3BRkzvL/cPzYPZw7mzWox yAJg== X-Gm-Message-State: AFuF++m6nWhIjl01JZ04FCvwrVsOKAr2pTkpH/iv9N2LE7FNohZ/cFY3 8QRF5MgHc5TZShMWUUQzQNbAJN40a69rgw1Vcw4/nlEJgQHJoIurpwO2rZgSfGNeIYM= X-Gm-Gg: AYBFou2YRAEot2uIn7Zxvn4kluY6fdnn+yOe5rU69vNUPU0lL1LXnlvFZ4NjjkZ5pOI w0lHUzjB1irmcZl18RMux88fRt+Ew9uUyxKla6lCuRriBV4z+hmj2K7FvwmKwVZT/OZy2SUl/q7 ScSDVE3+zGsNk+EJEwxU7s6nB5lo8yaA/S5ZyLUavcUk0CKLmpYy5hcXr6UzRXuRM435f96OdHb qTOqJuEFHARTNC2LOgwmCQU6jMfSpvoKLN6r/gUScqk9rUpyxJUijPN1XlJ2dqDOeRcwRI+r8n8 cW0kZ8cs9fz00VLP6X0n5yRaKOt1ogKvTQC1YL4guEnqvnBS568570fCTZaoytDMviBPEiU2fsM VHH3KtzI9o60vi/hsUmyf0QtmpB62CPmwZ7ur39dEIGqLV6pq+4JrHY8949jJ0S0dbRfugwuzpL FE0SW62hn/qMYh7RnuQ8/BJjfuEcWhWNvbHlsrvTtUvV5WQPSR49S4dz9xLp7LjOv621xUnYE= X-Received: by 2002:a05:600c:3547:b0:49a:a101:4157 with SMTP id 5b1f17b1804b1-49eac45c077mr34765705e9.7.1789572625872; Wed, 16 Sep 2026 08:30:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 11/19] tests/docker: remove used _read_qemu_dockerfile Date: Wed, 16 Sep 2026 16:30:04 +0100 Message-ID: <20260916153013.2134555-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: 1789572745476158500 This is no longer needed since the functionality using it was removed. Fixes: 07056db1b50 (tests/docker: remove FROM qemu/ support from docker.py) Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- tests/docker/docker.py | 10 ---------- 1 file changed, 10 deletions(-) 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=1789572679; cv=none; d=zohomail.com; s=zohoarc; b=nXLDd/vammsMB4lPk6MF78BiCb9UmbC2o+e5WaNlcvWpst7K0PE9O+fFTz0//XISyE9M0ItkK2MDD0uUknhNdmV2BeA0XYQPPEF9gYMUhP4JET+Vju4QqaVDIOnHh52Axzc4nAenKUOlcDkuiOziX/wAqxMFJd2B0kIwWZQIa/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572679; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=n3t6XzxceYD4cBhUYFwM2NRf+qWIKkjXXkUXa/NxJW9KwrNX7MeD2IkjNMbzpu+jgPH6MMzzpPm8zNhov6N7ZE/1QHqPSPnjYfg7w8hSJFRT39eWHL02VmXe6fYvs6e29t4hzpQmGkzTKMb0n+dUCufpxfdGB4/V6AYh2WKYKCQ= 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 1789572679208966.663624508741; Wed, 16 Sep 2026 08:31:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbJ-0002Vk-Vy; Wed, 16 Sep 2026 11:31:10 -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 1x6raq-0002D4-Dy for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:43 -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 1x6ran-0001Sc-Bq for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:40 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e79a408deso5686955e9.2 for ; Wed, 16 Sep 2026 08:30:36 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd0e01e8sm1648655e9.0.2026.09.16.08.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:22 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 77F986199F; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572635; x=1790177435; 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=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=Zpg3fBUGFVXPpjykn4T4EReSZvU1FulfS4TbH93ZbKN9jUyhgIuiMBxDX1ckkwd0Tc Csl/yNICJ+Y1RvXcfW2T5uqU6C90lc5phL1lw9rpNvplr8N8FAurN1kLVihaLXUUA/y7 DmP9wHOH20z49efECQsbIH9DjAv0XxWoHQka+hVax5D3cZgmUnexmE+zJTQAc8wsEXMI L7HSbtdsDDPzNGOoSG728fwQLJAOzrSTOTcL/796iM9lgx61TLlCtT78XMPItQajqAYH +Lv3gcX7gwZaX7kol5UPbuYNg1ixYeBC8qTJ9I21prS2iQt59ChgPsgZdYJkcnYN6DzC gBBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572635; x=1790177435; 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=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=pf253S8+BYZT8NUgnd5zyueoRrPAn3b/3tekxIzMbUpwk3c+5KmBEWqZFxhllfkdUR +7RwcxlINAEi4/wPXRbhCZyZ+Lktik3B8sXCXLj11wJMA/0n4Uw7tEtOHJHg8VxUHKTn qEO6/Chp1dLd2wq8hzSOaS6OJ9AsFsx0F+8TYYJRw2c4AaVUOJ1M1AROilYTMXSuPZ7m HPB8dWnf65Bp355UHOCjiGXcuxRMKS5WtQ2ae1Dqg0NnzYvL7Fam0KpTn7W/3EfD7lFS +9LzEwjLejrcANs0w4XtA38PT7gOrxd5kpUOkby/0vKkosbWKIdCWnzwN1q3Un4MDjz9 IXxg== X-Gm-Message-State: AFuF++mkrpOvkIzFEptILoovTZVEC3/dgvtKyHdPDyULNzx5UkwHLa5Q r49BLOAH/OpG3uM8gVCpcr6D/7NESir3Bgf1XRsbPhflqLxDgVsOhiMOW0j1ZKHIVvA= X-Gm-Gg: AYBFou1bmvxAthi/4VXRpZe6oYEPDPJjHtzTr6uOnhryeWB9x3H6c9ib9Ybm8lOednu mD4rz2IDBb2GH5L42DwVlFcpMwPKwYR6+PhGRnmuE1r+JSpnPYTulhIuM6Li/FgYT8y/JFUumOK UCHdqMwTLwasoJgXOC7voCKi0Dmgl8qRpaf98TPmQK976FHlFxnEax+8NzBdDOPTDTfzL4C5yjD rtC2WOfUW0gag27wi9xnS1eOKldk7lf6TxxEv25YktkGCOIPULpd2W5ss53j0Ry9ERp6LBS9wN1 ajD5gCTZgiHzdmTezRCg1L+6/5AlGa0qTgfXqmWG7V0jHKD6sdO108Fj/tDDedszZqTy9YwjP7E qj6c9NbyuNsVldv6AwVUiHG/GLxIUFZqLyEvpJUWbfNPciWSeNxNVFt1/SjqA+upjjlcUmmQ9mQ uhJjJPN+1x9Dl8aucH78PHWJd2SkhD7D45wIl3hiXKY9f3UdG56s7JaesrLsvb2Qd2oRXoixM= X-Received: by 2002:a05:600d:650d:20b0:49f:bc8a:b103 with SMTP id 5b1f17b1804b1-49fbc8ab1bbmr7391905e9.0.1789572635038; Wed, 16 Sep 2026 08:30:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 12/19] tests/docker: strip remaining caching logic from docker.py Date: Wed, 16 Sep 2026 16:30:05 +0100 Message-ID: <20260916153013.2134555-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572681033158500 The caching logic was a remnant of an older time when we had multiple shared layers building that went into the final image. It was arguable that it worked back then but it is definitely not needed now so into the bin it goes. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- tests/docker/docker.py | 148 ++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 99 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fd0cbdfe856..a2e97061240 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -15,7 +15,6 @@ import sys import subprocess import json -import hashlib import atexit import uuid import argparse @@ -27,7 +26,6 @@ from tarfile import TarFile, TarInfo from io import StringIO, BytesIO from shutil import copy, rmtree -from datetime import datetime, timedelta =20 =20 FILTERED_ENV_NAMES =3D ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -35,20 +33,9 @@ =20 DEVNULL =3D open(os.devnull, 'wb') =20 -def _bytes_checksum(bytes): - """Calculate a digest string unique to the text content""" - return hashlib.sha1(bytes).hexdigest() - -def _text_checksum(text): - """Calculate a digest string unique to the text content""" - return _bytes_checksum(text.encode('utf-8')) - def _read_dockerfile(path): return open(path, 'rt', encoding=3D'utf-8').read() =20 -def _file_checksum(filename): - return _bytes_checksum(open(filename, 'rb').read()) - =20 def _guess_engine_command(): """ Guess a working engine command or raise exception if not found""" @@ -263,38 +250,15 @@ def inspect_tag(self, tag): except subprocess.CalledProcessError: return None =20 - def get_image_creation_time(self, info): - return json.loads(info)[0]["Created"] - - def get_image_dockerfile_checksum(self, tag): - resp =3D self.inspect_tag(tag) - labels =3D json.loads(resp)[0]["Config"].get("Labels", {}) - return labels.get("com.qemu.dockerfile-checksum", "") - - def build_image(self, tag, docker_dir, dockerfile, - quiet=3DTrue, user=3DFalse, argv=3DNone, registry=3DNo= ne, - extra_files_cksum=3D[]): + def build_image(self, tag, docker_dir, dockerfile_path, + quiet=3DTrue, user=3DFalse, argv=3DNone, registry=3DNo= ne): if argv is None: argv =3D [] =20 - if not _dockerfile_verify_flat(dockerfile): + if not _dockerfile_verify_flat(_read_dockerfile(dockerfile_path)): return -1 =20 - checksum =3D _text_checksum(dockerfile) - - tmp_df =3D tempfile.NamedTemporaryFile(mode=3D"w+t", - encoding=3D'utf-8', - dir=3Ddocker_dir, suffix=3D".= docker") - tmp_df.write(dockerfile) - - tmp_df.write("\n") - tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s\n" % (checks= um)) - for f, c in extra_files_cksum: - tmp_df.write("LABEL com.qemu.%s-checksum=3D%s\n" % (f, c)) - - tmp_df.flush() - - build_args =3D ["build", "-t", tag, "-f", tmp_df.name] + build_args =3D ["build", "-t", tag, "-f", dockerfile_path] if self._buildkit: build_args +=3D ["--build-arg", "BUILDKIT_INLINE_CACHE=3D1"] =20 @@ -320,13 +284,6 @@ def update_image(self, tag, tarball, quiet=3DTrue): =20 self._do_check(["build", "-t", tag, "-"], quiet=3Dquiet, stdin=3Dt= arball) =20 - def image_matches_dockerfile(self, tag, dockerfile): - try: - checksum =3D self.get_image_dockerfile_checksum(tag) - except Exception: - return False - return checksum =3D=3D _text_checksum(dockerfile) - def run(self, cmd, keep, quiet, as_user=3DFalse): label =3D uuid.uuid4().hex if not keep: @@ -412,61 +369,54 @@ def args(self, parser): help=3D"Dockerfile name") =20 def run(self, args, argv): - dockerfile =3D _read_dockerfile(args.dockerfile) tag =3D args.tag =20 dkr =3D Docker(args.command) - if "--no-cache" not in argv and \ - dkr.image_matches_dockerfile(tag, dockerfile): - pass - else: - # Create a docker context directory for the build - docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") - - # Validate binfmt_misc will work - if args.skip_binfmt: - qpath =3D args.include_executable - elif args.include_executable: - qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) - if not enabled: - return 1 - - # Is there a .pre file to run in the build context? - docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" - if os.path.exists(docker_pre): - stdout =3D DEVNULL if args.quiet else None - rc =3D subprocess.call(os.path.realpath(docker_pre), - cwd=3Ddocker_dir, stdout=3Dstdout) - if rc =3D=3D 3: - print("Skip") - return 0 - elif rc !=3D 0: - print("%s exited with code %d" % (docker_pre, rc)) - return 1 - - # Copy any extra files into the Docker context. These can be - # included by the use of the ADD directive in the Dockerfile. - cksum =3D [] - if args.include_executable: - # FIXME: there is no checksum of this executable and the l= inked - # libraries, once the image built any change of this execu= table - # or any library won't trigger another build. - _copy_binary_with_libs(args.include_executable, - qpath, docker_dir) - - for filename in args.extra_files or []: - _copy_with_mkdir(filename, docker_dir) - cksum +=3D [(filename, _file_checksum(filename))] - - argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v - for k, v in os.environ.items() - if k.lower() in FILTERED_ENV_NAMES] - dkr.build_image(tag, docker_dir, dockerfile, - quiet=3Dargs.quiet, user=3Dargs.user, - argv=3Dargv, registry=3Dargs.registry, - extra_files_cksum=3Dcksum) - - rmtree(docker_dir) + + # Create a docker context directory for the build + docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") + + # Validate binfmt_misc will work + if args.skip_binfmt: + qpath =3D args.include_executable + elif args.include_executable: + qpath, enabled =3D _check_binfmt_misc(args.include_executable) + if not enabled: + return 1 + + # Is there a .pre file to run in the build context? + docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" + if os.path.exists(docker_pre): + stdout =3D DEVNULL if args.quiet else None + rc =3D subprocess.call(os.path.realpath(docker_pre), + cwd=3Ddocker_dir, stdout=3Dstdout) + if rc =3D=3D 3: + print("Skip") + return 0 + elif rc !=3D 0: + print("%s exited with code %d" % (docker_pre, rc)) + return 1 + + # Copy any extra files into the Docker context. These can be + # included by the use of the ADD directive in the Dockerfile. + if args.include_executable: + # FIXME: there is no checksum of this executable and the linked + # libraries, once the image built any change of this executable + # or any library won't trigger another build. + _copy_binary_with_libs(args.include_executable, + qpath, docker_dir) + + for filename in args.extra_files or []: + _copy_with_mkdir(filename, docker_dir) + + argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v + for k, v in os.environ.items() + if k.lower() in FILTERED_ENV_NAMES] + dkr.build_image(tag, docker_dir, args.dockerfile, + quiet=3Dargs.quiet, user=3Dargs.user, + argv=3Dargv, registry=3Dargs.registry) + + rmtree(docker_dir) =20 return 0 =20 --=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=1789572733; cv=none; d=zohomail.com; s=zohoarc; b=VjdL13RCLk4SJf9iTAHYoV7NZXZUQhqOLKupNuP1FpzRF8tSMiab/ifPZsZSGJVAHdf0Tm5b2V8M9lfOx37xoCp5rrBYNdkGcrevl9VFKgYE0b2K3VL8L/1j5iot7BH3EGopQci5jtHqUdd1QgsT6CHIWA4oHuHKd4PkRGb6fO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572733; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nksEiQivVR8/k7raC/CDe1zTFm2rFZxFOrnHCS7fvTI=; b=W6HL0oEhP0u6mCVHlKyIcMQwcsRU8NHhvFB1lXbA3FKuP14ORkgbEguYiyJ5nYeRtkbvL1D/QLVM4Nw2ndU/f95M77ZLjTKblXGNdDJthHHbfjmG3i+AGBjIDEz3b9+u7mEbozrIh0STd2B2om1rPfRiOu0O6e6owWXw7pgEqNU= 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 1789572733735357.2679360808245; Wed, 16 Sep 2026 08:32:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbZ-0003Dc-2h; Wed, 16 Sep 2026 11:31: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 1x6rb5-0002Je-Ox for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:59 -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 1x6rb4-0001V9-21 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:55 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso8148555e9.2 for ; Wed, 16 Sep 2026 08:30:40 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e847e89f3sm30374395e9.3.2026.09.16.08.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8F341619A3; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572640; x=1790177440; 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=nksEiQivVR8/k7raC/CDe1zTFm2rFZxFOrnHCS7fvTI=; b=Znn/CIZCN8PY+xWR5+BwPrcGJ0x8Jid9m1heLR+H0smD/v4gREYE/uRJcAiG+QF+4X ATKjj89uURBVJCygieAjwEiWoEQ0faQfkuLmueM99PtlxKR3TexOnQEKYOTCucM/OxcG MFm7oM5h4kUMPblCoWbr+bBDzmezcgytRuoeXxwCTA3BNJ6MvIxBCQzHMdqBmEdwDRn5 H/I2FCbicBxpAhqaG7JiR76Bocax1uxdoWbe912EMhFUKmovgQiZrih67jJEWjPyVu1O 5wY+frEK35uIoA65bavDAHITpagqQAFDK95ZxBC0c9HZ/eYmv950PKmQyX96pgvCnhOm Xb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572640; x=1790177440; 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=nksEiQivVR8/k7raC/CDe1zTFm2rFZxFOrnHCS7fvTI=; b=JYCZTytuxvatdFIo0i1OsPkP8FahXOICfEljmk0ktPIZxcQyUg1iX0aGiKYek941ZI YFzgLla2Tn30gZguii51PGBF9OPglvcTaDlLQ4fsby9R4SLj2AuYhOd0DGlCzRjAJUqb F7iLihz/fzDHLzTWOLJMwRnAQlBlgnPavrtOupUD0pHOnlD+K5UTwF+gWOh7u5ghyg/2 Wk1LxKNktNH9RdFsJs4lQ7Y4SXXRph+gLgFy95OkJH8MLNwWgy9VbbDGT2shUoJKv51i XsrVWuumikn9tvE/NWrICkEh0RRHWHfH8ZiF/WqJlFveR45Tsf9ZB8q9hOjEhd1oksYz q26w== X-Gm-Message-State: AFuF++mcDt9kG+QbdVdxltGZOMrehBESx3G0pazsaawF5RtFsVPb2D6N 4/YkTxuk0fwK8XpAtGdKNmmn255WdWabXCwYYFQgHReVYocXDUVRGs1x/2uukF7mGvA= X-Gm-Gg: AYBFou3FE5CfcWM3UUwTbQRltz4XSNVSBbicq3VIT53EDlm3fo3mS+fePDHPQmS6Thq ImwFKqVaLRnGt6DwR+Eeg+C4oOY2WGxXideEgTCQyhNKLiQOGZ4rq7U1tcejMmwTPDP8vNLuKyh MWK+JXKSEU3no9UFv8FICin0nJ2PV5mhLJ6Zn6X3YzvgL3h/VkIB+BPd7dxJPEiqmB7UhMlTtui 6qqRFCnVhpHpndnQgTq299ypsy6mogOrO73YXxa6FYFSJcm0vPXh+WA8tDYKQGfnbTjM1XpqXr7 szL+Le+UyoIr/sqGGIdOz7ovXsmoAlt9nslH8kzoDkkkyWnbh5myVKYA8h93fvCAXsF/Ng48lZB 7cjMCB5UGDdxACQ5ZfrKCSvuNEjItLtmNoMdgh71aXxSeugK9KunqDuoyItOmsQBABWgg/11isG UgSJSnWcSEsp2pygN/IYNv8NhgVImeknueQ0lFLxwU7+wtmHFIjQvkXZMIy/t+kDa4ML0g9WNkG CMNZ3Vk7Q== X-Received: by 2002:a05:600d:4441:10b0:49f:bb8a:b4ce with SMTP id 5b1f17b1804b1-49fbb8ab4f2mr19974205e9.28.1789572639885; Wed, 16 Sep 2026 08:30:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 13/19] tests/docker: add specific command to parser Date: Wed, 16 Sep 2026 16:30:06 +0100 Message-ID: <20260916153013.2134555-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572735456158500 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. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- scripts/coverity-scan/run-coverity-scan | 2 +- tests/docker/docker.py | 5 ++++- tests/tcg/meson.build | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) 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 a2e97061240..d7eb4cf6811 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -336,9 +336,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 87e5614fc83..80205f6f98a 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -257,7 +257,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=1789572790; cv=none; d=zohomail.com; s=zohoarc; b=nkkpXdcvd98yLUHLcd6v5FY0vZZwwVs1YSLPm+70N+0ZBKwXcfMZr5jUpvczrW1Fnz+cPaj931rmpwA8JdSaAEGVjapYlnKwPxzj3T9t4GhgK5w0V6b4HiOX8qASi+AJGnqpapW6OVcTHwTJl9Bw8ncGo68kM8PYQ5PTNu3UO8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572790; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pg0bQgdSVMUQdOP+pS6xC8ogAtGnUdIXIfDsr16ThzQ=; b=nSiGumwkpzg/baKIWWIFzp+7hVEEt8pGO90WxmGV0yurn5QTYlg8zi38U5BdFU5pyOza/AIFVgvTB5hhIBzLZk6SdOoqli53pGRP/C3GDIbWqkPBgvNLkTv1ysAk/ns4GYzPMWqf+LOo9+cEP4fSyi/St0qq0AHdCboY3CkIzIk= 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 178957279065514.847225485124113; Wed, 16 Sep 2026 08:33:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbK-0002Wc-SK; Wed, 16 Sep 2026 11:31:11 -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 1x6rb7-0002Jn-Gr for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:58 -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 1x6rb5-0001Vq-4m for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:57 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912d3931so7762425e9.3 for ; Wed, 16 Sep 2026 08:30:44 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd1b98a6sm41535e9.13.2026.09.16.08.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A8E66619F7; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572643; x=1790177443; 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=pg0bQgdSVMUQdOP+pS6xC8ogAtGnUdIXIfDsr16ThzQ=; b=dc8t4lnwVHGqYiKNcFnnOWh3Kpl1grPTQ6xiLEzapOgx88g1HFS8/DAUE2gRUfsfA5 L6IUGq1IQbxJH7QzGltNOSQ3iJytO8n30FkMcYyf+1nxaEkgn10to8SUeoSYiMZFlNBv bx0S8EW9JHj0begPodq8/U/jf9/Mgmo9xtABMPz20rU5uu64TlcHyqNHvb/kfOV8dfRs 4A4BSJa1FZ9vliWlEqn7NKQttEqx115ZCx/8dGYPbu/VcnghAWuOq/g8k+tUkfPHfMFR 5UNjKvdUja7DWbH5BrSGB/yiv2n6SF/BPK8jTzwarx6zT6hdkNO6PYxcssTUV/RLE26u ibhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572643; x=1790177443; 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=pg0bQgdSVMUQdOP+pS6xC8ogAtGnUdIXIfDsr16ThzQ=; b=a2Fqnd6aBwItAnlo3YyvnSK6PxWwSHH68AQ4A0BMGECJP6TKLVjonBGmO8lWP5wCnE lp1y7vgq3aR4ccLlFDly9iharHh+n+XoG28Y4yY+TJetzNgS7A1zzTH7zLzP+qayYYwP F3khjdAbA6v0SsqkEYb6HuqWk3XpnXhG4dWR/MixRlBnWvEYO8HP/7tXtM486gOZj0ex 9+1HbGiaZzY1tGYDhGd5Ur+ePXGDIVYxgb8bZ25LwRS8p/KQ34oBSQB67fSMdrk+ZG/7 oGe5p+SarKFhaw2J9BPVINbSXZDQd/I7GId/hQO9M9ScVO6UXxAYiwGk9N2RiMUL3yk0 3mPA== X-Gm-Message-State: AFuF++kaqdcdNw7h//y1BX725lGn6DqCW1wRO2edbOWgHDWQV8a+Kok2 ZYs++/ZHAGJBV8d/g+9tYsPpernYUPZqcUijiEVxVutjyUebVaEJYms7UYcezG3FOaw= X-Gm-Gg: AYBFou2S36P46WDSKX7q6RfcCFgZoHs0bcI5/b46QhZpduG8FcFrkS/mgaHrmjF2PJz ic8qj/E5ZCvdAI5pnWbfqIf1uvow8vEH5MGq3kSndEPOhYCCB4L4HrsBpw7FLBiRR0+g+1aXwen sdv0z58yJBPlKvVS+VbaTixkUUdLwgAwqJbWU9n1n7X8+WaIOs1CPTEVa9HN31LKp9ChSNfq0mo 55lMhp/KMwajl00LnRJBIgOWa8qKHSmYXmwIiW8YeQ7unWypDwvNZeIdMs67kR0FpMZD++mnstB ToVok4ffLpAPx/50AjUYm1j7zDQwX1XP28n1ILYijtbME1Pqjjhy6aC25w4yGQ9CAOl9Om8OSYG 5k2nYXJLR89OAWWXjEQm1QfdSGHcWEES/wf06M8nETKpvBzESePMaMLng5wcb2ZL11H+sV7kWFo RxlJl5D5yHbcyxvhCzqXNuu+nYsaxAvRDvJBzzWrs8cUpLK4NIsAEjTNB71BG4sIbcGiwnvhw= X-Received: by 2002:a05:600c:c8f:b0:49c:fc6c:be15 with SMTP id 5b1f17b1804b1-49eb733c62dmr38210525e9.27.1789572642798; Wed, 16 Sep 2026 08:30:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 14/19] tests/docker: swap --quiet for --verbose Date: Wed, 16 Sep 2026 16:30:07 +0100 Message-ID: <20260916153013.2134555-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: -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, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1789572791590158500 Running the docker build in meson spams the output so default to quiet and make --verbose the options. If we want to expose verbosity in meson we can deal with that later. Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- v3 - dropped accidental libvirt-ci inclusion --- tests/docker/Makefile.include | 10 +++++----- tests/docker/docker.py | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74bf471f171..85825d74dfb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -72,13 +72,13 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debia= n-bootstrap.docker DEB_TYPE=3D$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=3D$(DEB_URL),) \ $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ - $(if $(DOCKER_V),,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),--verbose) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/debian-$* $< || \ + $(DOCKER_SCRIPT) check qemu/debian-$* $< || \ { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 @@ -103,17 +103,17 @@ debian-toolchain-run =3D \ $(if $(NOCACHE)$(NOFETCH), \ $(call quiet-command, \ $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ - $(if $(DOCKER_V),,--quiet) \ + $(if $(DOCKER_V),--verbose) \ $(if $(NOCACHE),--no-cache) \ --registry $(DOCKER_REGISTRY) --extra-files \ $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ "BUILD", $1), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),--verbose) \ qemu/$1 $(DOCKER_REGISTRY), \ "FETCH", $1) \ $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) update $(if $(DOCKER_V),--verbose) \ qemu/$1 \ $(if $(NOUSER),,--add-current-user) \ "PREPARE", $1)) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d7eb4cf6811..10cb4cbde11 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -312,8 +312,8 @@ class SubCommand(object): name =3D None # Subcommand name =20 def shared_args(self, parser): - parser.add_argument("--quiet", action=3D"store_true", - help=3D"Run quietly unless an error occurred") + parser.add_argument("--verbose", "-v", action=3D"store_true", + help=3D"Run verbosely (default is quiet)") =20 def args(self, parser): """Setup argument parser""" @@ -341,7 +341,8 @@ def args(self, parser): -- to avoid confusion about its flags""") =20 def run(self, args, argv): - return Docker(args.command).run(args.cmd, args.keep, quiet=3Dargs.= quiet, + return Docker(args.command).run(args.cmd, args.keep, + quiet=3Dnot args.verbose, as_user=3Dargs.run_as_current_user) =20 =20 @@ -390,7 +391,7 @@ def run(self, args, argv): # Is there a .pre file to run in the build context? docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" if os.path.exists(docker_pre): - stdout =3D DEVNULL if args.quiet else None + stdout =3D None if args.verbose else DEVNULL rc =3D subprocess.call(os.path.realpath(docker_pre), cwd=3Ddocker_dir, stdout=3Dstdout) if rc =3D=3D 3: @@ -416,7 +417,7 @@ def run(self, args, argv): for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, args.dockerfile, - quiet=3Dargs.quiet, user=3Dargs.user, + quiet=3Dnot args.verbose, user=3Dargs.user, argv=3Dargv, registry=3Dargs.registry) =20 rmtree(docker_dir) @@ -435,9 +436,9 @@ def args(self, parser): =20 def run(self, args, argv): dkr =3D Docker(args.command) - dkr.command(cmd=3D"pull", quiet=3Dargs.quiet, + dkr.command(cmd=3D"pull", quiet=3Dnot args.verbose, argv=3D["%s/%s" % (args.registry, args.tag)]) - dkr.command(cmd=3D"tag", quiet=3Dargs.quiet, + dkr.command(cmd=3D"tag", quiet=3Dnot args.verbose, argv=3D["%s/%s" % (args.registry, args.tag), args.tag]) =20 =20 @@ -513,7 +514,7 @@ def run(self, args, argv): =20 # Run the build with our tarball context dkr =3D Docker(args.command) - dkr.update_image(args.tag, tmp, quiet=3Dargs.quiet) + dkr.update_image(args.tag, tmp, quiet=3Dnot args.verbose) =20 return 0 =20 @@ -532,7 +533,8 @@ class ImagesCommand(SubCommand): name =3D "images" =20 def run(self, args, argv): - return Docker(args.command).command("images", argv, args.quiet) + return Docker(args.command).command("images", argv, + quiet=3Dnot args.verbose) =20 =20 class ProbeCommand(SubCommand): @@ -574,7 +576,7 @@ def run(self, args, argv): cmd +=3D ["-v", "%s:%s:ro,z" % (p, p)] cmd +=3D [args.image, args.cc] cmd +=3D argv - return Docker(args.command).run(cmd, False, quiet=3Dargs.quiet, + return Docker(args.command).run(cmd, False, quiet=3Dnot args.verbo= se, as_user=3DTrue) =20 =20 --=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=1789572752; cv=none; d=zohomail.com; s=zohoarc; b=YDXzeZm/3QIxPBlwUjPkz0H4BBCdt1Xin4SaQnBBqZ6aAWCNCiKVAhZuzxmF99A7qPyFUspVe668WwBccY8frK43j08EyK+JMyEJAhANnz85IBEvBx93a5+N54xk+roEFTWHjcF+fdcOz8TYqCCzFUtNshuge5N8KKbtOjZx2f0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572752; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=bp6z54UjjOM4t/vUo24BKvZ2UdT2cLT/idIiUOviHztlpXUDxjD/vVGgaA06nSB/4aHVIFp3eHrjuYZub9Fms4jvVjfVIb4UHhBN78B5zf7TXp6YoYAV1st5jzPFYwbMsqp6G53rpFNeza65bgJKwrjJKt7pGkp9goGnsSk5uxA= 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 1789572752870811.7841998301816; Wed, 16 Sep 2026 08:32:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbS-0002n0-Li; Wed, 16 Sep 2026 11:31:18 -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 1x6rb0-0002Ig-K1 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30: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 1x6rax-0001Wv-SH for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:50 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f633cd80so508545f8f.2 for ; Wed, 16 Sep 2026 08:30:47 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf342a0sm7668898f8f.24.2026.09.16.08.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C036161A0A; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572646; x=1790177446; 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=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=tqT6fIFzsTg/gDqzfEZnO0iEP9sWwluipfoqMTIzSuGovRu2o00nqr7Wrwar03SY1M v4nDRQKXmttnJpMeJWgM0Z33VyqUhFzP0J6yuPvtdrvX2EWaC4CzxGGA2KmoGB/m4DHI Wmgr6RQlVw6ihWFgT4LSqlVvLtN4C6ueK4Omi4qv0N6moulQZl7NPTKEn6GaNc0BT/TQ WeX3+qbEzMu6WeJg/PYsumRsfCAIbkneSFivEnU09vF6l1LiFCFEOKLXc1+QqZ0q6g6a fzE12+LNgIB17RT9GebXWPsvG30XOaZrcsB2+2lQRCuBUav8rck8rB6dyvixLbtP9n3g Hkig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572646; x=1790177446; 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=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=eeGgbs6AiwbYKqWOW7TK+7TipmFw/E+KlEuPfyQW9gaubXI/SH7TZV6hNqqsN1gz4t rp+8SibA0tCkAt5a0x327ZN3odaXF1j42ayf977Eyk9F23zVOQEhi3cNe+JffuCz5oQ+ 6/kkppLEPVRAUlig17Iwa8GPAjZi306QRJFByWNZNumjHmEYndvARtG1O0mt5k9gDAGs UL+0i8a8gPIvfhZpY18HPH8XY2IldRTmUXGZ91MQFijqiLBg19olg0QH0aFTiS6ZQJs7 lqzptnbOrmPpbaCTWZlUiv9hArng5G+/rpMbG20q9zozMpRX2aWahl3FqvVlVmILh7eo pDGg== X-Gm-Message-State: AFuF++ltvyawP/mGxniYuJKiKDssW1CjNbvbNVYNLtwUddR3rHghKvLL IFfVTwVbfN7+mcT+rxKZOSf0ZXrL7Z+8utgVEHVrSBvSO1lVdht5ra8iN0lCK1td6/M= X-Gm-Gg: AYBFou3tL1sa9jSmzXaFztD4DoxW04N4bEugDfBeVXZ0lSrVVfilS0k1muWTnYpEcVj HRNZHKKEvP38uZT25zLnPW6aqcYMMydz1SXCyscYKxisb5FVhcqHXnBQzZp0nc6A64HzF0YeLY2 dBHoHkmBt9fFgM3w6d21qV0SbBuVKfkCXkF6nbpZraoY/YqOC3JWmGjJkZls8Ji/lP/a24SM0eB 7T/faDZR0Y0v6l+LOycxsQdPtWAa5iSnl7ws07kYGdFQ2WdPliPADl6+9WdXJgm/7r/zL6w/sSk k/EXxdz8P5JDIIif4u/pVM1FiCi7xQF4pY02fq21ym8v2Yfus3gf1WjuboWGTuupoJ8ezgeAmC1 U8QrM7U4ZAsyVS63gI3yz9VQtlu1N7vgncehkw7NORtawTJQ5oLr8OA9s5LF7+6mJ/kboIvTHbP TF/Flu65YW0S5CGwPgDV5oFZQSxDV6lxrSrMdwBG1t2ji7n88ddJri5J+GoCK5Y8IyTP37j7qt7 wj4kDAtVg== X-Received: by 2002:a05:6000:41e6:b0:487:981:4e0d with SMTP id ffacd0b85a97d-4870cef12ffmr3982043f8f.19.1789572645987; Wed, 16 Sep 2026 08:30:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 15/19] tests/docker: fix brown bag typo for docker-ccache Date: Wed, 16 Sep 2026 16:30:08 +0100 Message-ID: <20260916153013.2134555-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572753341158500 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 85825d74dfb..fa873e09b4f 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=1789573120; cv=none; d=zohomail.com; s=zohoarc; b=e+o5SmvTzAAvvO0a/EuNeMl3anfLGrsHlYmHRTCNNOzvfwYpJk6QiIA4XWvKcmCD7p4sFnB6z20B/1XqOFemJKBZpry/8ObfFDsu6PKygov8MpYzLrgEAPd1PqRmJwZaY58u+2kIrxX9L7pprS9Sz8Timyf4qnBrVU0ltU2lkz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789573120; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=HejuntOO6J1ROQoUo2SRuqLOr0IR08R9uaz5llzIU0BxKyQWdn5igTTQ/Gfso7WevPdBdVtAf+1supXz/+eRBJkPz9p5Y/Ft17spif0+DMtCVl7tQHijeTdHHgpJUyQ1khKy+Q+0DEoqPXmtLXoDJKeAfbLb+Dtq35vFPYECLk0= 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 1789573120097713.4910029814084; Wed, 16 Sep 2026 08:38:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ri3-0001q8-Fw; Wed, 16 Sep 2026 11:38:07 -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 1x6ri2-0001pL-3i for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:06 -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 1x6ri0-0003OV-CJ for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:05 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4843c3ee4cfso512716f8f.2 for ; Wed, 16 Sep 2026 08:38:03 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf27a36sm7600519f8f.17.2026.09.16.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:37:57 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DC06961A5B; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789573083; x=1790177883; 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=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=bYjPk9B0VadSzPiPiGo3DOYbdzKkR9k0rviM17ygVY8ROos0Rz2+y4iCE7IV/7hjdx YuVFl+JEql+QmRXHAoYr0GlWCpNHyoKa6/v4bm+EJ668HkfhXpMaTaueoTWtUgKmg70b DRWoLeb9HoydIOU8QY/L69uRu6UU7ZJcWYJs9Ja+6VoSwiT2Ksawa2d2/pwmf/HSdNw+ 6y9jVQYwFOof5RtO2Uqz5SxCSOCH0rkuS9lN8GU1y/ut8do8BpivuNkI4ERI+22kh5ga oVZUL2ZqN0APwbAL/SRirv52sAvjWCEA7OqcL3zJJxhSLa3tDQnzUuh9Y7WxLRjAhP1V MGaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789573083; x=1790177883; 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=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=dN8BI1f+J1SprG0+R566xzQ3I+7CBVSSZIiVuyTp0O0/J3QLKT40gjrQejKOsTg2Xe 9iuQAcIDH/ybHqQj72r7DXHaXg8meOoSk6LyuQGzeNsBoQJDYHBZ5b9iodvbq4fRWZJ4 mqKCfKmSonEoqrrUzUgRsVuTIq+ZANzUXFJO1+/71hmPDZynXpaerY7321fGzaiA+b52 /MicvQOuC+sO9dVCb3kQ+g4jeBHPFNFq4WUxwFxxYfUvwMtfhg1r+KYdcjxbtvG9AVAS 1neoNSuZ7Tl5kDNRjkr4ITs6j/tVy527ZpZKYkGgNc65lb3LHeK5JjMhz8XVe7n92gaE 1VAg== X-Gm-Message-State: AFuF++n/YuWWhyOpYxfeFimZ0ziZ1Z5w8jyC9zfxJ6tNvbdQHbxz6AoL UO8lgiw4lzAu3UQdk1e2P13umjy2rBu+KXYkS2shKf5g+WknpJCkuBSqJvkgVvtJsoY= X-Gm-Gg: AYBFou0Xa4cEA6VO+/Tufk4Oo+cmbFcAidWAtrLyND+S+o1GlrvLOwmYvcyGNoxdAst +TzUq371weT3KgM+DBVFAFdh8FdBSEyz7edNTQS/7HNucp01A1t/+gTqFZ9f6FG8GMdvHgDm8v6 k8GQWd0QdlIzweBuO9I/CGeJdgkf6rSZtxxHthV2SlDpPUYryCCldNDgdrVbpWVPgfwZlFTMBl+ PL8Jv2NU4n4EZNwKuW+7D8OYF31XBMMuuU+M+qgRbZw46dv+2QE2KS8Z/Ny+4df7lQ/h0EeXMhF ROqJb18scKrxvGCLee5dxdzSMfyiqeZAZdaDq2b7Ylo13BSzkMJlGxQ1RloNC4vN3Jj1EpwqEx7 f/qh7EmeHqCo8tYHIBuu6mnuOEGzL7kseUbXHPCLBe0bDIvlaFsI2UCwbgAkrDG4BdcUN51TfXe xvfNhpctqBml9VlwiA+Z0a/xfxbuZHWnFOhbNImSPpzvGkg7zi5XtJfY9DW+gntEIPbPajsmw= X-Received: by 2002:a5d:64e7:0:b0:485:8c16:a355 with SMTP id ffacd0b85a97d-4870d27897emr4244038f8f.45.1789573082519; Wed, 16 Sep 2026 08:38:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 16/19] gitlab: update the @user id mapping file Date: Wed, 16 Sep 2026 16:30:09 +0100 Message-ID: <20260916153013.2134555-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789573121802158500 I needed to fix a POSIX-ism in the script as well. Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20260914184534.706637-1-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Acked-by: Amit Machhiwal Tested-by: Richard Henderson --- .gitlab-map-auto | 8 +++++--- scripts/gitlab-map-update | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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=1789572873; cv=none; d=zohomail.com; s=zohoarc; b=RrSBptyd49f2jTEyMKRwe8EWuuYwDPtJ6bbntSx0DqvBbbP4Aqrwe3eNJIXYJkv/fZIXJzvPvYXEJT9IuBqGPVwIVnpcNzTZQwvzzheilWfreietk40PA02Cj5vwUT8AVFTcOHVS3KD4R+/ZPbxpscDP93taTE26Y02zG3V/NUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789572873; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=s+iJgOTicDwCjhm5qp3QC56yC+WLMH8ocrsmN4EU6Dc=; b=kpg8uBIVktl7D7kw42kR1Wz1vc+2yJTz7Sp+LiFDwnaBw0oAr3sUDvSW64COny8qsYFJSEGqT23HOMhu5H4CV0rmgYNDgAUWRngt50QyAqClSxvHVQbL5OFbp9IFoVUAKLLePfcL+89Km4Pif9yzVYfLeMT9i8alP7oOop6hbxg= 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 1789572873601941.2706163937247; Wed, 16 Sep 2026 08:34:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rbL-0002Wz-Ed; Wed, 16 Sep 2026 11:31:11 -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 1x6rb6-0002Jl-Ol for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:59 -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 1x6rb4-0001VX-2V for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:30:55 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912e64ccso7426565e9.0 for ; Wed, 16 Sep 2026 08:30:42 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbbd951a0sm16970965e9.4.2026.09.16.08.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:30:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F2A6061A7B; Wed, 16 Sep 2026 16:30:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789572642; x=1790177442; 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=s+iJgOTicDwCjhm5qp3QC56yC+WLMH8ocrsmN4EU6Dc=; b=wcB6cI90QZCD/wIjH81Msda/6xHRKMhwo5guXzLgmrDcPvaKMbFMUltET7oibebxDC D4+TZIO6MrxIkyYoXyCjbhrv0iPfS+c5BlzgMKQ7uSlsXabkfw2jgAGjDKZX+NBGMaeS X2eKJ+J+JIcCu07o2WaXhGzFjdLvwRs68uQiE4EYBRzrKpMTKsbhMxRmzT8VPtKwSI1n W2ZSMvE+YrQvdXKipwwELZvAlNGqn27jmbSPlCN1eI0C81AFxUvB4awHNpK4OWQAVG6l O3FTHwCcCFQjQQvjMnzpMP+FblBKU8JfXHGb7v6tkSg5RXEcB/Y0L80pk3Rp/aCLz+0G axyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789572642; x=1790177442; 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=s+iJgOTicDwCjhm5qp3QC56yC+WLMH8ocrsmN4EU6Dc=; b=TtCibRNB9dUY4rEcqdNDjI6PwA7AvXaCMSL2UHSwxX2IxeJuT6CXrgxIQ6ASBe2GzN I9/qQBJPWnp/SZjB9Z5FGflPvt4lvpsDW9GSkAfC6s9bb6q0KZ2I4WEXcY8nvMiQzq0t FTVhtXfwWZyOfURdxzlXRmt4sROSayKs1EEOuyCNBD+7XRoy114AGPYKhrvYAUNEGuwr FKsPB2y83bHahkCnD6OK2zuzyAjdh7wRyPeXECwdTrk+7/MmIRw05hq2m8lyBa18vxNG NyiUCJUENmC2Cq7+kBNdfD97BoXuV3NkTVSznPjZWNd2PYMExi6dwhYUozZ/zfJ5+Wnt 6zEg== X-Gm-Message-State: AFuF++kJrUHDYgjwzd7DQjEgneWaf75CBv3Ns6grxfAOXs473YyRb6Ab 2tv77YZd9cEW3u4ZYq4JhZLHyDQY70lY/4MFUXNByjyQun/ssyeqLFP4juOgT4jHPys= X-Gm-Gg: AYBFou3c8yuoWjlozqVJmwUlZCcTiJdeklGzajcOqCRBzMl+woJ/HNMng7P75WOTX5a AShsEmhrzojWemZJC84AYdtOgB30t791nxebfYq85AMraXPJkYAZhm1qXurvWNqNr05DDcWPjVt 3dXX8GhpHrPNsaxVfal2aqTRythv1grKs9xwACPP+eOGO2JPN1dXb8YzeOp6mAXKj9HMgWyoE5G 7gGbu35r3DfVr20DefUY2V3edEtvAnSRZ/29tuGiqOteaR8pye24sAB8a/yRm9xBD5hXe/7BLgv eg1JEv9AHjUYZdHu/7NEBO+UIJgzudsw/lQoei0I9MZFGZLOw9jBwsbbdvcBpzrX9xX4wbpWplf 6SJhjYVic8bwPhscKvs7MnF2WDcIsz6CXHPBV3iXxk3qtvn6bmhMqWHAoaD8eVsZHlgD61Yne4x Wph17duiS0TgiubEBq/I+1Kvmv+PmEoDDhhoHfhyhE26gyfDjgVbC6kFSUlANfJSnq8pNlctQ= X-Received: by 2002:a05:600c:3e15:b0:49c:f617:7cf with SMTP id 5b1f17b1804b1-49eac41066amr71528515e9.0.1789572641350; Wed, 16 Sep 2026 08:30:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 17/19] scripts/make2mtest: add docker dependencies for check-tcg-% targets Date: Wed, 16 Sep 2026 16:30:10 +0100 Message-ID: <20260916153013.2134555-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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=unavailable 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: 1789572874154158500 This should trigger the building of the docker image when the user calls "make check-tcg" or one of the arch specific targets such as "make check-tcg-m68k-linux-user". We still keep the internal meson dependency so individual tests can launched and the docker build verified. Signed-off-by: Alex Benn=C3=A9e Tested-by: Richard Henderson --- scripts/mtest2make.py | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 383ea68b16d..ab894d90d47 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -14,6 +14,7 @@ class Suite(object): def __init__(self): self.deps =3D set() self.speeds =3D set() + self.docker_deps =3D set() =20 def names(self, base): return [f'{base}-{speed}' for speed in self.speeds] @@ -40,7 +41,22 @@ def names(self, base): =20 introspect =3D json.load(sys.stdin) =20 -def process_tests(test, targets, suites): +targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] + for t in introspect['targets']} + +# collect the docker images uses by the tests. This is totally a hacky +# heuristic that fishes the images out of the test custom commands by +# looking for the qemu/image pattern. +targets_docker =3D {} +for t in introspect['targets']: + for src in t.get('target_sources', []): + for arg in src.get('compiler', []): + if arg.startswith('qemu/'): + img =3D arg.split('/', 1)[1] + targets_docker[t['id']] =3D f'docker-image-{img}' + break + +def process_tests(test, targets, targets_docker, suites): executable =3D test['cmd'][0] try: executable =3D os.path.relpath(executable) @@ -51,6 +67,8 @@ def process_tests(test, targets, suites): deps =3D itertools.chain.from_iterable(deps) deps =3D list(deps) =20 + docker_deps =3D [targets_docker[x] for x in test['depends'] if x in ta= rgets_docker] + test_suites =3D test['suite'] or ['default'] for s in test_suites: # The suite name in the introspection info is "PROJECT" or "PROJEC= T:SUITE" @@ -59,6 +77,7 @@ def process_tests(test, targets, suites): if s =3D=3D 'slow' or s =3D=3D 'thorough': continue suites[s].deps.update(deps) + suites[s].docker_deps.update(docker_deps) if s.endswith('-slow'): s =3D s[:-5] suites[s].speeds.add('slow') @@ -81,6 +100,9 @@ def emit_prolog(suites, prefix): print(f'all-{prefix}-xml =3D {all_xml}') print(f'.PHONY: {prefix} do-meson-{prefix} {prefix}-report.junit.xml $= (all-{prefix}-targets) $(all-{prefix}-xml)') print(f'ninja-cmd-goals +=3D $(foreach s, $(.{prefix}.mtest-suites), $= (.{prefix}-$s.deps))') + print(f'docker-cmd-goals +=3D $(foreach s, $(.{prefix}.mtest-suites), = $(.{prefix}-$s.docker-deps))') + print(f'docker-cmd-goals +=3D $(foreach g, $(MAKECMDGOALS), $(.docker-= goals.$g))') + print(f'run-ninja: $(sort $(docker-cmd-goals))') print(f'{prefix}-build: run-ninja') print(f'{prefix} $(all-{prefix}-targets): do-meson-{prefix}') print(f'do-meson-{prefix}: run-ninja; $(if $(MAKE.n),,+)$(MESON) test = $(.{prefix}.mtestargs)') @@ -93,6 +115,10 @@ def emit_suite(name, suite, prefix): print() print(f'.{prefix}-{tgtname}.deps =3D {deps}') print(f'.ninja-goals.check-build +=3D $(.{prefix}-{tgtname}.deps)') + if suite.docker_deps: + docker_deps =3D ' '.join(sorted(suite.docker_deps)) + print(f'.{prefix}-{tgtname}.docker-deps =3D {docker_deps}') + print(f'.docker-goals.check-build +=3D $(.{prefix}-{tgtname}.docke= r-deps)') =20 names =3D ' '.join(sorted(suite.names(name))) targets =3D f'{prefix}-{tgtname} {prefix}-report-{tgtname}.junit.xml' @@ -105,19 +131,16 @@ def emit_suite(name, suite, prefix): print(f".{prefix}.mtest-suites +=3D {name} $(call .speed.$(SPEED), {na= mes})") print(f'endif') =20 -targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] - for t in introspect['targets']} - testsuites =3D defaultdict(Suite) for test in introspect['tests']: - process_tests(test, targets, testsuites) + process_tests(test, targets, targets_docker, testsuites) emit_prolog(testsuites, 'check') for name, suite in testsuites.items(): emit_suite(name, suite, 'check') =20 benchsuites =3D defaultdict(Suite) for test in introspect['benchmarks']: - process_tests(test, targets, benchsuites) + process_tests(test, targets, targets_docker, benchsuites) emit_prolog(benchsuites, 'bench') for name, suite in benchsuites.items(): emit_suite(name, suite, 'bench') --=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=1789573102; cv=none; d=zohomail.com; s=zohoarc; b=h4TRyOiQt+rwWuF3QFKN+iNr5A8Yy0CqSrYi6cCU7qVyqVw+NY6najadFIbh3U1BzSxLHDycJcKmrgpxrJfOdi8JUOrFlr8nnaQKTzylIPuLOgcAbDHwUtvtolmhJOehSd/qvY/LisCYmZ7LW0AT2YG5lVn8yJ6HBEn6JcW6Rlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789573102; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5ZkOZ2c5yMGDlE1TB5Cp+fPuQbHl7TzaWx2TA+LzciY=; b=Y220Yf2yMCDfLcTx7lt1YXlvDwkD6qrJpEtylj5OHvxRZb1KUlKqZchvEwdWSXO467uXWZvmkB3aISIV/rAqc1X0zMlv4xmaahs+npV+yMV99Uxm62aoIR3aeYkOfoojABzhiNki/uXV7BcWKuk7Y9psUnrS3XYo4wnbvU23UJY= 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 178957310277754.81044297616893; Wed, 16 Sep 2026 08:38:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ri0-0001oF-Uv; Wed, 16 Sep 2026 11:38:04 -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 1x6rhz-0001mp-8d for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:03 -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 1x6rhx-0003NX-Fp for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:03 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b965f447cso10021905e9.3 for ; Wed, 16 Sep 2026 08:38:01 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd1b0e9bsm585365e9.9.2026.09.16.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:37:57 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 156E961AE2; Wed, 16 Sep 2026 16:30:15 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789573080; x=1790177880; 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=5ZkOZ2c5yMGDlE1TB5Cp+fPuQbHl7TzaWx2TA+LzciY=; b=QopxOg/l39ZFi7Y7rJhgSoedHKBXGrruL3bIV2NawDDnj1iftzxmLDao68w2+1xErs Duc2DfvQ7OJFuXc8xBpFLl5ivoup/Fbtd3M4LagFFXqmxaDZP92w4DrcbPtTFZRRY5g5 bm1GkUnJvqDzFT3USCRYniJ4xmqKU6v8QYIJ4S14ESz1inYAwWc7aaIQnZPuN/GGpMaX eJzSJZBx5zxsD+VnYM3QEfuejlNorRXMlogEyBE0N8JPvLexNtbZcJO561oapfj1xeVp EXQqe2WsGIKHkxXy68N866PDGn3KYe1L3ga90eIlE10GZKC9V31cIVJIhTyjIYV6T+DB xuQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789573080; x=1790177880; 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=5ZkOZ2c5yMGDlE1TB5Cp+fPuQbHl7TzaWx2TA+LzciY=; b=Jd3srkzNLpDc8kYy0Q1TT080ECZFINfQTKsELrl3pzy9j47aNvFf4xNi4LamQz35K0 y6KX4f/TB/sGh8q8GEbTB+/VLQcf6kXmmrnsHgG9szmHGNzb23ceza7edI6cDhHhA1BL o3FB9Bvh/8kvpq8+8pWPqoRtyabSVXpNrTTsmuCtP/1ApNJoGfuL35KWdtgIpf7wpoNa uqeg89xQKA3BXI+ZRHygHaGTzXaPzOIAUcK6vMQ+E04sa7ki8o1l4YNLtockENZpRLo6 SGVa2cHrSd9pdyBmf51M/xw3ILQz/xnYQ2JzevawrPbrRdIxgs0whxZx8bArLKqFv38h +DYA== X-Gm-Message-State: AFuF++lXTMb0TsAEDSs76bnxTpNGReyIRrQ1iD6Id21hOFYU72OX0PZC S4VNuE/wDKBF9yVIJP6Lz0gttGahX/Aaj3lCU6CHbYTHjF8MU79Hu7+IzoSWI0F5rR8= X-Gm-Gg: AYBFou2LBJe+JoPHji7AZviGxXKbOWJZZoBaXybGr8fCbdOv368v7PYsXiW6uZJKF9E 2I3oILb0owtjr79NHPDntr1JFhyBli9DaD1SwxSDxZ/+FMW6Lch8jdaAnbyUdH7aEABBQSljRKR EdXFC4/FctLuToQ15wQsaxSjZF7V5RhzjbTrI7n850ewiTfYgOJzi0SIaQMprJIgyu45MfXsDTk GRlK8GU/YNA1yBAwqG2AaSzahlv7m729SIdIsJSbE9L9YJjjdWGOZS/Zq11zOIenig3CFcIdF7I +KbVoShh6fClMhO13AcUgCCObGrAKvnug21mV85lCDeMQx0+7RxkZ/+KEtzo/tV37cY9DHado1n t1QdIEeNcGg1PZlx4La+a//vfmBajOPzNT/s0UyfFqLd3OaBdm/AkvyqGTj0AWRhP5wGJF/LVZ3 d6+8X5+slI4nGSKiWPXNx0zZbcHqDpUCPnTXqV/zOq3ysZZJNYGO3vGdmqcdkxQ5eU4fuUhF4= X-Received: by 2002:a05:600c:1d25:b0:49e:7c8c:361d with SMTP id 5b1f17b1804b1-49fbd1ddf87mr245265e9.22.1789573079668; Wed, 16 Sep 2026 08:37:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 18/19] tests/tcg: add console property to docker image custom target Date: Wed, 16 Sep 2026 16:30:11 +0100 Message-ID: <20260916153013.2134555-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: 1789573103745158500 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. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson --- tests/tcg/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 80205f6f98a..6c675a554cf 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -247,6 +247,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=1789573111; cv=none; d=zohomail.com; s=zohoarc; b=PdtXteEyaZNZLBUgaUhSJZFCfWZ7XV+FNGie52MUFk915sh/3BlaElp574Pw0BzBU/Zy/Ms2EBbZCSlUzOZOOxMmGnZ72ysCeWVBcrtE/HMvNoq7buu6o9Sd/bZpGek4UewxLBQeL6Yxz3PgcnthYu7gH81JRi/L7bkK73+fnq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789573111; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cAgsbGsJR8UlzgK1nHztriprY/pdiSp4sfs5YZ9q3Ag=; b=WcHvzPbbHIQPoZrk0LdTjcOBXOBoY/5qFZX5T7VIXwxWBwfiL+/K9cXEos292iF9lZY81xfpVM5xIZN1EOhNGNySYkroQbnjjUlIMqeap2c1RpHQq6WojXL0/yXTJ7Pc7MOmm22jHvZPfd3wEepGp+SM0R/bBDBmTvIKwE/RJPU= 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 1789573111681732.7084357607364; Wed, 16 Sep 2026 08:38:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6rhz-0001mn-8T; Wed, 16 Sep 2026 11:38:03 -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 1x6rhx-0001k0-Jb for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:01 -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 1x6rhv-0003Mt-MN for qemu-devel@nongnu.org; Wed, 16 Sep 2026 11:38:01 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4843f22dcb8so698745f8f.0 for ; Wed, 16 Sep 2026 08:37:59 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf27a41sm7464951f8f.18.2026.09.16.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 08:37:57 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2F5E861AF2; Wed, 16 Sep 2026 16:30:15 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789573078; x=1790177878; 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=cAgsbGsJR8UlzgK1nHztriprY/pdiSp4sfs5YZ9q3Ag=; b=LUlKgp6z1g1MklW6MvAv0iJnpF9xKyvGxbHNtiPaR6HsV3qoWKzmXQrDeHT3/l4wor XmYADrqXNtE4llrvWRIsPGfS7+MelCdgr6i/X3R3VLBX2O37fTBLDSJksEi+jaZAABiU FIHa/e7eoBaiWqj66wdMqYP4zJwVIFoa28NPG3ZWO+x0fqWmg/qc5XsfOqjeVF/dDMUB JiLoEIKxR86V3xAbYnuwQ43AS0/at2SHgt508du+mlB+DAs2wuEwVWmufood7mIqf2sN jWQHOYr2PKxbR4MonIQSZaozcGznyxsN9PVQmAPRjrJSAMsvEDIJwglCWRh5tZaYvq+D wzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789573078; x=1790177878; 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=cAgsbGsJR8UlzgK1nHztriprY/pdiSp4sfs5YZ9q3Ag=; b=PCstmyBp0YiD78Q+PgWrXGMXTJI4Z61IQZRL0CpRmeMX2LRpzdQRIdYyTQ6EQohucH aPxZrPpMt+6AUnC7VOxFt1FFyg4jAvPsd2MYA84SK9o1SKp8zwheZyUBSsk+JYgAH6Vp q/Yf9ZWncv5IIdqlts//VyhSMLbOr+VV2oJK3CJ4sh8/fl1/z/mIPOzop8cDA7Qo1077 cX3hdKMxMLb6uLUoQQwpVZAyRHsA2UbDWGKIupvZFbuyTXVN9awMc8trfLfC2D2MA6N9 2QnCDLMJph5/evUzoyC8lgGkgnMSU5O6GEE87Sd2VSqYOKbcxLeZ7Fnqz3sKd9lqoH2T 4HBA== X-Gm-Message-State: AFuF++mi2yKLVv+V30hkMyTYXpvvtW2zBG4XhFo7eZlKL+NjqtT0xdXH 8uchD7cJ1auPyybozybjK97qcykgMTeiK6z2B0015PXoa9cheKUAd8QNVjMDsW92g7Y= X-Gm-Gg: AYBFou0A5oNGdfZu1CBK2K7BBIBSg3rb4dZWlUb4nBkhWN87BC7R5yTPLo/Xtn1YvYt Fa16gd1IfPaWteAqkJSqgfli4R75ry9D0XHJr8uPJlFnJsnZl9LwiBPhc9ei7VZYj6yyQMy73ad Em5jglz1eAsR1+us6AQaOQel9COXaexG4b09P6fODMielK2pattosZITVb26pGAOO7aAdzFfv9b FkrhkwoDjoFPzxUkQQbKZyb9WhciGsSWikr0LiIG7UPnbv2Deh4CoWonWkxGajlGzOxS5X/sQAo DM3As7mn14jSp/A6FEqDyU77wVoZwWobXD5W/BMo+dbNh4a1CcdyDyNAfHmh/bQ4JVvdHCx4SPn 8wV87h2RYo53Dw4GcaQDIzcAlJNYpi29KRWDXjqmxEae4LLeBM7k450OElvNQeul/S2LQXSurZ/ 7nXE3oVc6R8GpKDbBLf9GfcX3piFkvFOHrRlnKL/N4t0ykbNsawk1P7ebSsVypY7G5nw+58EZL0 Z0d09XZkA== X-Received: by 2002:a5d:64c3:0:b0:487:11c3:b004 with SMTP id ffacd0b85a97d-48711c3b044mr1154909f8f.52.1789573077949; Wed, 16 Sep 2026 08:37:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Ilya Leoshkevich , qemu-arm@nongnu.org, Cornelia Huck , Peter Maydell , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , David Hildenbrand , Thomas Huth , Paolo Bonzini , Cleber Rosa , Warner Losh , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Song Gao , Kyle Evans , Eric Farman , Brad Smith , Fabiano Rosas , Helge Deller , Laurent Vivier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jiaxun Yang , qemu-s390x@nongnu.org, Matthew Rosato , Brian Cain , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson Subject: [PATCH v4 19/19] tests/tcg: Fix building outside of the source tree Date: Wed, 16 Sep 2026 16:30:12 +0100 Message-ID: <20260916153013.2134555-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916153013.2134555-1-alex.bennee@linaro.org> References: <20260916153013.2134555-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: 1789573113840158500 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 Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Reviewed-by: Richard Henderson Message-ID: <20260915110855.491985-1-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 6c675a554cf..c566820c097 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -259,7 +259,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