From nobody Sat Sep 26 20:51:56 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=1789548889; cv=none; d=zohomail.com; s=zohoarc; b=lK/Q0r6HlQK+07mqSHi8F2areiZvurT/oB8uE+vhU3LjDNqaTJB7aZYFxZTqjZFw9MfWTIa4mrcGJeTc83PDV9Hez/ZVJgygJHlNIV02hJc+V4a7L2726CRQorvxYsRIcqC9WSATYylkCg3oTczWF8NJry/JiHQkUFiHzGh5qlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548889; 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=QXUCzmr57d9KKUnOwQHYPJvn0pxTK3/cIIc7vHi8C4YMFHhkb1L+s5tGMkVZOI5jI0gOgqMHpqg2/HqkbGybq91Jdgf6BQ340ZweMTBbWU4pLvE+aIMO9Kf+Izl8s6ySsWdPWaA/qJrr9YI5cl4/bcMrg8cojUOcoeAKn+bz40M= 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 1789548889062246.77987126881112; Wed, 16 Sep 2026 01:54:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOw-0007rt-3I; Wed, 16 Sep 2026 04:53:58 -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 1x6lOq-0007lF-IS for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -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 1x6lOl-0004z8-K8 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:52 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso4946595e9.2 for ; Wed, 16 Sep 2026 01:53:47 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83dbb0c1sm65232915e9.14.2026.09.16.01.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:42 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8484B616E3; Wed, 16 Sep 2026 09:53:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548826; x=1790153626; 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=J4B+S6leX9YfVASObyjZVsxx77qtlN+g/Mwl5qxMGaIc6a1xtLJd+mZcK7Rm7rgDmX wN6GSpHKGR2nnlTj63kMwKZfm3U2QxwsdU8qS31Ev0/7IlzFKmiayJ0sPGGXryTY/uxH ttUHIUAihMdO17URz/oB3wYqKyEzNN9t3EowR86HxRCReFN2TgffJ3Be9P2XOt+PyOzH chNrHS9haCXO3j9AZSUW5fdMVttDFjn2hlqHp/rvY3EMT+zqQhseP/vjl2tF7Au9Rt44 pf0WMjP4vYoWAEa480MR9pH03FEkDUZ5+KuXwW569KVfBs3tms8F11jSmhjXoNQNd+Ef xugw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548826; x=1790153626; 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=YdWEDevwTm+y55vhuRUO7JAQzWNXcZdVIZJbqlS/cabSld15IZ7gKyno5eZKAhHFJm 5akDLKlyPd7O9ACgDmtUY4qzklVCzkrWjDbzQrb9KLBFY1W1ISvl1U34NCxlJINnN+b6 D+1FwelZhV9tuqv8fFnZtVgyR7Te/oPcIYbRq+hZE7GIy5+wHXgBmvS92hp0dcSjOiGB jEIkjNlYB4Qhc7/y7BRFpR2WracdUzSoBoakarJ/MSGKSCHoZjqp6iua1xTdGgv/gqxR A2T3BuNWrB4k5YmRzlhCss6xXohPWfgmmM5vAuWC8PX2G/7klcS0N7K5tL4Q/noqFfNZ nnxQ== X-Gm-Message-State: AFuF++lbZSLaJUrFLKFx4QLuJF6LmZHfW16L3pWpaeAg64JqLoMmbAGB NRozDyZLXSLQmLPBbka+5hQJ7W0DvzvOHxgVTTbQ5I1Fferm4jENSt/vUUo3UPZM6CA= X-Gm-Gg: AYBFou2pQIIzYLi5y9AWzYIJ8lzqtdkmhqInDmvavuuahYHIiWhdRj/xtAMXv41G1BJ mcQARvTgZZ+L+WhVCU7GeWiSimCkNHDJS1eOqibVdJA0pvKIXD5x5mupe6KceS3M2BDcHRxpqy1 67wJuDWbppEiuhHsUWlO3fH1DmeXpGxuLhVq9dr/1U6DNShh0hxfN0yJzYCAMvf+Btv48PfgJDI IvBHvJonkxYKBVYjyRGW6+29qxQVj05P4SqukJ+CV1ffiz1gGDCU6uxRGCYbYQnf1ysKziO07TL EZw6FUHokH1f/H83YECjBiAMYubJr5dEaFtDYsi2yS4sPYuMROTSKUaayIGp46iCH1ntrVvyaVg yodNsSYs0YI6+hK8CGSHG+Jd/nzugGFg2Nj39dtWtPSwpvywJKh/mUJoO8ao9fLi07g6gU+soww CrhtAPxn6qQxUl8nb8IQKEMSYOhEVtbFqgsm6HfC+N46+Sns9YLE9VCaECVagXGRB+lF+E9U6F5 26swTvXBQ== X-Received: by 2002:a05:600c:8b6a:b0:49c:eb04:1c49 with SMTP id 5b1f17b1804b1-49eb72f62a1mr16541175e9.13.1789548825894; Wed, 16 Sep 2026 01:53:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 01/17] Revert "configure: remove cross_cc and gdb detection logic" Date: Wed, 16 Sep 2026 09:53:24 +0100 Message-ID: <20260916085341.1692742-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548891199158500 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 --- 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:56 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=1789548953; cv=none; d=zohomail.com; s=zohoarc; b=kB6bOSQPxxkiz6l6wfp4khtaYS5xxR3LNnT2oQHdppn6pAQN94O0OwDDEgntO5ezKzIyf6bbY7+AW5SiG1fdTXzr0TkEQd1pkdygXBzG1TkB8yAhjWdrb8JIqcF3aVVetr79r/zVQosSKf/PIsVTcdypUFR4OoaK4+LPAKyyWvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548953; 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=XBx8gEclz5MPi1EBdwbouIOrjKAE3m33frk4NFC8tymLXEUL91MrKTx2CA+mXtKA7eYKxPozJC35PpfXNFv6BQnjS0/s4spWlVNeGaWO8v7yg2Sr1GgVg0BxbQLozJ5+yKdv226gESmQyiWZmLou6z512fSyE7Q9q5F0AdtdD3A= 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 178954895304827.62836296552382; Wed, 16 Sep 2026 01:55:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOw-0007sd-H6; Wed, 16 Sep 2026 04:53:58 -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 1x6lOq-0007l9-Es for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -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 1x6lOk-0004yn-Hc for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:51 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f633ecdeso471038f8f.2 for ; Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf27a41sm5305759f8f.18.2026.09.16.01.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:42 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9FF0A61785; Wed, 16 Sep 2026 09:53:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548824; x=1790153624; 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=E+HsYIFVjDxnqBnunX0lHUxFlY+KH9elIMEPAS07tYkbuDJ+MdPo8aJ2xDDZhJX8nt EXI6Bc8+6FVtRfFDVl7w2Ia2JmN3r35jSup7ehINO0viElgjFyL2Nbm1OnOO39oAYXmf u11ipGDOidYHpdUvNA4Oz7iczb8B+UcmK3iFKP/K43yV7yFS41cbzLOo8CE9JMSx2Os8 ovAk6oiyOdS+1nExazCnipD45STmfDOk3l3XCgxAf8fE2A3e/hWMKSW2MjmjvhTlP6fU DArX9qgVxgNZMPSpTPkwse1HZn8kxbw+qxlK6s862mnbRHQA4Ib8203Yc9FgyWTbfXUI qjrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548824; x=1790153624; 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=sDRR3gFXMoxAlLEThq2haIqZymSG03zjouKuFhDXf7pbPaW1zf7lVn6QEOTSO3KD+h Svk3dwlbXyVi1gOYVFapR3uQLOCPvomB2Vh4q/C3VRBHCsyqgTKRhkNq39ieWhymaHzu Zeu26vxaN9LGb5f6206h4ZHCVMU+QTmeutOZRbKbSf0XWRtlzKjtP7/DJxaoKEMZrPLB OCmz82oKh97UPfjPCK7KsyglHTnjZ2VXd4k/Fh/35HkIwqWLbFNHr7M8ldZCo2hHUxwu tuqsBbcSer7bK7iccn9InprXocFCSeOwz94fXwovBFpwqyR0AZGtGslYlrlrUhkeDJ5o telg== X-Gm-Message-State: AFuF++nMnMBLpTzpmoahyaZqRvtHSzRwDQVPBY/fYhP+pZznB5bCFwbL 6ULIytV04O6ea+uaZTnuolGLcImfNtE55T7WbZer3OWGi7xLVRuj9VYvjCtepg73me0= X-Gm-Gg: AYBFou2WZHhPgBUPP+QgRwsCpchLw4jJTPTWccAiP0uzMlvKsG7nYj9S5fiq1YibEbU l7sZWSbg8MJTucFSOR5mucHFs2Pz/mwTv8g+9zmPnOlhj9QlFQV5rME0M8exAFtjL3mSUluFyWR 1ao5fiNuZcwzxeyhIVAMvy4N6q7acPk/ZUDCXMpjc+obmYO2bYtW/BzD3f+9dyeGpvM3bSB+PX6 CUpVeoGr5/MYNEV5Gzph2lQ5j8sEsCxTuTEmr/ynZ4G/QGxFAC35XNe3HfRp/w9PZaCFNYlzGlq YqkTPA08opk1JjAVcvasnz27MoOJd0zqHIGncTXVh4uJhA8cdD7MrlvYit2H70lxr6z2FGj7t+u Kwg0+iU5vsyEsk/hHeKn3wtpP8UaUnpmX6uRRJIHsSgAmSEXtKEoI6CSJ2+EnLYAKaeYMmVXYc3 czf9bZIvT+VWTrFXzQeL+/18VVsy3vwPs9LpbjfVC961Gk/VtfD5Cc9qauL5tJ+mDVYwr1Xqt2V O2AiTxtZw== X-Received: by 2002:a05:6000:24c1:b0:487:c3f:5786 with SMTP id ffacd0b85a97d-4870d067c06mr2523320f8f.32.1789548824495; Wed, 16 Sep 2026 01:53:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 02/17] Revert "tests/tcg/meson.build: implement ./configure -cross-cc-* options" Date: Wed, 16 Sep 2026 09:53:25 +0100 Message-ID: <20260916085341.1692742-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548955166158500 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 --- 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:56 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=1789548979; cv=none; d=zohomail.com; s=zohoarc; b=B/PBnn8Lyx+vlgzpq0uriPk4tTYtcadNuJ6c7PidHu++WeL2GChJs/UuQIweyzO8HmuVNMVCkUnkB5RI46hyxtn9to6e/mEOfrCWA7yDhg/hBmX1PUW4ScbtT1yShGGBCgbPFIU1jwVbubqbEqOg8cFVsu7ahAKjbACPepHUgM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548979; 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=Ry2sd1z4lQEPz/cq12Fj5YfxjJ6T7+6xlmSJ+36c4vQ=; b=TeHmKvjvG//Vh3Ek5GzO2kVZ6gofWUX39xaQrf0sW2f8qDLV1rMr+oAJMCVorMDZpxgPhrwyYsYQWQM/OMnzHPZykde7SrUa/HJS1zbrZhLEuyjnNts8EzovYj3DZtM+qa6oqTk288B7M99NWuTqpxQ6Lh4B3rgupgWckswqrsI= 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 1789548979890299.5899965766405; Wed, 16 Sep 2026 01:56:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOv-0007qx-Fl; Wed, 16 Sep 2026 04:53:57 -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 1x6lOn-0007kv-Tr for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:51 -0400 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6lOk-0004yT-GS for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:48 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912e4ad9so3474225e9.2 for ; Wed, 16 Sep 2026 01:53:44 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf462cesm5652880f8f.37.2026.09.16.01.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:42 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B9A286178D; Wed, 16 Sep 2026 09:53:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548823; x=1790153623; 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=Ry2sd1z4lQEPz/cq12Fj5YfxjJ6T7+6xlmSJ+36c4vQ=; b=Su3DbH+YMF9MHUtwWRK9okXHUcedxttmBQp62bz5K7iUsnARpHU038beDNhem3i/u7 b294vzLFsNeb6Opv0VHAVMvq1rbtDxZzMJ7ikiTqrzaWvWKf70Ll8l5BfD5vpgKlsIbt minZyG1ox6wOMy1Z6u+nPrkA0JoDoPIKQl+08NGhs5Z64g0+PnMLqSgRO/4rp2T3lJai sCGGZKXFe09kwNpnlt3A6TZ6CUeSbA4U58zwEsdpYTGJOfYOaqrZi4MJuuVubUUhGiVR rcUx02ak3z0ZsBTf27sGSv8FxO33VXG2le1xjFOtvSSN0LjSXQTy7AjquL8+UWAAfrLL P3ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548823; x=1790153623; 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=Ry2sd1z4lQEPz/cq12Fj5YfxjJ6T7+6xlmSJ+36c4vQ=; b=tAK/75rzjujvyHDV1fOMUHcGXdVEXV7Yy3OGU1WX6Lem5xjSPJ42AqRl6QB8MU/MUP rC9DiS+VNT7FrUGHtMOMJcewXGchbAJ2HWWgxcnQ7C5VdU4vhxu+Iejvas2eauXksThp 22z/WVLJqyXT1k57Nhn4Mr892JZCzZBBpf8hTFkngwNnYkmaOgYQwd2mTszE63RLd+cV 20dNxwzRRR/mm+u+iCS10Yug629I/OJKWP+QUdiolnlXjlE2n3YRy6XYSZD1aolt9wJA Rwpz4/HZ94p7mU/jLmFCSAZMp/tz6/3zz6pOMnB1tp/F2bzWSg1GldE0axPL7xd2KZpN PM2A== X-Gm-Message-State: AFuF++k3OvbeytvwdxCjZNMBTs4gYM+nuSNjwRpCNG3j9Ln9bTr92XcZ Gkq4B8aNtR511ZRLHw/RrvJdjK7srO8WR0HdAxGbbUQ776S8TzQCt62//E6qfq/lufs= X-Gm-Gg: AYBFou04kLgF/K9xEqVAq4Ms2FESCH2+FlVwFAhRstdesBDhtRTdpJbC5qClXs0IFBY VsSN02GalrbpPBKdU58q0l8UeIvNGbhrWpct3eD2DTfKYJqYQI+z+4/gtf6UyZOUiIGn7JZoG3N cqm6stveHAyDRDnyjOS5MXaMudd5k8yCftrqMoTiJe9MIRNqbP9ZvSvL7IiDDvbqj4EJTsVjJuP 1T8yZo8o/aQJPxqwq/HAShHF5OTqzrzGGR6IcqCrRtsXW6vtFoHQuI4PqSXyYMdnt8HTPZ02h0U 8XDhxyyiwLSYp2bZ6oInRfoPFiInsMy5IH00fXOP1O50O6gBSUU6iv/7cZYxBrjMPj7WJkTtDwg 9uH0C+OHiSdlaKRcg/gzQQ+qHWp7sstYcd49gFtY8fX9coEcMX4glX9ZB+2Lbu2hwG5oGCZLIaf 4tnkwwYdP6t+d2C/REHgFcQHgUuAJxFTQS2V6IwBJQgygE9J+M4BvUezzntJf/N2rjc16/KoM= X-Received: by 2002:a05:600c:6208:b0:49e:660a:935e with SMTP id 5b1f17b1804b1-49eb7340978mr18023765e9.29.1789548823390; Wed, 16 Sep 2026 01:53:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 03/17] Revert "tests/tcg/meson.build: implement ./configure containers options" Date: Wed, 16 Sep 2026 09:53:26 +0100 Message-ID: <20260916085341.1692742-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548980735158500 We want to keep the container configuration inside configure for the firmware builds. This reverts commit 522b299ca4316d8cad57f9496ffcba87dcc20719. 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 --- configure | 11 +++++++---- meson_options.txt | 4 ---- tests/tcg/meson.build | 25 ++++--------------------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/configure b/configure index bedde58b8cf..25d26376f12 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,11 @@ for opt do ;; --disable-plugins) plugins=3D"no" ;; - --enable-containers) # enabled by default + --enable-containers) use_containers=3D"yes" ;; - --disable-containers) meson_option_add -Dcontainers=3Dfalse + --disable-containers) use_containers=3D"no" ;; - --container-command=3D*) meson_option_add -Dcontainer_command=3D"$optarg" + --container-command=3D*) container_command=3D"$optarg" ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; @@ -1718,6 +1718,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..218d003a80b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -389,7 +389,3 @@ 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('containers', type: 'boolean', value: true, - description: 'use containers to cross compile tcg tests') -option('container_command', type: 'string', - description: 'command to build/run containers') diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index ce208e686ff..e966774c8c2 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -79,28 +79,11 @@ if gdb.found() endif tcg_tests_summary +=3D {'gdb': gdb} =20 -docker_supported =3D false -container_command =3D false -if get_option('containers') - if get_option('container_command') !=3D '' - # make sure command is working - container_command =3D get_option('container_command') - cmd =3D container_command.split() - run_command([cmd, 'info'], check: true) - docker_supported =3D true - docker_wrapper =3D [docker_wrapper, '--command', - container_command] - else - docker_probe =3D run_command(docker_wrapper, 'probe', check: false) - docker_supported =3D docker_probe.returncode() =3D=3D 0 - if docker_supported - container_command =3D docker_probe.stdout().strip() - docker_wrapper =3D [docker_wrapper, '--command', - container_command] - endif - endif +docker_probe =3D run_command(docker_wrapper, 'probe', check: false) +docker_supported =3D docker_probe.returncode() =3D=3D 0 +if docker_supported + docker_wrapper =3D [docker_wrapper, '--command', docker_probe.stdout().s= trip()] endif -tcg_tests_summary +=3D {'container command': container_command} =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:56 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=1789548966; cv=none; d=zohomail.com; s=zohoarc; b=dpz6r7UiQ+dAnq8RH7WbVlTnguCeGmN5TWQTV8DN2JnqA9y6+aRPmZ53VS4ySm47DxmsB3z1N5wQvrqwX2kPtAZ5ipleO7rT3ehsYsG6rIApoXvrzNxxu8j97/gLHwNYEz2IGa/bxukJ6wk05cKbGhOvwi1c0VIU+YqSXVxnvYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548966; 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=mSaP61w2ef61XVdqt6Pu/Eepkm21Cmp+IAt/GQuQKG0=; b=KyLtrvLfU1S3MjI2lSyURYGSjbzKRWM+iChfoKkiZLN9c/8wL+KL1b6oXlJ6MoCAz6seQdcRCYNTghZ2qajMEhLqsSsb4iMZqYRPELvAJ+I4rzSrXNToWs+TBQq/HSlueT+j0JCPFmjm8ZBO7FUFSaYulR/e8pLcmgJITucezFA= 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 1789548966130582.0169963876914; Wed, 16 Sep 2026 01:56:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOv-0007rh-PL; Wed, 16 Sep 2026 04:53:57 -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 1x6lOo-0007kw-Di for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:51 -0400 Received: from mail-wr2-x0f.google.com ([2a00:1450:4864:30::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6lOk-0004yv-VS for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:49 -0400 Received: by mail-wr2-x0f.google.com with SMTP id ffacd0b85a97d-4858bc96fabso403069f8f.3 for ; Wed, 16 Sep 2026 01:53:46 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1fad3sm4991690f8f.12.2026.09.16.01.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:42 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D0A816182C; Wed, 16 Sep 2026 09:53:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548825; x=1790153625; 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=mSaP61w2ef61XVdqt6Pu/Eepkm21Cmp+IAt/GQuQKG0=; b=Fg/okfY0qaiJwJ3j1TeYT4SxWv2X08a3YFOTn3HJCjNj5uXSseWzvyFy8H5ZKQcbIG Wagrv2wwr2uBsJUD57QEhZjEoxFesZpRSzkdEGCZjIHSRepmYI8pCm7Y82ZfWPKD5ICL 5VzvfbOGb8DTNo9U75Y4jjOmIStx0VZ4CNglkU9jvZ+h+AUn2l8W9VeIOaNb47NUpHQh iEMWY1iXFGQIYBuPCmqxosgYlAwARPJcSO3ulkVP/sBFE5R/pLfSsuK6Sk8sY3A8/645 kUGJI2plF7BOyJOnoSz8xQQqLRrMMdwWd78avDJXcnhqJhd7HKeOyAtXSikt93v7r2nm 8bjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548825; x=1790153625; 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=mSaP61w2ef61XVdqt6Pu/Eepkm21Cmp+IAt/GQuQKG0=; b=mXfxjYBTy2qzEjib8HfJ0orEaMLp6BJraUC6ORR66FqCEQnAri62Ys24t60xKooLPx khEPkMjkDVo6OVZr3huw+0S4/c0gAqABquxXP/QCt/lJI4sj7Z8OO5h63CkmVZwYHQHE DpPURoNP5Ta4mGpxGfb3IdqQEu9kTLWxHBCEdvBMevvVuA900BZC/rmLb/4LWOM+FTja KBIc73L2wq0KH+tb5VKNx5PCvoPoTMBtAK6DXY1d8DT0RlLyVf4MGOGoAA+KAQ+v5FSt 78b0LaD9SJDAP91X8hQpg7Y4oR0UfddBDlAHmthFNvVBS3y2K7Nu6Oz5QyiAwzGl3ZBe A9JQ== X-Gm-Message-State: AFuF++lkUbvDpxfrlHPJvr3jyJ0q38wZyzSKWGVIMVQOwM8RpLRC9vbL NKUhzdEJXD7BLvehSWjzS5nv92v7VtSe7Reopm6zP7uYFVLFqvZjwDDntpYg/OyQ+W0= X-Gm-Gg: AYBFou3j1L1zdkvX2o+L0WM03Bc6ZetQOU5g73OSDjwygCI7Ed7aE0XX+aCBVGnLkLP VhT+eB015W9fVpTlKxQRj60JjLP04Husv7lV488BdD2S/pDS8qAVN4PTb9ICpg6/4SSaQbhYJpV JQh8eYPo5fmW7H/2qifUjscLSeDD1olxbBNvwiE+strlgt2a8DdUxNlOZEmSLogVGriaVmuTs0+ 6gkEtd2zC8v7fsRrux54wSkDGZgObBmBkTcC0xBx4T5H4Y2g9MHW8rkewPMIKWQ7vYNHI55ixoA s5vwPMnM6iAgUVRYAXUrkBcUyt9tbNQ53rizV+8P3xWnMLGSWAqUf9Ys0yhtVboJSIFevD0E+r4 kUnUsU5d7f1WIIRUgIyZR1u4PhPe1TLmaXIKRkIEQFcImoWRLBcZyP7/pnHNRph2WARKMGmRnBq WFC0vHcGE0KxfPtcqTXqz43mqg50UzlxtjPmxoXKBj5nZSI7FZnfu7x4piJo1oMbrJzvUWnjk= X-Received: by 2002:a05:6000:27cd:b0:487:d8f:27a0 with SMTP id ffacd0b85a97d-4870d8f282amr1158346f8f.32.1789548825145; Wed, 16 Sep 2026 01:53:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 04/17] configure: correctly honour --disable-containers Date: Wed, 16 Sep 2026 09:53:27 +0100 Message-ID: <20260916085341.1692742-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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::f; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-x0f.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: 1789548967087158500 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 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 25d26376f12..86cc8d0a942 100755 --- a/configure +++ b/configure @@ -1398,6 +1398,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:56 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=1789548971; cv=none; d=zohomail.com; s=zohoarc; b=DIAGZA3h4JFoQugqHO/mgWXcPGsturudw/ULlFuuvfHizeGNabImIswWXEtFRmSeRH0Ma6aXOuNlJJKe4xTQ1fiz0e6pXvMJt1Ej+5zG92UQc5VDE6fD2akUA+89bL/imxpJOgApHoR0W7DfBD4s9nxBfiZAhPiCIi597uuCICQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548971; 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=V6gQzBf8aEUnoUI3hKPFqYSSWIZAEVsQObEXFh3a5VQ=; b=bg56hi9WjteY3o/sw6OWTP3g3JCXBu2t4GJ0mvb0pfWheNqyoqCAROg03hxmsO6EVpEiG0SbGElkSPuHlDHMXuO9ukKzwG6DUE6rrdaaFBJdr+khO8ka9xASblndgY1Ki4pqwP+LtGQhwgbpKLhK6AI2GcQ6BgQtRc1I6Ra1sSw= 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 1789548971960775.8922125153193; Wed, 16 Sep 2026 01:56:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOu-0007qJ-8C; Wed, 16 Sep 2026 04:53:56 -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 1x6lOr-0007mz-Lb for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -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 1x6lOn-0004zP-Ky for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912d822dso5030595e9.2 for ; Wed, 16 Sep 2026 01:53:48 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83fca34asm53699135e9.1.2026.09.16.01.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F2EA961839; Wed, 16 Sep 2026 09:53:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548828; x=1790153628; 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=V6gQzBf8aEUnoUI3hKPFqYSSWIZAEVsQObEXFh3a5VQ=; b=PqZdBw27XRNSeNl8PYRSJ2CJ7xo3s6xkEZfykMqmKF92Bge9P+C8Texb3sKL4XlSCN k/coDsKAaCmJhIw0/43E51Y7UurGyEqMdFbpxXfYU+nnXNLwzCSfJhdqG8L7lORYU4xW L1BtZFuj6XO0m+DYZdHgMjX/yHj8W5s8RmY4pCPMFngayosE18e+kFM1za2EyiNPFOsw SRS8AzEMLa9zdJLBDIxwijkwbRet6TM+USgDlR7T3rfqd/+tyA0X75HHL3/MSetR/G9S E3yz20vVz353OOZxpAIirXEDv+SkbX9FbANCdsYhZzXJRDfHUTm01zPYlZPtXvnRviX4 x5/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548828; x=1790153628; 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=V6gQzBf8aEUnoUI3hKPFqYSSWIZAEVsQObEXFh3a5VQ=; b=y4avqlCr21i/E2TRhIRTIdiroGz7RzgHq23gE6xqkzeu66WJqY+6bADNbd3X5a5v9e WuFZLJ9XWDyditBV2PNncUGi9d+qahVbtVXyFiqJl847tF9SqYgioYuW+Um9dyeEDal2 kK8qTYnQX5geAQNrsSuw8GymBizPlmCKIRk7C6BtiEHK8ij+JrW6Bih5ExUBZcaIzYlG Qm4E9HzwdQImysD4AQsCpKyrP01D+Ue/lLl9SFJrs2gTlQ+eusKnF3ahO7QPlwFCK1aU 0D6PvhJFUCNbRmlS2TtI2vOicsjCBsekWAqw/GHYknbVXnooHBLsLyJ6kyOTMjqTz6BB B39w== X-Gm-Message-State: AFuF++kdYG4QRK9uPHJQsI7abbWKFrBAQyrvD48M5YWfSL0zlvnzzXvt uNtpjAKbSS/u9hUICEDmafRUn/4o99i8oAA5uxg7h4g7g88NsCiNQyItSQhISoOJrwQ= X-Gm-Gg: AYBFou03gOLAnctl+HmOQmvGGRtPFbXhq4HrDTuK8tYMHmHmJnV/Z4f1ynMTm7WlNEz oOi1wxfuITUw+Xf6reE7hS3jt9LjC+qMzSLJLuvqiujduAl6wZFXRJhU/y0VuFxx5sp6ATtSsU+ MKajMSGNu9UYK4rAVP1yoFJ2MOxH4VcS91zAM//Pi9uiNFzhDQ1ce49U2Q7/xJDvdE4Cq7voMdl c+HUEK/euaEZRU2GEXSrCpEH7aA1nNhP/cl2UfZmdRTuowxTVvEtNI8rxLt5EASSlQY2VJHBL98 iAr8/zx0ZEa44BKQ6sZlHBqLFOHg/SpV2ntF9Xx7a+1tYWYnllmQpqGW0mjajk1wjo5FKLh3K3Q zo+jpYTi7oMe5oefeBssmNv+dC0VI6BQJaIQFVy8sNEjDUMKMg6d01aSwjcCL7PVkV/y65nmm3M fDrjmYThXMbxZMYJ+1vD++fS1dbx+naisBEQ736tg5dg453g5nNHh7uWggo32S6memG51MseQ= X-Received: by 2002:a05:600c:35d0:b0:49d:827:e5b6 with SMTP id 5b1f17b1804b1-49eb7320b76mr22122925e9.20.1789548827818; Wed, 16 Sep 2026 01:53:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 05/17] configure: re-purpose the tcg test compiler configs for vdso building Date: Wed, 16 Sep 2026 09:53:28 +0100 Message-ID: <20260916085341.1692742-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548972790158500 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 --- 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 86cc8d0a942..d1b4e6d3ff6 100755 --- a/configure +++ b/configure @@ -1733,65 +1733,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:56 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=1789548898; cv=none; d=zohomail.com; s=zohoarc; b=c4iAlK7V9OYveKVgU2b7y7ZNO7BPv4LdS8dTQ54d+WtB6UxlPjFNic1OXJlU1/zDSXDVGdWTly5dWq3lxS3MOUh0aVV5CK2lQZ5nf7X1npQtbdT1Jljs7ZtLiTyve8k1XaxcsWtOeXQuuzZFtytURdhlE61NFZjrmUp07Aul3ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548898; 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=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=k88ll9nztsku8OsY2Wls4g9BIS/QxFHd7bGx/i7TMOp5dLFWiywVzxuoM71hIgng+shMOgV5bHZ9I91SUjNSy3RfaMjIR9yX32J5ECT7syNRSqIjaNzscRYu/CoZgD+Bez7VdbAilEQMutwKz6WfSZMZNS6z/EicG6eJEJsLQgw= 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 1789548898853737.9683927551245; Wed, 16 Sep 2026 01:54:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOw-0007rs-2V; Wed, 16 Sep 2026 04:53:58 -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 1x6lOr-0007nH-Pl for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -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 1x6lOo-0004zb-52 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:53 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-48449f62b93so182723f8f.0 for ; Wed, 16 Sep 2026 01:53:49 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1f98csm5065164f8f.11.2026.09.16.01.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 163B6618BA; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548829; x=1790153629; 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=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=D23faq/xB8ChGJ0B12Ma38I/qjFQtZVL6arZ2Ag5anj7zWF0lgmNvSmOgYnHZsZ+pv TimIilzGVVvNuTEKwu9jRhGLn/tlm2bVQ9m89pLPtJjXsqSsdhquClF11gZrimpaY0+X sYj5IHFlRLnfP23qL8r4Z29e3nd0oIzWvNEToCzHyFvkI+lgNr+JYZq7Vp2YRIEw5Xuk RyGKSrRD6/ODvLDlbPrCHKhBHZa/aJNai0gY/43QygMm9I0tWceIvuHcpZlMJFkUxsuG h15ooC3zeVL6KZ1D0xE/Xx3xD/FnjL+ibin1b2ne8AWDnInuVlumyrZlQxw6n5fRdc5b Nhww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548829; x=1790153629; 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=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=fo06B91ld0K+AGVgTzeACmtQ8xnLJr2Dl6tAqR6cL3cvA1drD0gDARLeNNFb4Z3TMN ToF8tdq+jRfh44BYr91gJsrtHaRrfDVqC0KMov90vB2L+vRpFGxb9au8IZ4DamnSyUyw qSwUthrBlFiIaX2fzkXDqOzlpxCvjrEpEsvtAoNRNljnEJ0j0OZmTGqS7tXriLwjGjcv yTVWWcuoPsNFhW9thc+e+X/M8bFVdEYoEvNrSrIWeWUhcIqFhltjkSkP1nEoZPgXBP76 Fh24aFo8ebioVyZL8C0vWcMI+5OJcXLSxGM26dBAo+5xzgHrdukEOzeQO+/7ZeMjnkIB 2caw== X-Gm-Message-State: AFuF++mn2gfjikiO+LRuJM+ZwzVMEUvx/Z1D4Zg1uSRlH4ny/blfJzTh HUTCAv4+5Ce7URn1T7MoTZwMZCKx1nGKbvhgR2xfXw8mMYSddxAM4OJcPHDRdT4Ui8M= X-Gm-Gg: AYBFou3LIyE0MPRdlAsV4G0rAJc6J4MIiHVsghzZwNaV+AH4OohjLTyZ3ibUSrRW/1A SO+mWyMSWkypHYFlCZH8u9Sw8eegfhjAwVR8ZxcpZZA9zxKcISemdD75A/okCqaQTPWslR7ad9s hfBDsFkd4VZ5im3NyGmmp+ecdKi7gVzzM+XbUGfsvIIBPbR8QNtUGooDDCiILiXLM8KKihTNiRp Q5sU2z4oVYopU7T5KccswpHlEQTlqKXoligbDA2H4E82d0CHcRCIfZ+4O2v/U7mntvSW3Ml/1+O GZIaWCvHyfHjwbZx2c27k5mYAwMb1zXD0KRj0YTQ60iZ7l+uaK5Q5KYNhz2V84LPSUdnIQB0hHG BftVmX4+aDzDfpPV8/TjcZxzOEJwcGrNiKGY+KaDmZPCOUjBuZiy4BgUCTlzNLJWtyj080Ns/ck Il15bh4N1V5xx2qCojpaTKqnLxN2Fdl/uGtkMJggiiebVTLWFhN0/LGXbhoLdee5MQCrmW540= X-Received: by 2002:a05:6000:24c6:b0:486:e3bf:606 with SMTP id ffacd0b85a97d-4870d708145mr1971111f8f.18.1789548828567; Wed, 16 Sep 2026 01:53:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 06/17] tests/tcg: improve check for working cross compilers Date: Wed, 16 Sep 2026 09:53:29 +0100 Message-ID: <20260916085341.1692742-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548900633158500 From: Daniel P. Berrang=C3=A9 When it finds a cross compiler, tests/tcg/meson.build tries building test_cc.c to validate that the compiler works. This includes "stdint.h" as a witness for working C library, however, that is not a good choice as it can be provided by the toolchain alone: $ rpm -ql gcc-s390x-linux-gnu | grep /stdint.h /usr/lib/gcc/s390x-linux-gnu/16/include/stdint.h As a result, if you install the s390x GCC cross compiler, but not any C library, meson decides to use the host compiler instead of the container: cc for aarch64-softmmu : aarch64-linux-gnu-gcc (from 'debian-a= ll-test-cross' container) cc for loongarch64-softmmu : loongarch64-unknown-linux-gnu-gcc (fr= om 'debian-loongarch-cross' container) cc for riscv64-softmmu : riscv64-linux-gnu-gcc (from 'debian-a= ll-test-cross' container) cc for s390x-softmmu : s390x-linux-gnu-gcc cc for x86_64-softmmu : x86_64-linux-gnu-gcc (from 'debian-am= d64-cross' container) Eventually this results in failure to run 'make check': [33/40] Generating tests/tcg/s390x-softmmu-hello with a custom command FAILED: [code=3D1] tests/tcg/s390x-softmmu-hello.test /usr/bin/s390x-linux-gnu-gcc /home/berrange/src/virt/qemu/tests/tcg/multiar= ch/system/hello.c -o tests/tcg/s390x-softmmu-hello.test -static -MMD -MF te= sts/tcg/s390x-softmmu-hello.d -Wall -Werror -O0 -g -fno-strict-aliasing -no= stdlib -ffreestanding -Wa,--noexecstack -I /home/berrange/src/virt/qemu/tes= ts/tcg/s390x/system/../../minilib /home/berrange/src/virt/qemu/tests/tcg/s3= 90x/system/../../minilib/printf.c -I /home/berrange/src/virt/qemu/include/h= w/s390x/ipl -march=3Dz13 ../tests/tcg/s390x/system/../head64.S ../tests/tcg= /s390x/system/../console.c In file included from ../tests/tcg/s390x/system/../console.c:8: ../tests/tcg/s390x/system/../../../../pc-bios/s390-ccw/sclp.c:11:10: fatal = error: string.h: No such file or directory 11 | #include | ^~~~~~~~~~ compilation terminated. Adding more include files to the test program ensures the meson probe makes a better decision. Fixes: e5d084d622b1 (tests/tcg/meson.build: check host cross cc is working) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier Message-ID: <20260910100120.2076092-1-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/test_cc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/tcg/test_cc.c b/tests/tcg/test_cc.c index d3614a01fe6..fafee055b40 100644 --- a/tests/tcg/test_cc.c +++ b/tests/tcg/test_cc.c @@ -1,7 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ =20 -/* Include a standard header to make sure cross compiler provides them */ +/* Use some standard headers to ensure the cross compiler provides them */ #include +#include +#include +#include +#include =20 int main(void) { --=20 2.47.3 From nobody Sat Sep 26 20:51:56 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=1789548978; cv=none; d=zohomail.com; s=zohoarc; b=Agy79zKNSYKgSqK2LTnnHHPU4e2P6/OrJF8eFnI1e9zTqgTf5QuS9R9Dx3cmG3ZDOTVDITYwbDUj80FpnowIgwi6THFD6G5T9YuM+dK5jmOvGrgFoD8BmD0fakSnCmxkDGhQiP683sDtc3P8Nwazt6atoI+Tf5PLIFSIT1BcPOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548978; 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=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=UOp82UDsRZ7icYXsIRK7rZz5dA4OCIeLLAe0GfiMeHqYqNh2CTC1t3mtmvrh5z+H6UZnXquSj1+6Qn2mh3sqGJHUiRGi21vks8poLAynnbtUWF/7mg6KBMLj8NSBB4Jl2b6+X777WSU78u+DYwqku7//fddwxKxWHpWBbYOsa3w= 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 1789548978724478.48682378658657; Wed, 16 Sep 2026 01:56:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOu-0007qO-LX; Wed, 16 Sep 2026 04:53:56 -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 1x6lOp-0007l7-KZ for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:52 -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 1x6lOm-0004zG-Gy for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:51 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f6350f91so334682f8f.1 for ; Wed, 16 Sep 2026 01:53:47 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf26c8dsm5868377f8f.14.2026.09.16.01.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CD3F618C3; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548827; x=1790153627; 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=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=KDSOOGQFM4DHYFlcAivzMKZ3KQ1KmVxQ3wKew9NsU97K0N4oWW7dJbQWDm/ioqhLRH zjI8HmcS8BL1eygxladKMppmnnLAedhwjxOupjWAXpVz8eyt6Dc7p21vvnOkRav7CXiR +CgYlqXpwS26gsNVcNe/m+1FMrQq7Q9TMfYC9PEcUG3Xa3wSNrLSHMyy5n2AVbXB10ix B7MTvAuUFpqOD0IgqPMR2JY1l3e268k//7bniHXWJ3QU22GjIWhCt1RGUFXk7BDt+Kk4 gHMkLeXSB/lugKxWbpuaGCrrb18gKjRIWY5JedoBimSdQmFS2kfhJ0SHZ9hAlRla8Yeo u5Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548827; x=1790153627; 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=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=f8bbPBHLs3aJhAv/DTj0NANmxsqy+aUFM8iFmUsKygg1ZORYQ5Z6nKxBGgt7Vy/mY9 wBEK9ulYThiqUz1WnF3H4V43IeZIi1G2g/x975cewvrqDlF+gxcITOGIFokoBWMq5kPI OhL0etsUdzhBoaH03xr2rpeaG88ZKMpVoZAZtBr6E/E1thOuNJIR6bdAxWUUteLmN5Jo MpJUzQR7/jgGHCIdtZkhwqwh7zSlJdRigZpsYFzyUPewid0Fe7+u4xcYayefsUzDL60S n8+T6cwJt0hluJHSdWmvRezeL1ROTd4Vyv96+p9BomDiLBC5CXmER/S3ud2CnShV1UPM TVtg== X-Gm-Message-State: AFuF++lkCnAxnHPFWCyECXjlz0aGyRPxmRGrAfhL48b4Ji/rXSAVEr4O Lglx2SK2oz3EeHfwE8pD3TQ/RDRONqBKrgYbBPiEn9HO8OwkhmJV8OpiLNCbR3huFno= X-Gm-Gg: AYBFou2ltFcJiQP6XGzQCDwVvjQc7EtVet+f+rmXOyG0AK+tus1xmdXvhNHB+bpH9eC Fs451WPUAX4bjjYAghhCg22kiNsjqNx0ik3riHp14gywYRpKx296aNniQ5eoGpJYbb72SpXNe8/ lCKgORbO9tVMEc8HAQHve5Np1Nah2BAh6kuh+QNbgiuCgAfh7nXV4Hzp17ap3we2mGQDhx/BNal r/K4O6V/ltkKE8o2Q2vyIcC+StyQpQhP8z4dYbCNxcZEqXskE5d6JS98tes/rwLmBUA7GePctJm dSH/avQJJ966+aDq4WjQBsOiYxVPdVYhjTxaTrY21qjhvGftnDcLVEz8u5ENuYY7oFhz80fcRRZ ExTnBCvAfevrnuu/hIS4rsPNa8Un+wu/CUgFTshC5csTLAnGmujjc2gxdBTgSw7M8cccEkmbjEi LTscD4lzAxxfS7iy+pFtHSFHFmw4VuJW3cRbeGAFxi9eE2Y21Ej16aGY6ZQ4Ucu14MzBw4eV0= X-Received: by 2002:a05:6000:46c6:b0:487:363:d8d9 with SMTP id ffacd0b85a97d-4870cf20995mr1608042f8f.18.1789548826910; Wed, 16 Sep 2026 01:53:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 07/17] tests/tcg: prefix meson built docker tags with qemu/ Date: Wed, 16 Sep 2026 09:53:30 +0100 Message-ID: <20260916085341.1692742-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548980723158500 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 --- 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 e966774c8c2..5e2ee3e6e3f 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -217,7 +217,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) @@ -232,7 +232,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 @@ -241,7 +241,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:56 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=1789548944; cv=none; d=zohomail.com; s=zohoarc; b=cBPg1reFMrYAVvJ1N2f2C+BK1hijNIqr4KvuYnNLjA+ptokxUMXQC0uwtkFnNlv4Bt4xj3H1n5vtef7q/mdWqKS4tW3roOrhf/CzkAmCA7lhoamEycKmxm62WuO2fqa9tCT+KvWftP7IwV/wkPARv8CyIT+tr9c7ZSlBmK9B2O4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548944; 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=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=korFFr9lAQ/A1zD6Mp8rSKHVnCpm547fxXvDO86rffFGBnMGbNMXhkk879hLXqq72M2VzHgjBthL5D6ZHvAQBV6uzSLytS8LG74j0kMRnpofAhkD5MEH5z3B2a4G9eNAx2l42hPDT8vVRtXxhUVbKJfgfswzBuxgYhg+QC/p6Z0= 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 1789548944711648.3476806569371; Wed, 16 Sep 2026 01:55:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lP1-000840-Qk; Wed, 16 Sep 2026 04:54: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 1x6lP0-00082t-Qq for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54:02 -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 1x6lOz-0004zj-9w for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54:02 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-485984ebf5cso416009f8f.0 for ; Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1fad3sm4991867f8f.12.2026.09.16.01.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 473FB618D2; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548829; x=1790153629; 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=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=hHLfguxw5XuoagVL1NfFuiYYn/HXSkZdXHahDdIAhoTpO7CODbAsThw8T7p5ex92tn TMetXf8Zh8YgmYocQDmjNg7Hu66u1mqooG4CZutT0uvkV5jxlwDQdvNVii/wM8+FNrIo k43sU4PAzL9uWqlMky2FwrQP0zDHMT4VYjh6D54NnnHLr2a2qtzgdcYXEgpYLh7KX5hJ 28DURgqpizXJsqX6LLpLjD6IlDM2nSlw7Fhp7SScIsYxLkxo/84qOIF1ZPDlkeI6NlD0 kmz6p6SjUPvX9y1ZLKvLf9CNQK/faaHccBdCB6pAyYGEWqDnhFoRKnGo9NBCfwKHrBud VKSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548829; x=1790153629; 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=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=1KD6v+FSNFi+LNoTxjltm3Hh9NjskI9zr8okGOI4P9K2XCgcw+Y+p7AnoBXHeKFJhv KYbGRcBRFtBd4XQD/cXs7Qi8zDim9FkqPC0UzgZNUpnGGPMX7t1gs/MW0GnrCRnKfA5F h+9DsVq28aZqg8V5Oj+Hxeru1ghxBYKz2tnME4vl9L9f+20NM9rBgVniVCZmcXe/WYYZ 6LurUgCWUd+k6EmdiNt1vdHtBnTqlUp6qNWOFDPPZEVSNzdymKfROh7r+Y9M3asc5aqt lwT6/steF+2icUyB6OZ9kX/LCjk/DSPnLvRXt5BM53YqXQipJ1z23CGmakXtsN3q88Hp F5aQ== X-Gm-Message-State: AFuF++nrk3q/eAmh7BpHRXGh5gwcnxPxisZ6Xh856ygwZthOfoxBqphY 8W7Qxv13MHvRdt39VxJ40clvtXHN61fLXhqRkR2+j5X1hYHLPub2InPTp2/Jh0YPHc4= X-Gm-Gg: AYBFou0krERw/NYuZvdLyKAzCUWPhJ/KMOvgRxp1bXA4aO0l0ly8z33uF/QXPH5cB6H tDUlvvPx2H7rgVIvWzpgedslPWOxPOXLIx3AOLq+Qv0FDtfx1EQ49wpspOFN42nGWbKyW/Rftkf VfPuMd1u/cQDAH/CMBn0JCUgsKXv3E3+X5pA4goCnLFrLKrtjL/4giBsbqzJpf2AhBGyQX283xy BxLcFhqD3NkI9wntFaXYXDw5ZNmPcJ4ySvjeyZrk0piEawg17nFLywqTOVLe0bB0lD/Toea2orA voYL21ByyphzJfawz5eGcTgLc8ApbUVV2c6emXO2PIrl4Ybtd9j9PgjYdruCKI20k+ANi6rO1A+ blOBRQ7qsluFhnUFY6Yapdkk7gdI2+UqYdUTaRpdnjTW7XndiBh+PHvHYqP65Q6wqG5QMbdKAOP me69qi/EXwM3h2FHOgHntXl+IMjjwLIBKunmGjTWmkLdcT9WtafCtF0fy+6h3+1ak/UOlsP6A= X-Received: by 2002:a05:6000:707:b0:487:8ba:8b4e with SMTP id ffacd0b85a97d-4870cd87fd8mr2144955f8f.0.1789548829084; Wed, 16 Sep 2026 01:53:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 08/17] tests/tcg: use --add-current-user when building containers Date: Wed, 16 Sep 2026 09:53:31 +0100 Message-ID: <20260916085341.1692742-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548946932158500 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 --- 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 5e2ee3e6e3f..28a8e7a0558 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -217,7 +217,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:56 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=1789548953; cv=none; d=zohomail.com; s=zohoarc; b=d3nL798zxaVsjkX3Qt2e/nKkyyPq62kbJseZ3DtuzH0Hc4nvTm2JzOwqkiOW7awXSsY8IIy9zFUAFfD3OU08xcWaCZUtKj0UvvMftQYLTH20mJNDXjRrbPpSvRpK7zJp+X7ACTKXHsk27PHvLTUidNWiM++WjzV3iJFnIELQlCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548953; 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=i2Y6PTJy6Ue37NuEEJ19/+e1vKsW2mbiw6rvAiII2Gw=; b=i8yFX38b1w0A4kvQxhAhlv1lcE70SlH2IXgL3W+D0vJdR8mO+oyzX+1MeixmC12YUkOfikin9arpVis52aRPGdDSPQlRq5gQYekWzvEJGQyOaqbm3tvYV1Fr3AdwUhchz/mJ4v6/GjkRtgkP5u6WHQiree2lK810M/ZS7FLsDhA= 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 1789548953767492.35317692662; Wed, 16 Sep 2026 01:55:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOx-0007st-Hv; Wed, 16 Sep 2026 04:53:59 -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 1x6lOt-0007oj-48 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:55 -0400 Received: from mail-wr2-x0f.google.com ([2a00:1450:4864:30::f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6lOp-000504-AB for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:54 -0400 Received: by mail-wr2-x0f.google.com with SMTP id ffacd0b85a97d-48437356d60so290566f8f.3 for ; Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1f98csm5065257f8f.11.2026.09.16.01.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 66A85618D5; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548830; x=1790153630; 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=i2Y6PTJy6Ue37NuEEJ19/+e1vKsW2mbiw6rvAiII2Gw=; b=LfoUKhywP8tf1nB3p9H2UtBVB4UqnsC1sKYLRSDR2Bg4lRlvTKkqZEpW3xiM/zfOlf 06JNK39f7pr8qiDJnI+K2Vq1dTebAKtQGn0iqAsOOeB7pmbPbugtBMvhj9WB/Qv8Mn28 VTQ3II+zUuvurg8B79nKdPrhcOT096GEDs77SsR2wOvHEAvHtzu+m8Q580LG3m5cbdfg iWlCpPMH4ftXD6fcUn/mX3VsT9dYRnSVUnQXixvQQ8IWzYZ/6ak20W+ntBTM3sf5mpOa ten+bm2W0M1kxLJSTghftUD+hlH36lWkHy3vPm1uUnYmZkW3BaGmmarCGvg8kZmZt7dR 2deQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548830; x=1790153630; 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=i2Y6PTJy6Ue37NuEEJ19/+e1vKsW2mbiw6rvAiII2Gw=; b=SO2fLAkFYcmU6zLdGdGe5eX92z3I8lkcPLoFfnNIVEcqLy2ff8ko+v6MKla6/s2gGu cHLaC9K2/qFJ7H8Q4aVdcHYhCvZ754W37pe/rMRAAC6I0POu+B9bK97iVX444vNeLGL5 JjwWqFtw0w/t/6VBxNNH4RnIlVlwAFakDbTDi7ZCOCxjqpFbNXeg4+VKo1U7AAD3coET S2SxS/327PtxtD4DDL5oyNFjJn5ab2G86nV+b2l93y3G7x/zuA1Hq418ACS8en3sJ+Nd GCbcd04IGJSexE8b30gkGBTNA24nS9NmVtcLOb4wJL1kWF9zB6ta4z9rvxxyzeUnRGkt 1h7w== X-Gm-Message-State: AFuF++nVpkElZA9ZFFNloP/okf2uX4aCdT4I36GERexQbx1qxWcaV9Us 2k0GQER0rclycBEz3Yo+xPd6SsjlZlxpbY6pF1hK/tbMCx0mFWXh5nr6NfN/hLPZAlM= X-Gm-Gg: AYBFou0TOyeCLOxjMwoINyiNvB2Z0fkFW23YpHT8jjSmZRO43I15/ywevA97N3p/u5i GOaYGTMCu2YmKkKD5ItdD1QYLBreapskF2ePqcwPfwr2rfpyHUGGsi+BbhQ88GG7WDZFOrsqHKN NLfv6hL0BULEm91cKu/GWJQUEE4/eGO39Z0eJ7aEwzQx50kWO7VFM2NBClWJ0hrjMVr5JFqsaF/ BzBT+2FmvRL1qR54awHq8l6ISOMH8DyynMfTNypjgj7OsbFH5qgcW+Xy7pHLQ6vYQmNSnHM7Xn2 Nc4sy9hXD6lvgBah3oo9ROk4fv/QwQYDy68O72ruD3QBpf3dOK9BgEbZUn1GWqYl1f5HU0t5BWg iEJBVnW/qRdk+a+0biqDKlGgBqJyiVjdbcIbeK14vYKyg9m2xaavW1f2dj1rq64wsUsBqijIqLI jXoqOYsEovoFmYcoQRXsnLJ9QAY/BEQAMpY0dVX+QRdDO+aYNJobq9VRpft5wIfnzKPEFCS10= X-Received: by 2002:a05:6000:2312:b0:487:355:4619 with SMTP id ffacd0b85a97d-4870cf273d4mr2312749f8f.4.1789548829598; Wed, 16 Sep 2026 01:53:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 09/17] tests/docker: add container registry to configure and use Date: Wed, 16 Sep 2026 09:53:32 +0100 Message-ID: <20260916085341.1692742-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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::f; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-x0f.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: 1789548955120158500 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 --- v2 - fixed conflicts from the revert. v3 - regen meson-buildoptions.sh --- configure | 8 ++++++++ meson_options.txt | 4 ++++ scripts/meson-buildoptions.sh | 3 +++ tests/docker/Makefile.include | 4 +--- tests/tcg/meson.build | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d1b4e6d3ff6..b9d64993835 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"" @@ -733,6 +734,9 @@ for opt do ;; --container-command=3D*) container_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" @@ -867,6 +871,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). @@ -1729,6 +1734,9 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak +if test -n "$container_registry"; then + echo "DOCKER_DEFAULT_REGISTRY=3D$container_registry" >> $config_host_mak +fi if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi diff --git a/meson_options.txt b/meson_options.txt index 218d003a80b..5a080b2360c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -389,3 +389,7 @@ 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') 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 28a8e7a0558..fce70f8e56f 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -84,6 +84,9 @@ docker_supported =3D docker_probe.returncode() =3D=3D 0 if docker_supported docker_wrapper =3D [docker_wrapper, '--command', docker_probe.stdout().s= trip()] 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 {} @@ -219,6 +222,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:56 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=1789548953; cv=none; d=zohomail.com; s=zohoarc; b=eS4qSMujPTuyX6+xYpdjv+WtlSvEO7pWBoQ6kYoyeW9HXETwUNThWf49N6sPgS3XimVFOu6iizhNDcQeo0C8uyg3xR+rXcueDBHinApm+UDwYNM9xegUyzMqDtA5RuKrEEBfONmHOF/SopEFdDdJZvJUE8Sq+GhS5t2cBu0MQa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548953; 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=W4jgQtB5c2cA1xd2QBKAnJ92YvHVvDxVmXb1iOZdjUUEJXFZGTrI7p7jZA1/1bDeROdGQQwrRwQWDDlL5De3Hf7CjxSaXhMFhfgYkUX7Ckti9Pqiiw+hkqyd/35SQ5ajR+gQf8rs4MIQAgP/6QMc7wdcOdPTBMg/JqsXSol7hIM= 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 1789548953320257.98479205757394; Wed, 16 Sep 2026 01:55:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOw-0007sk-Ln; Wed, 16 Sep 2026 04:53:58 -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 1x6lOs-0007oY-U4 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:54 -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 1x6lOq-00050f-GX for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:54 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e620fa473so4086495e9.1 for ; Wed, 16 Sep 2026 01:53:52 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbbd83e39sm3585475e9.4.2026.09.16.01.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:45 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8286E618F9; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548831; x=1790153631; 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=b3Mq85InVk6BCUI9loUer04DfUaMnoq19/5LIhiiy7Dm/ns/tHn63sqVzIGMPh07DC N/paqraDdWLFH7eiyyDXDBZe5VcxQZFShm5wQAYGpS/lBDHaDmWb8H5WDgPcvLAavq6/ XEyYNC8B0kuQCuqvqMSM+DMGJJskQKE+G+8mtO9pk2H7f5jtmOEL35WOMmcjUTv7G7yJ RRojd1RC65nojzLozdyZBliMDIopEe8sqymkxIrZZm0F9ufX9DPRuOKSDBUG+Nnr+SmT mnvhEovdDsiJ5n3G8pyLbbeTSo3lYcaQlFaKOtvR7t1OKOCMocJyM5LHMWBs0TsqacqM +zlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548831; x=1790153631; 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=ktyeliLvUummWEr7SqJuB1PBnSWWxJquKAZyV/jr8vFWV/VidvMtLMNlwhNrIFC1/q 54dwM8zHtt6ZEDX0C/7zvtrE/6a/8LOMtJUKtaW+6KAlDeLhhMC/G1D3omezo6QcrSvM UbBi89irvr9mdFCnupzIdkqMNmq8wpLJOLjiz90Kh+woIIIxMYnp8aTdQC/hzXV6ucH/ n6a0yRn89k4r0X3iAae65VnxWAUna6dLNQziBIDHx9VjQVwe5qZ4YAvTRkHLyWXiU3s3 W4v9tit7lIb4geid2oF3J7SvuIljbrBlaonAUFYkTt0Qt+pUkRvYKmVOo0I0OL9ec2uU ZW7w== X-Gm-Message-State: AFuF++nEYmsp6h292x8gyyUHy04JlO9ZlzwLkt3YuSKGnmzpeVN+Jpuu 9BfjnGVGDBZ6F4PCd2hIZfigEqd0cs/g1NTPseI9ouwa+WRkip5qlHP/9iZvVr5E9jI= X-Gm-Gg: AYBFou21jpeLLkY8VOkyuMa55G1Y9mV6VZYte3kB9U2TxF1e+ncvqKgapqpbRhtlgXs h23hrPLoRDvNlTysziZAVuTuv+VsDyIupzLW+YuFQYxKqbN281oMite9pQfP39ScFBM0GI9ai++ Me/thmIPBgwZFplFzCJlP6UNVgIWFREAKAwDeHhYEIhmpTY1fx5V6QXchS2yIgPW+Qixju5K6OU a1A7+Poc+1N8ZBGbSBYhplF8D28PpZvc38CnzA+vlaPJ/AYq8lznYfo4VTDPQFhbz6d3M/3qYS+ a5P5N96hnE1Jq+5mQX+iV+kAFBjIF8OIfpr+CYzAFi0Q5zM6FosW34e+qxEWs2rlNK1W8QQlTQO e9X/j7/jC0XdDk5xI2mGb/84/mIZjyTbDul0EVR4xofWkWtIL2IRJH4nNBpgSlRGCeHAzW5R4ZR DfJoV7NGgDOQqePYGref/H2zZ2+g+A8FjQxTyDs2ei7OI5y8iuXIlieVKUaC80F/khJW0ykpE= X-Received: by 2002:a05:600c:3ba1:b0:49c:fc6c:bdfc with SMTP id 5b1f17b1804b1-49eb7322ea4mr22019875e9.19.1789548830330; Wed, 16 Sep 2026 01:53:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 10/17] tests/docker: remove used _read_qemu_dockerfile Date: Wed, 16 Sep 2026 09:53:33 +0100 Message-ID: <20260916085341.1692742-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548955066158500 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 --- 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:56 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=1789548991; cv=none; d=zohomail.com; s=zohoarc; b=c15I4YXCFvXY5IfO6SIaIPVl1wkuRAoYqTAblejizh3mXKLdZD5nOVsIePksoWL+UCgJMqir6YApZ3la/GvzumZXqWxX9KmBbZID+1UC33xoF9TG6TxAVt7Mn54wxPRvpzCb/SW1mVgeBJi/CKr/WF1ESjoGBEbkOfQOngC7ZDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548991; 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=BCGC7OTWHh8y8TYBzQav47pfoRd/HG/4PrroFRHCrUd6mvSHakRkeT8dyGXelZnKg3phy/YEXKNEVVdD30gHL4eumbGesAwOb4/aE895qnIS6jmd5IVHyK1zayPVF6hRCfstcFHB1TwytFA5H2+jD1TAh5fgQLt5+/FsyUjnk7c= 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 1789548991975249.77180134966113; Wed, 16 Sep 2026 01:56:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOv-0007qm-BJ; Wed, 16 Sep 2026 04:53:57 -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 1x6lOt-0007pr-Nq for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:55 -0400 Received: from mail-wm2-x10.google.com ([2a00:1450:4864:31::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6lOr-00050v-8l for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:55 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cd38e0e5dso7766755e9.2 for ; Wed, 16 Sep 2026 01:53:52 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da071asm76138895e9.8.2026.09.16.01.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:48 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9BCA361901; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548832; x=1790153632; 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=W2f4/dvEGW+lS5HRfvJ0g1phYWfPLp9tNWCQwDH7p/VmQIR9+AoQfYCLy0XbOze9rx XwP2imp30mwhnB24GRQQCB0rB0/o3Nhhbyi32KLLBVSJFIc5gnCztfQlZ5WTdklq2ei6 /97gC07gWDKui54D3IXHllXIob6Xb5n+feQKGzJNQSqQfBClHzkAAD7sAW1CRMUEYLio f3PldHifP2e3ybOZh4DDzzf2ykHo1jx7x+VDOTWe8HOuU4rxUOt7cB0Hc8f2svmG8Dzf +Q/iOEjYXi92hcwpE4rJ0mIY0+yYzSen2n0Qzp+/QqgIZyT7ccpirDeNerib8SWJ1VlW vonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548832; x=1790153632; 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=q7Knt9bf5HJcX0+7RaTa09y7m6DCuOdd970LZqcO/yYc99FMiS0oFEQpEpJseDUDtg /OiQ0vSvKc0V25tBol7mFQnBqMyaHO0LFXEnJi9Y+zXIhudu+KACCiAKwkU1mmN3OWPN CPWc/D9t79vmBGcTHqq2b1tKQp5WU7DiWwzZ46ROXyBggQnDE7m9+p44brp5t0WBG16L HiyxFC7nUgrtKBAFQwcYSFe/jy9hk9uCxfr7iVDENirLbhqaSMyxlj+U/vjlPMuX4/E+ IJ14JTEf4DtRinjvEmemWr7KqX+/qXuM3C7B4L9nPJC17x4sVFJUuO0lPV8vlTk+f2nL ZTKA== X-Gm-Message-State: AFuF++l1PX+4c2y9KlrSh6qFQdv9vWG80mmhLltB58lITY/vrrCxzUYf XbMM00vDa70zTX9nm3oa5eeL3g3dfJqDw3S288Gj2qBMG6YS8vagVlCdtJ+ltJggnS8= X-Gm-Gg: AYBFou1LYVrk12HjG7gfkSPe5YYh5Pnki8W3tF8PEgpbsbubtdgeIAKjRLVVyntXiow WAzZdcxhMImAJwe7sLOolCn/i9AHuV+9NOyZMKdND7O5kBIxvWU3caC4LJk0OUazIlLA3Nd0YZm QcJebXFgh1vEg70Nm7wjRIXwft/oQQdy0OiNPxOO6jh4XoisPTY55beaWUbugckTmurzxHPfy0Y KjD90D0aj3l3yyAmD0GBBdmQPXqmsMPZEnGN3zO+7AiWO500vb1VNmmGVZsThGulGt6YLEUF8gz /28dqcmQC2C2LlI8+pRe/gv1B8CnjZE+Fn/GA1JanYi/WWkqG7z4lh6eSXZey0ht0z2ABK9N6s7 dNoJyxehPfqTk3fiG1h+NCcKTjHlIZp2EGOIYRkNqa6stRdm9iI4cp/4Se9AyzJBLhGRfcLE4r8 DMQEjqL+51WzZ/JqKOlu4mgQDy3XQZ/V1DbB3yL+wmu2yYLXgi70CaPpO+iIAbd2Xb3iTdlU4= X-Received: by 2002:a05:600c:6592:b0:49d:1cc7:5ec3 with SMTP id 5b1f17b1804b1-49eb7326586mr39359295e9.9.1789548831681; Wed, 16 Sep 2026 01:53:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 11/17] tests/docker: strip remaining caching logic from docker.py Date: Wed, 16 Sep 2026 09:53:34 +0100 Message-ID: <20260916085341.1692742-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789548993109158500 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 --- 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:56 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=1789548949; cv=none; d=zohomail.com; s=zohoarc; b=F+lvsPeB2dum1tE9WWZ/1+jor8tBokfjNyK+3C/aBjnkZDaEZ0nLAPjw6o5rJeD9F3jwRX7WXvKs2Snr+HAb7CNMx7wFOEO9inacu/pUjb/I5cgZZ6rrrzxJU9DQ8MduvTIqA5vxRsQaru+DU6L7NjDZzECbq8XEmh3e9HranSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548949; 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=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=YZ2kKbGswLhHKi8O24MHl03ShR7E58q86TevYoFSjJkMQskWNbhsRnSi5mnoD31+EUVBZAQ2a8vAME5XghNurWRzgSCJ6nUhikD9fN3vGeQHSsuBnyz8AwDF8glRIJaPmCbd3oQjyLzkAAeJdLvYimn8ovR1PLTpwvqFesSrHWc= 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 1789548949180862.4439687185634; Wed, 16 Sep 2026 01:55:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lP1-00083a-6T; Wed, 16 Sep 2026 04:54: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 1x6lOu-0007qW-PP for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:56 -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 1x6lOt-00051w-4I for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:56 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b965f447cso5727875e9.3 for ; Wed, 16 Sep 2026 01:53:54 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ed292fc12sm41530355e9.15.2026.09.16.01.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B776F6191C; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548833; x=1790153633; 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=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=hM3nhAZlhmyD1XbsO8EjiHjAjN3N2iQbI5O+kZxEi9eFQyJ6HauwFohQxy+j4wvKel XcGjboziWH/ZkT7TTKa6Iji2s2/1a734nv+zn7w8gKRFZTprkCWDnn08wu+KLSQDmNXD BkaHqSGfutfofqttYWybIfSmiMfqmGho0mlkp65gfVrXs/KGemDk+lFAgFySAB4/Zc9S ETz640PSNs4toNUF6OJZTY1L406VsexqVTnt0BKMSgl3rwHkoP96aDTg9yzZe1CCyNo4 slWdN458Vp6er5qqW2t3RfcwXwfETEs2N6VGkCMhAgb3nEuqWAvjC50jJIJqjtMMfoyx LyBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548833; x=1790153633; 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=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=ffZtYlha5iehTXJ4rjl7zSk7NPSDn9R2jUjT78X4+YQwV+kCMTLU/hzc9N2mNHqhqW UZd7L6bkHn2WoKabq85PiTC4X8TFZ8MWHzazWO3gRYTn4aWARcxbAI9P0bZCWp7/NJE1 EcaDAig+HxMJvrOPb6SeF7Vi96YrqNPwTJn4xKZ1AbfQ32iPgGH1jYMOIiXR/tvTTzTD pBoitvA+77CT1/V0vcrK9yg9fSaZLCvyKWP+NG7sFiRdqRFCE3jO2qkATmrl+O+iX1+Z XThQvpVL5v/5RWv3IxGPsAFnVWjYnrH37H6Xjtcq8QnnGNg1iJ42t7zu1I+R6GmdIUnL WrKg== X-Gm-Message-State: AFuF++nUjhyGqFtx4Q8bGDUhvu/Dl8TDXCSAFWDHB6HiFJptnl46oEUo p9OeoeEk0biRiN2Rvp5nA67TdowJ4KqpJUzbaDGL11N6Y+pcswbzi1xIrV2HU2C2mFs= X-Gm-Gg: AYBFou3kBfYe+5GewmW9ByI8j4+0/XFwdqkBCVRPh+dxEZYbySZXLj3htz8jzvtHI2m NV7Neiyun/Xf0FWrh42BSrqgOtyaOqEtwdK17+Y+jEwbB1mQuDk5weWT4TxkHT8JSzQ/UNIXryF /xt5x6FzXudTy/fRncqncqDmE7jW57CUK8KmJJyDlzDOqIGQWjQZV1za0zLKQqwe3FXXNs3Gmzr b/8m/no8Ffs+KIZdtqMD231WHjphgkfL+PVxFrj2rNiYjCaXu4xKKh6SOS+QhuJs7nJeAirXI0F VL5DTesLbkc45zVTQ+6yP4YHI6B6waxshU44IFPeodGalZS3yT0tMsSHpYiVi1gpVwtlkAFzZ/n f0LpXVaFvZM2cL1QcVTFYfuAZ23W4yTYR8NfW8/KFnpUYQs1QsLBQjBW1ywYWy21E9HehhArrx0 KzljCgfUnGcpp0cNgY3YP92OuTRYxO6za/i+hYQ7gku+I8GfsX+UkFF8acPW5BMKdM9KlJ6cg= X-Received: by 2002:a05:600c:1909:b0:49e:6249:268b with SMTP id 5b1f17b1804b1-49eb733983bmr16836425e9.32.1789548832615; Wed, 16 Sep 2026 01:53:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 12/17] tests/docker: add specific command to parser Date: Wed, 16 Sep 2026 09:53:35 +0100 Message-ID: <20260916085341.1692742-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789548950989158500 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 --- 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 fce70f8e56f..17974e4d15c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -237,7 +237,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:56 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=1789548969; cv=none; d=zohomail.com; s=zohoarc; b=PQOsY/0O4Z9EgDfrgdAT+jI24wbTrPL4cfLtdL/RPA6mAXYZ8CF+e+el6E+ufWWyCM9KFrDT9rh09KFv5vTDCMqxAJ0oHNIeVOlYS+qtRwQ2EzfF+t91nsR0/KqTy8grGAdwtvxVO66huqfkExoV89iovk+YR+tB5ti8Ir4fK9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548969; 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=fJh60ufRUkOgF2mj2BJEn8BrdCTr0vdRAGMMwDKXttY5dksxt7PNp1JosqNFfRKXFtD6hHwFM7tR8RdxRowjd+OyTEg1LRfPtKKDd8NXz1ian3MFewdCj2L0qE64TvTnAghlFP02L+0/TqRsRgOoMpHYBWpsWjCqBudEMLBB6Dk= 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 1789548969553471.9908685437348; Wed, 16 Sep 2026 01:56:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOy-0007xG-9x; Wed, 16 Sep 2026 04:54: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 1x6lOw-0007ru-4X for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:58 -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 1x6lOt-00052U-P4 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:57 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso4947615e9.2 for ; Wed, 16 Sep 2026 01:53:55 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83fca34asm53701275e9.1.2026.09.16.01.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D337761926; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548834; x=1790153634; 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=TYtrWKWeV1huDPG3Mm+Wx+DarJ6EggTd41rFfYV1xa1VFUtPvpTryIaV8rHqLN6g6g 7oug2ySWwe+vUcbUcDtWPGfbRCqQK0n3jvBZKF2DU22rmBxB6+iNTXLOOamnUaVp90JB ZNA7odenK4qLzNvqQlKMbPfRC5R5YuXo4u+aoNthmKoEr1I1AI0HKCbpEy/JZQ7uRFUR Q2Bzc86rXWPxG9fDugsciEXPBqm+CdOYXSB+QzpriqQuTbtYyCScBmozESYvtJDNOqqk 64AselvzznZb6NGjskRdAPFPWWiS1NLE+T5YCJvV50I3nMRyioO+grcEKXHGcbuZHBAD kCCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548834; x=1790153634; 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=GJJDexAQ7D16fvtCFpf0yzRUBeYPlmasnv7MgsYJiW56x+eFrqAMPelo4J675+Tkpg YQpAE841vCGJ4bwPKbqJkftX0QXON307HeHz4iyjoi83lvihjJRo1n/mCegkeF7iXcJ6 vEzVgrd+O30SM2k9pStrVNIJnV1ftQGNOh2T0rYzJUgOQ0OjXX+Jmjra5TyzDV8AwaRM 6GFaE52F7syiPqyyaMSHX7yhdDoz33A+hKUEGnLiPcmRaXf9gdGqLyTB8xIs9ComQrmt R/3U8qPp2F5KnKcfgQagY/pwU0zQFxgTtjoa2VUYbjZiCj98LRHAobJ3hEGjxh3my/Cm uJ1A== X-Gm-Message-State: AFuF++l/Lu03abm7apvRVvwYU5iUIvGhXblLUuJhMopvAf5KUFG4PqQQ HRfjxvQzM9hQGCr0nJpnI7BEmX6qgUL4qFlidVrAe+Dx4VhdaBMCxlGnkk7tFQN3H1o= X-Gm-Gg: AYBFou2O578vox1EwCPhLlCmJ4pVeHA4+wf6VhGh+ooZgBhFPCKb7rcFJMqOQhWIe+p xNrHhH+/Ssj2X3Smfsw2nAgxVB27ER39CWW4TF/naYQPkcoNNBf21pMfbfmXB9GE2aGt7fhRdWU RW86tt0ijJrFxEIvWcRRu8f3EJv3B9HdGWxXzwvF65wSdBoBRiE6fcklsZeNXRAg6Lzi1vrg4Xr pimPbA96pb+xKexQ5+aurx+X7W80F4aamFtbkZmqXjnyNmQaj6SGK0mS01jG/EFPxcGSLhScGsR MdI/iZzbrUcjcLzs0y8y5glcVubYJn0P1vD2Z+Why/8074x8idcucnVrl/hFPAPWWI3L1A6cgMp /0LIydMV2fYQBnyoL8t39KiET3y/oqcxiVIuvQhEKKoLhgQD8TircJJh7ig5hwAujYwSaobB7Ag 3+CIXjDs7uW9MOH7xV/gZrtUmXdKPcogSYL61nDl2DcUoslcTW4i79+WxCNFI/SXKnWcyjoi8= X-Received: by 2002:a05:600c:3547:b0:49c:fa20:cbfb with SMTP id 5b1f17b1804b1-49eb73253demr16754265e9.18.1789548834316; Wed, 16 Sep 2026 01:53:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 13/17] tests/docker: swap --quiet for --verbose Date: Wed, 16 Sep 2026 09:53:36 +0100 Message-ID: <20260916085341.1692742-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548970613158500 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 --- 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:56 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=1789549420; cv=none; d=zohomail.com; s=zohoarc; b=aE3oowXMnrKrKCUOw9In8yNlcAsV4wYJrERy72kICf2uQ6pi9dasbgsMGGYZM7IkbmmXqhMrtzrlC3OkaTmFWRfyzzBVDxzbWHnOlItUuy7VFzMmTDH+zfjJigZhmkNFlJbbT8fOX2s2Is6XukDGk9xWEq62qEqldARJ/B+sBA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789549420; 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=SdOeUnSZ/HceLvQfyAWcJa7cAZ5l0DAvjHZrddTYn78sotYypUkLWA47lAHs4/NNAPpwtLC9fsCUJU+4PYzmdAuXCWPKV1227kmVreKaBtk9N6daTfoQXxPfFYGJRIbn+Sn7oG0akEDvdfGptmpyHbZCN3enMGlU08XoybOjXxE= 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 1789549419958427.278801039633; Wed, 16 Sep 2026 02:03:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lXy-000767-HY; Wed, 16 Sep 2026 05:03: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 1x6lXj-00075Q-Rx for qemu-devel@nongnu.org; Wed, 16 Sep 2026 05:03:05 -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 1x6lXh-0006Ui-8M for qemu-devel@nongnu.org; Wed, 16 Sep 2026 05:03:03 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e6c0fce17so3547485e9.1 for ; Wed, 16 Sep 2026 02:03:00 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da99b7sm60584835e9.10.2026.09.16.02.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 02:02:57 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EB22461929; Wed, 16 Sep 2026 09:53:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789549379; x=1790154179; 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=z7E4vYTNKOZ6UXLu2wXnzrMS+fA7+b3rLt1WBZ1KT5rB+RsfyDjsEly406mn6XzQD0 Ycycp5t2vi5BWuYdVGJftwDqfY97+jcj6Hc1fIa+aRg0sUe6FLlcNsMdhSC2Yx2uZ6PB wqevjMQmlSQEjO4iTBetqBWMvwpa8gpnKxB+NNFl07Fzna31c/Jg8+D5ugolsb5vjWEl cQXQxlrMxv1r9RMBVj79Hsbn/6fneftC2jRGu+Xj0lrhsrQESGgaAvbZmbcBugJO/XdN CaXgubrShYLi1ck4dxAo0Xm6F7anmSfU5n8wRvB0iihlIMzIMQzB3x7smiIS0Zsgzc7L aASA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789549379; x=1790154179; 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=so4rr5fu6tY6RxZIilYoxEsrEsGPOouHhsLdav/uyFO2O175TR5pHNVD0j7ZH+Qo3C 94it1uSuEQgMV7Cvu69Z/bwmCLchyxMGSCb3ZXO6iS/YwOFnP43NX8PsV5P5FYjzc68A Q2RiAc1gHnCQW2dGwuSIFgM/KNROgibo/Nlr1gB0qtKZrX08jvz3DHdhSMfZ/XR70EvZ cUT0CygTHH7w5Xy9zoMyu7he1QXXIm8pLfV9aZKLIdX8XfedAY6ZOCW09V4ftHDOb1RW vgjcJHqGfKFxC4G9X2jxD+E7Svrb5rOhelszRZexJR5YpsCbh6+Dt1kpbO7PVULc+0eX Nb6Q== X-Gm-Message-State: AFuF++lz8q/r8axMHgb2sUQhmmhAOn5AcuuMUeGA+lVAdmuAIjx8Zv8W QhZotSXjwD2pTywmIGw07uyM3neeBf0C3vFvByoRrXulEXBb3Lz/BdJHqbQRCmRmai8= X-Gm-Gg: AYBFou009/3vjkuwhj70fn907dyVXUUmLponI9PUbGRmsqH3IdSOSR9k76Fktb3krSm y0F98adW0kmuiMSOfYa0VC9T5CCttmZIS+qhr9jxGH1DX5bA5WCI+fJ64d/lWaWS/BhJ3hB51EO hhiw4sKz0AzsQNOqTBl2TrNrt3hnX7CODJlyPuOVoVeM9sXF2jpEOrrWJD6gwhVpLPda1etnWXI N3A4ixREmbAEBrHaKhwXkO7AWH7NK8R28hgLqKZ17prSrmcw0wppMih7xUUTsNOSeQRGWXseE2A RjdgQSNtP+VZeX2VxZWuUzjigm8l0rvBJt1fEwXJqv/f8sBj3IKCdOUx2cCc6jI38Z7m2EOY809 4snnzgHCb6zhNQYmXwXasA0cR/abn+wXG2zKeiydiDM4VmSiNbYQRWAzkyD1HGiKkSLfpsrVjBX HhSBXixig9jRl3fAqtfyMVoAk85/jarnLm/CuWSOuIYIE+AmcnMPclMB67CXyuLGswnXdHyJRe X-Received: by 2002:a05:600c:8b30:b0:49e:7862:c09e with SMTP id 5b1f17b1804b1-49eb72fd676mr18611905e9.14.1789549378914; Wed, 16 Sep 2026 02:02:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 14/17] tests/docker: fix brown bag typo for docker-ccache Date: Wed, 16 Sep 2026 09:53:37 +0100 Message-ID: <20260916085341.1692742-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789549422408158500 Signed-off-by: Alex Benn=C3=A9e --- 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:56 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=1789548917; cv=none; d=zohomail.com; s=zohoarc; b=Cs6Z+9dSIjziGg465jAmWmsCTh5RR2qq1MuAEGSCq1vvCO2aNgwmAX56epcLT2eJNhd4gc+5++KpIVIvv/1+vHCycaG6wlYP3RqFW9Wj6sCBxc8Bpx98mg1nQb7v19850kn097AZ2D5E64fJSld2/Hi2KApaVJ4SoxbBBXrhrn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548917; 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=O0bqC/+AERMfNQiTeBV3jUJSEcVNTIC6k1wjCrlddGJzuHMGgKI8i7Xqg17l8jOBkPtEsxgwU7ef6jR+5pPmY2TG1Le/TFAHGYFkNYnSCYMVJnPEsYdgMZwGUfmK8dUMuJLS9gNK7PDGOrfTF6RgZ5u/mxXlBiUjWKbXcO6cTf8= 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 1789548917835672.5219522969709; Wed, 16 Sep 2026 01:55:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lP6-000869-54; Wed, 16 Sep 2026 04:54: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 1x6lP4-00085Y-Oa for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54: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 1x6lP2-00051r-S3 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54:06 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f6350f91so334750f8f.1 for ; Wed, 16 Sep 2026 01:53:54 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf27a41sm5306303f8f.18.2026.09.16.01.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1076B61971; Wed, 16 Sep 2026 09:53:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548833; x=1790153633; 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=lR/PFgyOT2fAD78nGUrUEPAmD5nreOCBVTldzoEV+2icFdBkkYM9BI6V+IIrGsVRi6 HhTsbE//ppVc7PTVOob+z9ioXr52DGOYoA3+4Qz1GD2OrqTE2nmQ7SE+5o4zhtcIDNTe ao7gnCjV3HQ3cI/HCKgOlUBTR6yNdMg28yslJQbax04kvKMInr7z5u9mVsnnTgu2F7xP bDEfPKqpdRTMaImQylb+tOd0AHTga658d/0XDdFzYJzBhIQ5kE5LiIgbe1otqCWiNgQ9 1Y65IPBvjsZTO/HS9QKowUrViDe5w2+dsAytgll65dEu+XQFkmN5UTTnvBP/kHjtgWmC sdzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548833; x=1790153633; 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=i/3ng3dUOUcrrTRTsCqtXWhXyh5uFwNhFCjijOFtvGSt6O78MbqiU3hriW3etVAkFa NJepzS6qNz4RMgRpzwYyxs30km03xOAmUZdrPZii+eyWoVdY/2LAf8dHUHykZK/QBuWQ VBqCb1Fx7m88169kcLRt8+63CVBOizvArYWiByx5JThnwBAMM2Nq+whTICmkMTrUdnci 1p/LKa9sPjcO6Awg5k/jFP+gaClvVArrTVzXeYMczhNMYHWSfV8VKrT6oHv0hc8mxSZc 4NhPtsJiu4n2CLqiqA/lFfODRhUCytil04zDSyeZlEIPMAiBbNLDMrqlvj4lMAOUzSO/ XVHQ== X-Gm-Message-State: AFuF++khspKeO810Y47Si3N5TIEbHA0nrFnceHSjRsGpSoP9IY8xsU5Q p/jLTjiBQvC5l4/nh5ypESfGno0ux5ot1XJRPKzPfLo03jL7Ja1QNGQ9/hbCU7CUPtY= X-Gm-Gg: AYBFou38pc8batNCWre9nt/OaSUxZGm/BAYQIDnd/9yJ51HJR4YtFdRWF8rHAD+lH17 pkCsoYbVFrvcmPxp+TNHuFDTT+miQtlqEfg/gzoWCiu6grNmuyDjKCWa4i9RUTvztGFUQHKhty2 lG/ZHdCeGSSSG3ridV+0gyYBDcgWgCILEexEgRmGJ/wSgpKL+8mEtnXWmFQQ1Jl5mU8MHnhcuiA FAoHINTInk3L8UJ988jLgJD4BrjBBalHPsjhm8dxvBI6dAqfhx92yj9VWEuoLifTztBAwPpmvNm FXhV+B0U+fGAin6cRa/3+8/gcKJUjyQ2wYeKQmQ8hScgJ0q+WjaiLcyptzJwfXralLp+deRa8Qj W1aJKJd66GLAajtSiT31kKUpuosRLl/Ip3BgAJnGlac9tlxTdXWgiAeWgAsDek+2xIlPGZk3Ikv U1z+yXGTiY9wk6MWWyaF8KWmoWgs7oHCduON7OFS/gwF1HCuZWr1BE8koMRbryQoykTFePSYE= X-Received: by 2002:a05:6000:2288:b0:487:663:3082 with SMTP id ffacd0b85a97d-4870d26fac3mr2099936f8f.52.1789548833456; Wed, 16 Sep 2026 01:53:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 15/17] gitlab: update the @user id mapping file Date: Wed, 16 Sep 2026 09:53:38 +0100 Message-ID: <20260916085341.1692742-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548918895158500 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 --- .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:56 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=1789548967; cv=none; d=zohomail.com; s=zohoarc; b=YySoJgQCm/lFzo6kcmRilBai7f649SxhiNwsVAaXHjIsAL49rTrI4GZJlYEfL3JZXJjVow2aKTLDAi61xIJuAUgah8QuctfzNYMiMYpPOuKnCG9NE3+BPhOAjG8bEhne9i9h+IaeoRLoGMElQZGwLjhCWio8xEPaziZvuogp5o4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548967; 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=VPGyz8IGgtQSOV4ykrf2OgkNDGF+9z2Rnb4KIQWuWRlpc7XX+XnkJiMAeGK7iI99FML5AzCTWwZAUYGuMQmjPlyXtdvGEWIWOI9DkEYzwDmyTyWAN3lQdOAnhy028kFxhdLlld6LTa/PgbhCm8PEtsDGX+o70u41dOPx0y/G2V4= 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 1789548967205592.1761421713136; Wed, 16 Sep 2026 01:56:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lOx-0007sm-3c; Wed, 16 Sep 2026 04:53:59 -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 1x6lOv-0007qq-86 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:57 -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 1x6lOt-000526-Do for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:53:56 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912d391aso4704125e9.2 for ; Wed, 16 Sep 2026 01:53:55 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83d10940sm56452505e9.1.2026.09.16.01.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2D5BC61982; Wed, 16 Sep 2026 09:53:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548834; x=1790153634; 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=AUzmV9ebxXh1l0K2ayujBtx9mIPrHunjG7er+5Vph55bMHgic5z9N8GLdbKEDfY96O rldyp81FFSUPTToE5tN30rNnMAlTQrm4Y0EYUSYEbygXZBOnG8PvIkq1jWcB4bCZsmfN uQqN7izq3dLf0IRNxCfIKzuB12q8usPoTRGBIADIS7IoN7F9Vh1ANRyq9JuQsfg/FnmL wB0KiEdMRFn4KI0eGWYQwx6g3FKGq5AI4WZIXGmH+vtv6EK/ZRkskGf3jM73H2BKo95K hJfWxb78ZD1YXrc4AXwb1j9PvJ0eOhuKFQf2G+Q7LavJLPzI14TOWLSKDmaAhzJQalcJ pfiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548834; x=1790153634; 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=CeCkJ/k/ky7LKrZJ8AlMf5dqelfAZWAulQ5Z19qTzOM6jc1s/eXoHzB+EJHdilTKze 6491qrxTxLojRUwKP5s+cyGU4UFRBtO0hQqKR3JBqNd74bkhaztWExyouPd5OOk4khab nYAhNqUYRpxnrcBzfPQnikQ+aLSlLRmqrKu1CLm+pTu74R0LYrZ+y6Sw1TObYT2pmFoA 7+dfgedZe6axZugmubXJSVW1/wGru3KJP6Y5eO3lWAzSmPOkPN0PrJ29z/vhEaIz/q2k O3Sov39NKZ9I/cH/HD0Jko68mWNpjhKX6lH0iLv85e9AhkUZno7E2oJZK8in8pdmuyCg sMgw== X-Gm-Message-State: AFuF++m0XAPnk8/C7iBdkcfngC6yNjd0+r/Tj+cF2YNg2c2TzBniqzle xxYAa/WkVw4WTeFO5TW8318PzNnZLns5FtIUf+fCZF0ITE3l5EZI6Rh4V4CNn7ULtAg= X-Gm-Gg: AYBFou1ehakwqsrsUn01e53D6dS+LWu0G4tlF2MBw+q7Xghn75BrkH370p4LoepVxVe WDRu8EgtlQsSuFPakRLHqq+ZM5N0VZkRB1xzjGnvOdRthY3XsV4m9eEgeRIh4wbjoWJA1iQ8ks1 +U6ZUvg0alxuhSbN473gcMWMcpBA7OiI86OM+PV0l5sUWN52aIrxUkflwfKLT3Dvc6gUrvLQ8B1 4M8O+iM+USmz9bxHwa/Viw2C54Nqtay1Z+zbDjMxo9XMJySadq64/UEuwZ862kqeyPK/LKXxBWu LPOaWtJQVwvs/xjNEoya72lXYgAHMx680ykJTwFYvUTiIHPbRkgQdtc9wXMiFgLwNxqEg0uuljy qfWDw7OLGLWNLOCGKIhUgkFZtfiMs9vqfX+DRKsRBHYTFNT9GyLje6jn53oDIggI6aHu10kJuCS nt5Za3cCI59pUgrrUeGmb+oD2AOWDgX9Q18pEDkGM0WgBlKMXGwRwrLNBLNxh/TNEUF3cH6yM= X-Received: by 2002:a05:600c:6819:b0:49c:fc6c:be19 with SMTP id 5b1f17b1804b1-49eb7345eaamr18406305e9.31.1789548833953; Wed, 16 Sep 2026 01:53:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 16/17] scripts/make2mtest: add docker dependencies for check-tcg-% targets Date: Wed, 16 Sep 2026 09:53:39 +0100 Message-ID: <20260916085341.1692742-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789548968742158501 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 --- 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:56 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=1789548966; cv=none; d=zohomail.com; s=zohoarc; b=RyJGXRDTO3J6d83/O7mLsZ9vA4emzqJod//giB92MuP8o6e5g0UbDQUJ0+13BfGA2wssrywkDhS6L0yiQ7bbWVrLh7p7e39EIk6+nAaBaO1N6wHswqOrUWnj2CevNiu0YD1vFPCPY5stW9N3Ps9PEXy35x8IwuGZPwh0gnWtJ0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789548966; 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=wmW/Q26iQQbJTF6ctnQiMypy9sc56eqF6OAXKZ20AB0=; b=dfmDBhsCMO9JMKQ9R59S2Fqa7JrcnAIILWASPcdzym6XHBc/mQV3Ivn4Ay6OI0szLCkjrhAmJVIsQfBw6DkN/H5xWlLfl4IPrbBWyY7+8oiSSlbLyADMeaNt02Oea5FoC1xIm33izN/fGN5Ciliz7m0qhWs0E6BRzSxZM3eF8kE= 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 1789548966951458.29492551488033; Wed, 16 Sep 2026 01:56:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6lP8-000894-7l; Wed, 16 Sep 2026 04:54: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 1x6lP6-00086E-Mj for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54:08 -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 1x6lP5-000532-40 for qemu-devel@nongnu.org; Wed, 16 Sep 2026 04:54:08 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f6350faaso288715f8f.0 for ; Wed, 16 Sep 2026 01:53:56 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf344bfsm5273051f8f.27.2026.09.16.01.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 01:53:51 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 44D1C61996; Wed, 16 Sep 2026 09:53:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789548836; x=1790153636; 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=wmW/Q26iQQbJTF6ctnQiMypy9sc56eqF6OAXKZ20AB0=; b=Byl3JbAQFBpfpw9kkMjGtxKu0MyyxeDJ7MpRrMOgzYREd5orbDSBlY761fSCmNfovF gCCpNyXPHipTV7iVjx1E4/dCgSiXDkuNV0gibk+bM6LftALSfbiTwvt63cvlQpKMuchg xHLQ6/8ByCvZ0mUkjvpL0ByUgKbz7tuLUt2JO7g0VZTrMn5n0WLQExRbtTVv5QoVvdNE 5FF9/hpKeKkzbsItrjh9rq0LieQ7hkzmKWrDEVLy4/FqJqYnBg9ikncre9/9Vbf6yV7S CF7nYnYyE4g1Sjq1UOgPWZkFeLKSyU8mscZEEMl/H/EFzT+hkqjLodjAU8YxupvqLuj9 xIbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789548836; x=1790153636; 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=wmW/Q26iQQbJTF6ctnQiMypy9sc56eqF6OAXKZ20AB0=; b=iIjWDhVDgCsr/vDzV5tszzObDmsk9dMhBQgLIEU6TcXtNOrHpqH/a49IntoBB6uhVY HUsPdPSHGnTmIOcQF4SK/25um0WXNkjhbF+7RJKvu0TaXb2TiBdNEB4NlVjp3UQTNu7Z cVCsTzXwCSr/3h9pH56//1FR6llIOhH6ZfG4BtLegN9AtResuih/cYoyCp7aq2sxHJJP R1NNfgW3JNi39cwWLG+z3GBYOd2E1jDmpYtQZDWXa1Vh1tCdCZw1JaVBh0wzpmT7Ojrx X5jALELhODDnoBAvn7a9FqdDxk+UCZUIzSBSCJT4EmEInkWS+MIUR2VgIeyaIniNcQO9 OH5Q== X-Gm-Message-State: AFuF++nCg91EFqVqHGGQzsfnQLwWcn8seHn9Oaoq07/BSFKbu3rBEiQ9 TcBtKCxH0pn2u9qv/fmXyAn+tg5bmp5MVpKlTpsXnltb5TURnoRTbcbrRgXsVOkFpUM= X-Gm-Gg: AYBFou0mti4G6BkEfBQXH4wokt/FDdFb2cRuBpZpCvfRbsH4ymc4Y9lcQkpvHWk6Vke r93g16c3lAkc3jIZKD9TpJDootfv5wQR4i8rjKP4Y2NSzqk0wP6YUBHe499GOGkk5v3KqebiE+T VwmewCEZxUhh+AUrUImO4iHntbS7MzGRc8EMV5O6ImibRwlGKQFZL4/KLhNP2pFOPA0QYOu96F8 nNhCenujDCbdsedtjjNQ/AyKVM8qquJhWhRs+lrHXkbWQeUo1ypZ/x5EUlWAxWxHNPDbeiXul9t ubhgLX2RDSmKk/nsGQYnnJPnbydnTuiAuDTUwJ0Zo8renWES0E5qQUoXPQqf6MN8FC1DtydtXOk y+0wZ21esgZHOz1GRGLy/QKAKC1vg09/gXjIE7mzqtdexu01WBs8jPVVf/UmR/cTtYd45qIMIUb BrJddgvCjGGckWodBy9SPWHhbrH3NhQUT1rEus8lCM1vBWzM6c98RFbsjzjKXWqLNvpGPD2OQ= X-Received: by 2002:a05:6000:490d:b0:486:f404:e833 with SMTP id ffacd0b85a97d-4870d16d340mr1980516f8f.44.1789548835696; Wed, 16 Sep 2026 01:53:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Helge Deller , Peter Maydell , Thomas Huth , Richard Henderson , Brad Smith , qemu-arm@nongnu.org, Fabiano Rosas , Warner Losh , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Cornelia Huck , Paolo Bonzini , Brian Cain , Song Gao , Kyle Evans , Jiaxun Yang , Eric Farman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 17/17] tests/tcg: add console property to docker image custom target Date: Wed, 16 Sep 2026 09:53:40 +0100 Message-ID: <20260916085341.1692742-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260916085341.1692742-1-alex.bennee@linaro.org> References: <20260916085341.1692742-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: 1789548968697158500 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 --- tests/tcg/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 17974e4d15c..baa22e19336 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -227,6 +227,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