From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664212; cv=none; d=zohomail.com; s=zohoarc; b=f6qk3Yj7OJibt9yE0AAuofL5SOosWe03uKDK0u05rsf7zwVhlaQyOO0xTuW4GOICm/hCAFala9z9JEw+Puo7yk5fZVy8kW3BSXJHEKFtgm0mvttWOdbe/HPhIiRweT0ZbU0ZdBJGNnehU7b84BuYWKGw6WB804QXhRejNkIcqDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664212; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eHvSqsvgio2+lbBR4DA89ZipFbEWKlpqKzWmCMVhMKg=; b=W3LMJLFEm1NwPsja0zGwD1VVuDgECF0Q11IcaP0DnQD+0hYc2iMzioEqUwKXLdAkhK8qHNmVO1kaA68DZjPpBRbJFtzDDx+IKJQYrBF6f/zJSea1mwEj+CNQxf5nJ0vWmZ2YkWbGxdeDoJQ8/sZ9VeGLB+cfgmkA9XLN+rl3/CM= 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 1789664211996372.2231015087883; Thu, 17 Sep 2026 09:56:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPM-0007iE-4t; Thu, 17 Sep 2026 12:56:26 -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 1x7FP8-0007di-Bm for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:13 -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 1x7FP4-0000YX-Ur for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:10 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4834977ae75so657021f8f.3 for ; Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf27198sm17034163f8f.15.2026.09.17.09.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:03 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 40B685F91F; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664165; x=1790268965; 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=eHvSqsvgio2+lbBR4DA89ZipFbEWKlpqKzWmCMVhMKg=; b=URWp3z3SRje/p7DwzmnI0/Avuiog991rj+VMngIf1BDE/efkp7Nxesz8Osekrpcmw3 2KnVgoQ1EewU1cGt7IBO77O6FZ9FghhgL+7Pb03mKPtaFBX4qi7e716iqyU+P8D9PrkH nAwY1xLs8PjMj2W72hvzHHy9ROtL9H+bnUA47G0rM2FiP5fPbGGp2nlREPxCbO+1L21Q PuxQq+oNxe/bl/gGF18KPQkkvOXvQOn3S8PiGUk5e5o6upeXZWOL1GaM4/0UKodi0nKX ztyijweQJ+G0oxusEei4AyWy1ZPWy+H/dh0IxEqVD2HjJgf5JQ+OjiSFXNdTMLQQxXKP OxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664165; x=1790268965; 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=eHvSqsvgio2+lbBR4DA89ZipFbEWKlpqKzWmCMVhMKg=; b=FDO1/Ead7v8cl4Z8gGzVCImaQRP9S9MlLRUkxg72yhk723+oSHE8CLmphCj6j7S1DU cwU0aEgtBgYc4YeSOvW+q9AmU8+Uee88ndzC2PH2tSyN1hzzh0QZ++bGD4yq9FGUQuCg olPNymkkEBc9JjChjfxiIEYPvAo+gCWZGOEjPWmLoQWJzHmH5w4NUKNzPA45Dbh3jptm 7U1PCZuJLM3VsaMh0RdniBIBPtfYkh5tmz3OW+hyu7RdUa8pwSq3KxCPZNSK41Odj1n6 iWHj7YtxXBJIhcWfzIpfhE307W7wl9uUl1jzFHzDCd0+tTb0sbtXsJeFOAWwpwfnHy/d SjOQ== X-Gm-Message-State: AFuF++lAO1Xqo9eFiNch89VEH83Cc14k/9Hyhpr3/hgEKpm6IJq47X4N CR2KAvzJBcq38lW5i72SxqNA0mH1bACOhMRlebk8TCAviyGSP0JsrzOINps7wLv+890= X-Gm-Gg: AYBFou0Wy+oDcTdpGqSKTqAKe3SzdMHvgfxI+Dx4fkIVxp2140vxYwl57mafsRpdyIb wYlEss5mLLRFOXtOMhVYxTclQGru26AWcx8NhtoI9twBJYlf2naXqAheaw585F+zcHX25jXVDME 6PKky2DXD+NDrhgyItDlcHH/7GzZdIjF5PoN7y6b0G31FirgeMJ6M0icK0eWZBvDYJWyL3o/xCF oeMQATUDekiHP1f2v3fCvXY64MaNlvo8jDw4Tf59jH5e2OnFioLHOqWoW/6jT6wI7JGE+vxoA8u YFsGXYyqD7U/LERtMJOWdKGNudFZmenUtgDu1b0Ir4+Z6UFXS0NNWEEk+ro9dw7JKprvYcw7kT0 tnyHcnEi0H2UXD/mWm21KQ/iUZv1R7YGH9+Uu2VJFrAkBVDbA7Dq5smVPEmjGRH6mXWM8CLzmdP 6g8/QRHVbIxXpGRQ0Igy/pa+eBwtzCFmEGyBSD2S2AbhPcwW8ugoHrta02K9tZsJ4AXfSM3Wu0 X-Received: by 2002:a05:6000:2589:b0:487:24a:f3ba with SMTP id ffacd0b85a97d-4870d072037mr19920663f8f.26.1789664165357; Thu, 17 Sep 2026 09:56:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 01/17] Revert "configure: remove cross_cc and gdb detection logic" Date: Thu, 17 Sep 2026 17:55:45 +0100 Message-ID: <20260917165602.3405537-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664219034158500 We want to restore the logic to configure as it's also used by the firmware builds. This reverts commit 031f935567ab8abfa4e84682ecea08915ca9656d. Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier 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:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664212; cv=none; d=zohomail.com; s=zohoarc; b=E6j8rBFx/AU8HQ5PEyW2YY5ZZAoOV/FkEtBbzOarQ0BfFCJXXZ9XiNCSQFfPY/FIfwpdMUYddUWZ98O8TeOkt/0/GIiheeVgazPp3PRlIKSTmwPLqJYPH+LT9uVrF8acs664pADzZF4Gb4MngxvSPWDocu0hOrEHOiLudVq+Y5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664212; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Do9KFjcXAIF5eGyCbBUaupWbA9FLoFPLY+nZFKwC9x4=; b=IByhlZ2ldiTFIDTJRWA4dDDLR9+h87onYmKe/1RVJNcKgCSLRW72tvXUSI01E44STYg05CVbo8gCuvuWOGCTdu3ii6sbEqoWnS3pCh9tLIzF6A+Sfd5hdYDw3ZnHtAMHklF9ZFeIZ/3cT5o9+inNMPkZXj/Jw03o1efXbdhn9i4= 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 1789664212057926.3851453045726; Thu, 17 Sep 2026 09:56:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPJ-0007hW-OV; Thu, 17 Sep 2026 12:56:22 -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 1x7FP8-0007dg-AC for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:13 -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 1x7FP6-0000Yl-82 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:10 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e6b885ef8so6506025e9.1 for ; Thu, 17 Sep 2026 09:56:07 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf37e69sm16783733f8f.29.2026.09.17.09.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:03 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 59BB75FA11; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664167; x=1790268967; 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=Do9KFjcXAIF5eGyCbBUaupWbA9FLoFPLY+nZFKwC9x4=; b=zx4Qly+qoSfsGafyl3m/uyV+9MFPnudd3JJAZBT0mHCTfpPs69AiMiT9azkNZx9mZ9 SN3CEZj4tME93knH4wZ4cHH1xJpBwBswTqiQ8hiWW5i389+5eZnj59ITiKWPmhfwTfeJ ZMA/kr7zwvm6mSmK58rkt6LNUd5Wh2BgX8xZA5cen9GAYRVMB3YY4UDNQfiFYmdpMMBG 18eVfK0N3sv2ZO17xIqW39z9//sUGGtDF7RKDNIOA+oUXOfEbtaRgIE3TDmsyo64dNq8 ePn1JkoVXkEsJy/4MVmJSwChDfxEX/Szyuz+WOc9Yc5O+eNnoeOoXrVmFuUczx/bjTcu dGlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664167; x=1790268967; 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=Do9KFjcXAIF5eGyCbBUaupWbA9FLoFPLY+nZFKwC9x4=; b=RAcFSCCd01pqF5v+XMLCQIgSFg37zwPB+IgVMX3rvltsLx7xGv1Yx+JEV9hdD+IpLH ILviW+1UC6FHd0bIk2VRZXVlQAMiuxIHN+CS3Ob/ycuwIoAEHIy+Dyf6uyeLqwlUeksv UR3VnCOjipVAtQhfEgVqYDKtyiPmT/pIuJBKpYsVjh8hMFf0G9xmilGGtO6oH9U6Zcdo ewpakLpSpsmjcNcWHMUZxjKJwj3kQhbu7rtTxRSFsT8qhCvERtXG2HAkmCd55DzlTL9S 535U47z/EVKPpyResXyuL3djtQekeRmDQD5wkXntQscDvDNwlKztE/s8tz+0vA3yAJ38 nxag== X-Gm-Message-State: AFuF++mvTp7bC4ZEa1+7Zg7h9kEGWxS/W801CufhPaVK6L8A5+9jy+Hb MmdK/jCOHIBbpFupqfkZ9OipTZ+TOrADzeO5B3AYCcsfK+Z22ifcwjILzZxfkNDIvrY= X-Gm-Gg: AYBFou1uvOm6+/2Q5RkqR5Aw7+2lvWDf6RZWeTMmmKRtYtSQLhEiTynqObpPUf69Nz3 c7Pi3/q/XMt5+uV0rw+zJFJpaV8Ih4LPaYRMfrnfVkmXDSelwZ9P9QyYIkpaK9fPRCtz96tjyqx RMQtl/waeBCmE7h9TQRsF6ARuPICf6ISmC4bn8ZmppVs9ARmWaKr5dHj6sFPO6uYezCx2mTD3fT arroOZBfjs+1qqJPb3OEBWkhK4iFuUllrDRw1vGq/9333jdJJzm2szej6T6FJZx9u2111/9/ssw NP4vMxjjuJ0xYWiiJV9/VrEsGavfB2/VwE3LlzLsywC/DhQ4MfCNGlhUW6a4/wNk2GS/Fza2psK X1AEIDkOaxbaKETzkY1bAbZunVKibXXdgO47zrCx+2benup9oo3HMofzYVKNKFbs+PAu4ic8EDs BCy7OVQfT1h6w/mB0R4HyD9re/OQA6o2s5o2cKZN023ugfQjWyuGuVOJx2OstWTFww/XXtY6k= X-Received: by 2002:a05:600c:314a:b0:49e:799e:c1c3 with SMTP id 5b1f17b1804b1-49eb73263c6mr92839545e9.17.1789664166654; Thu, 17 Sep 2026 09:56:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans , Jared Rossi Subject: [PATCH v5 02/17] configure: ensure it also honours container configuration Date: Thu, 17 Sep 2026 17:55:46 +0100 Message-ID: <20260917165602.3405537-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664214591158500 This partially reverts the bits of 522b299ca43 (tests/tcg/meson.build: implement ./configure containers options) so the configure script can also honour the container config while keeping the plumbing to control containers within meson. Tested-by: Richard Henderson Tested-by: Eric Farman Reviewed-by: Pierrick Bouvier Suggested-by: Paolo Bonzini [AJB: untangle changes since] Signed-off-by: Alex Benn=C3=A9e Tested-by: Jared Rossi --- v5 - reword and rename commit (we haven't actually reverted much) - rebase conflict - drop stray options - move registry bits v4 - tweak revert to keep disable reported - update commit msg --- configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1973f023b1e..8f8fec4efc8 100755 --- a/configure +++ b/configure @@ -246,6 +246,7 @@ ninja=3D"" python=3D download=3D"enabled" skip_meson=3Dno +use_containers=3D"yes" rust=3D"disabled" rust_target_triple=3D"" =20 @@ -722,11 +723,14 @@ for opt do ;; --disable-plugins) plugins=3D"no" ;; - --enable-containers) # enabled by default + --enable-containers) use_containers=3D"yes" + meson_option_add -Dcontainers=3Dtrue ;; - --disable-containers) meson_option_add -Dcontainers=3Dfalse + --disable-containers) use_containers=3D"no" + meson_option_add -Dcontainers=3Dfalse ;; - --container-command=3D*) meson_option_add -Dcontainer_command=3D"$optarg" + --container-command=3D*) container_command=3D"$optarg" + meson_option_add -Dcontainer_command=3D"$optarg" ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; @@ -1713,6 +1717,9 @@ echo all: >> $config_host_mak =20 echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak +if test "$container_command" !=3D ""; then + echo "CONTAINER_COMMAND=3D$container_command" >> $config_host_mak +fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "MKVENV_ENSUREGROUP=3D$mkvenv ensuregroup $mkvenv_online_flag" >> $co= nfig_host_mak --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664429; cv=none; d=zohomail.com; s=zohoarc; b=VTe4XXJPlYX2bJ8113qX6mNNe/W0QXhTu1T79cJpMD9dtr/LvMIjQH2nUmnT480jyipsx98i/5XWc+JnPnCE82QLz5Amj65wdpYuvuVaTB3i9I10hGDfXqCDoCxeISLJvKTnsyr1Yda/JtRp608VTu61MGEapXekx5neQZjImVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664429; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JXpVphXRIh7g4WkdtW+BhWHeeKOUjgRrLGK1rEdpKSw=; b=blwL5DqAoBJiB68wDV1QPXZDcAmFJL6tnnndrbGe2s1P7UykTeWuc/cFVcISIllP6Zy9PCogajVpCoDisrr4nIOQ5c1g05QkPaftzFZsg5cCWRRBP1lauCAcngP6Kffo63/V2OLibiJF46pcze+P1JuF/IaXIFx/9CkNCexYP9I= 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 1789664429391660.3248607126484; Thu, 17 Sep 2026 10:00:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQ4-00082D-Cc; Thu, 17 Sep 2026 12:57: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 1x7FPI-0007go-H2 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:21 -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 1x7FPF-0000gA-OS for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:20 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912e2406so5829955e9.1 for ; Thu, 17 Sep 2026 09:56:17 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc4855b92sm257955e9.3.2026.09.17.09.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7077F5FA18; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664176; x=1790268976; 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=JXpVphXRIh7g4WkdtW+BhWHeeKOUjgRrLGK1rEdpKSw=; b=hlEGm8fAtIAA4p6oF/yEGodk77r51PFj3Ja7JxlxfSwoyUtHOByySEBLOv7y8wlIT+ 5xLMROiGmxW8KBWYc19LiT1e02/tvz3HPD0qgN8hxsExM91xW6i72tGx9lCPiGNAs5Hf zr0ZpVgDiWfJlorfT4bJpiexgYqqxvd89MW+cqL3/m7aUcpLZYGGp/LQLiZB7kPDTqFG jWtMcW0Or5zJhPo/QsED+qOtKm1A1n8Av5Ici0SDTjUbCYjgnp2jQ1cMO6v/+RpjJ5za IzP7rnqjSZEU/xVjJf7CY6HEiWx+rZY0+/LCd7NxLaD5ABl7z/5W8q5kjLgps1IX/q9F 8wmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664176; x=1790268976; 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=JXpVphXRIh7g4WkdtW+BhWHeeKOUjgRrLGK1rEdpKSw=; b=seIOorz+6O3VuWXhk3L7t9kw9ijau9Tr2zS1l2tnq2qDXNTqnPe0b6t0J20HfZT9Ov +TAbe4E0F8Kc3oOd69YsYLTRJP9SoEuKXSqNjRYl6VZ43YxJ91Y+J7ZRKAJMxFXVUfXm SiofqJ5zGV1dC0X4BEptd8rCVPayw/jj4hwdhgoEpTIFCJKZ2fuCFFZyubXelvgAlrfP R6m4Bpf98W6AqosBz8tZRZatfDmJNLhYBcXJZ5PuWnsZ6dUkgvi7yyWAJOyXV1jT3B9a UCPl9VZg0QXk+XyC+ntlRh9gj+mQN6QWuplpqG9+8nZT2UYPzORqJ9fZG0m0HBgFMQRw 5idA== X-Gm-Message-State: AFuF++lTO46oqDEJTtfOIfFag4pZFBghykNGi0kSB9fjzPdAUfSs7+6p APXV1FcpoRXHKvcgzQAnvDL/vcurYx1JgJCdpLbsKIXQ6Il1vLkOA5BJnrf5UkeV0jI= X-Gm-Gg: AYBFou1pONMfkcsrnDlA2rylDIpDTt/18gGV8CHkNGwy9QG50Vq7DumMImRSSH2rtoq omgGMY1+xcsZOxKbTcqZnHoLFkso5lUOcRptomQaszyxjvt7Rw3x8FxZ4REp6jG+rOpToJYv/P2 ZEXIo4ZhujufCI0vYS9zh4+qA2zt6exHIYDQQMmnJpI6dpA6Uzuo/IxwwY7EZJPlzQN6QnOiPaj M3G15SK++AmNLcwsONduelIKQ1t/AjFkx+WltKRVU05cMQxI0TqoOl6KltzfFsbcveJPc/J+Ei2 +Gh0Jqw543tYhzhUurF4ftINv+dphtwqGBtgdlHwKI+NAHJrQ3BbuNFDbnYxZ0H2/z21AHRrtQs I8n2wllYH1szKJSKdmXoRqI9kdjYVutina5AYCcMtgZYued4pSHjSWoL6xtbQtVYb48HWIJYfRY QwbvQa/ml03hWKmc2oz0d1CdKHTd6vJvk/hjMqqpYMy0E5cAeOwDHJiiFsH4ElWLcNx+hjEoo= X-Received: by 2002:a05:600c:1554:b0:49f:c1fd:60e1 with SMTP id 5b1f17b1804b1-49fc1fd60e5mr26624315e9.15.1789664175949; Thu, 17 Sep 2026 09:56:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 03/17] configure: correctly honour --disable-containers Date: Thu, 17 Sep 2026 17:55:47 +0100 Message-ID: <20260917165602.3405537-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789664431737158500 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 8f8fec4efc8..04e312a111a 100755 --- a/configure +++ b/configure @@ -1397,6 +1397,7 @@ probe_target_compiler() { esac =20 for host in $container_hosts; do + test "$use_containers" =3D "yes" || continue test "$container_command" !=3D "" || continue test "$host" =3D "$cpu" || continue case $target_arch in --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664230; cv=none; d=zohomail.com; s=zohoarc; b=ZBrM4QySxnQdQRWW6fOT+XVEH/xNp/yZJXqz2Tx7+PJ4dGWOo9gNWVsD5y72YXCNYvq/h9A9MfiCQKtdQ1EDiIJLoANYR4CAReoG8Qooexwlj8zxsXc0zlwuLTwoJyDXmfpelOCk4xOsYmHYVinOGoStM0pyQQGO9T0erTBwi6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664230; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uudWEXLbswvjJKhKbS+KuHnJ60QOojX0k9GGTZpa5Ws=; b=QCKMyW/tsoHkGm4wFr2MDJePmXJu3gH+pBDXuBbslW3mu5qVJJ8Qf0SzC1A6CX5r4sSmAaEfUlltbDAKSZSIKYWllsk/NKZpwzP3EuxQFmmBaTURPYjs5fKOezBO8w6U77bO9S/alugbX4Qb8wYBsOxyt/tBswQk2X3ionuxEQc= 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 1789664230717517.7020510534187; Thu, 17 Sep 2026 09:57:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPq-0007t4-DN; Thu, 17 Sep 2026 12:56:54 -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 1x7FPI-0007gn-DP for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:20 -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 1x7FPE-0000eG-1p for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:20 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso8351785e9.2 for ; Thu, 17 Sep 2026 09:56:15 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf418dcsm17001622f8f.35.2026.09.17.09.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 946D55FA62; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664174; x=1790268974; 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=uudWEXLbswvjJKhKbS+KuHnJ60QOojX0k9GGTZpa5Ws=; b=PPZ58xf+A+gXoRhur11N5Zf6p5OwtImrCEiVXR/cy9CCHgwWsIaYDzof6Jz+Aw+VzI jXetZmiVSpsBkFzX4x1W/sTRrWVwK29DZuCf5i5/djygwmWYN6oSVZ6R799C1p0z5/8l XmPh6ONTsXWm4QGDI2XE+NsispwZIO2j8s+2Ea0HoHSDp9ysPzNNWv1bVFZ+KPUEctg4 VNlj6ExZtuZi/jBBU16Mss3+Px9T7ws6AXAybK554qHdojd/GgTSjrq8dOrb+f99s8kA A7tEqbrTxmeJ2LsE0AuopRUYkUXco6QHEV3Su4pevppjPHNUqP0SKMMfwRg59KQ8hcIT paHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664174; x=1790268974; 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=uudWEXLbswvjJKhKbS+KuHnJ60QOojX0k9GGTZpa5Ws=; b=EdzUOMVMiGOORA5h9Te5fNW8blM8N2hxs6Xe9qkFZuHjsYE7aOaaGD51GTo91RYk9f CPp4QyKVFE3NwrNzKuUBK/esW7D8tOjhQ1oMu5y36fUsmoHnIe67GElIxwIyi3KZEcdY miSe/dDUOvLsgdqwI4GkkJR1M9IqngM0qhMR/GsVkOasNsVm8HVJ5RFNAYNvzw7aahAC n4nZmRsuoSrio+KxVzDteBN8DI+7ZxRdAZ/hJC19i8Al70GwmlBB0D/CsOLIEMj20Ovi i9vMhAfpX+k6Bj/FajJfN7xQ0/TKkbwFU9yQcT89CO8x6p1tG5ik4ePwzzXHoM1tCAFY 4esA== X-Gm-Message-State: AFuF++miOhozPP/7Aiku+qwWLabmqBwf6uKjN4u78xDGEQkD8DYt8mts zJXGO0+5EFK7GjzhJOXOmGITmjT78SLXuxOJy/t6jBanPB1vstt1fSAcgAgeRDV3fwg= X-Gm-Gg: AYBFou2NsKD92ns77RM7Ap3loHqZguHKdbe1N8ful91DxvhZnzE4VV+9BHf9tJyzbYd OJUMqgXn6APP2fogZ4UaguiyyjA0oKHfGCa1YlMTg36qcxCj50j/+kifwatu8B2dH9fYI93oQ5a fVzKZdYr24VuJpvPxKLGqd+1BuFRcmc64nUmM+okQlElO2X51vLwB4qqgn39x1RCZKqrnTF7wbo EtKHx65Qig0XIh/X6k56sZG0FGtoUjsuYoznezFniCPqxR9SOcpHvHEjSQtQSD3Kxl/jG/VNvKx UXH3SHXTDNRhBkzntLIJ7+qvpgYCmaJxb/MwjLJD+Dwyw0ZRTSgrKpZzEiEc/G5gsDL8nq64Bjw Mp+8H7c7b92TQf77UouRT9orGeeYAhDgKIsplR3CnsqR98R+MjEC9QvHLpJwtUeeVTCtkgqqvFV 5bwPEkR2vXl5AbIMpgKM+r0SIorauQhS99aW2s+uDE7l5ViRRyt0W0IgsPevcvQroC1SP7xEc= X-Received: by 2002:a05:600c:630a:b0:49c:ffde:45ff with SMTP id 5b1f17b1804b1-49eb7325340mr93241475e9.17.1789664174582; Thu, 17 Sep 2026 09:56:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 04/17] configure: re-purpose the tcg test compiler configs for vdso building Date: Thu, 17 Sep 2026 17:55:48 +0100 Message-ID: <20260917165602.3405537-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664233048158500 All the tcg tests are in meson now so there is no reason to put the config-target.mak files in those directories. We also don't need the GDB feature tests or to emit prerequsistes. The vdso re-build blob does use the compiler definitions though so we can emit the details for that and tweak the vdso makefiles to point at the right place. Note some of the vdso makefiles build both 32 and 64 bit versions from the same compiler. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson 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 04e312a111a..667fc7ca19b 100755 --- a/configure +++ b/configure @@ -1732,65 +1732,48 @@ if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi =20 -tcg_tests_with_compilers=3D +# Export the compiler details needed for rebuilding the vdso blobs for target in $target_list; do - arch=3D${target%%-*} =20 + # Skip anything that is not a linux-user target case $target in + *-linux-user) + ;; + *) + continue + ;; + esac + + arch=3D${target%%-*} + + case $arch in xtensa*-linux-user) - # the toolchain is not complete with headers, only build system tests + # the toolchain can only build system tests due to missing headers + continue + ;; + aarch64_be-linux-user) + # there is no BE user space continue ;; - *-softmmu) - test -f "$source_path/tests/tcg/$arch/Makefile.softmmu-target" || co= ntinue - qemu=3D"qemu-system-$arch" + aarch64|arm|hppa|i386|loongarch64|ppc64|riscv64|s390x|sh4|x86_64) + # arches which need a vdso, some 64 bit arches build both ;; - *-linux-user|*-bsd-user) - qemu=3D"qemu-$arch" + *) + continue ;; esac =20 - if probe_target_compiler $target || test -n "$container_image"; then - test -n "$container_image" && build_static=3Dy - mkdir -p "tests/tcg/$target" - config_target_mak=3Dtests/tcg/$target/config-target.mak - ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/M= akefile" + # note container_image is set by a successful call to probe_target_compi= ler + if probe_target_compiler "$target" || test -n "$container_image"; then + mkdir -p "linux-user/$arch" + config_target_mak=3Dlinux-user/$arch/config-target.mak echo "# Automatically generated by configure - do not modify" > "$co= nfig_target_mak" echo "TARGET_NAME=3D$arch" >> "$config_target_mak" echo "TARGET=3D$target" >> "$config_target_mak" - write_target_makefile "build-tcg-tests-$target" >> "$config_target_m= ak" - echo "BUILD_STATIC=3D$build_static" >> "$config_target_mak" - echo "QEMU=3D$PWD/$qemu" >> "$config_target_mak" - - # will GDB work with these binaries? - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches"; then - echo "GDB=3D$gdb_bin" >> $config_target_mak - fi - - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches" && version_ge $gdb= _version 14.1; then - echo "GDB_HAS_SME_TILES=3Dy" >> $config_target_mak - else - echo "GDB_HAS_SME_TILES=3Dn" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 15.1; then - echo "GDB_HAS_MTE=3Dy" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 16.0; then - # GDB has to support MTE in baremetal to allow debugging MTE in = QEMU system mode - echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=3Dy" >> $config_target_mak - fi - - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs - tcg_tests_with_compilers=3D"$tcg_tests_with_compilers $target" + write_target_makefile "update-linux-vdso" >> "$config_target_mak" fi done =20 -if test "$tcg" =3D "enabled"; then - echo "TCG_TESTS_WITH_COMPILERS=3D$tcg_tests_with_compilers" >> $config= _host_mak -fi - if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { diff --git a/linux-user/aarch64/Makefile.vdso b/linux-user/aarch64/Makefile= .vdso index c33a679c0f2..82ed2011087 100644 --- a/linux-user/aarch64/Makefile.vdso +++ b/linux-user/aarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/aarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/aarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/aarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/arm/Makefile.vdso b/linux-user/arm/Makefile.vdso index ede489e2363..16ae8d7aaae 100644 --- a/linux-user/arm/Makefile.vdso +++ b/linux-user/arm/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/arm-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/arm/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/arm VPATH +=3D $(SUBDIR) diff --git a/linux-user/hppa/Makefile.vdso b/linux-user/hppa/Makefile.vdso index f4537ae7169..78642c42661 100644 --- a/linux-user/hppa/Makefile.vdso +++ b/linux-user/hppa/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/hppa-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/hppa/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/hppa VPATH +=3D $(SUBDIR) diff --git a/linux-user/i386/Makefile.vdso b/linux-user/i386/Makefile.vdso index 95bc616f6d6..ca2e37fa6b6 100644 --- a/linux-user/i386/Makefile.vdso +++ b/linux-user/i386/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/i386-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/i386/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/i386 VPATH +=3D $(SUBDIR) diff --git a/linux-user/loongarch64/Makefile.vdso b/linux-user/loongarch64/= Makefile.vdso index 1d760b1e47e..ceb61101209 100644 --- a/linux-user/loongarch64/Makefile.vdso +++ b/linux-user/loongarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/loongarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/loongarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/loongarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/ppc/Makefile.vdso b/linux-user/ppc/Makefile.vdso index e2b8facbb50..6b9be843817 100644 --- a/linux-user/ppc/Makefile.vdso +++ b/linux-user/ppc/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/ppc64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/ppc64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/ppc VPATH +=3D $(SUBDIR) diff --git a/linux-user/riscv/Makefile.vdso b/linux-user/riscv/Makefile.vdso index 2c257dbfda5..2eefdb70cf9 100644 --- a/linux-user/riscv/Makefile.vdso +++ b/linux-user/riscv/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/riscv64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/riscv64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/riscv VPATH +=3D $(SUBDIR) diff --git a/linux-user/s390x/Makefile.vdso b/linux-user/s390x/Makefile.vdso index e82bf9e29ff..51f7c50a2de 100644 --- a/linux-user/s390x/Makefile.vdso +++ b/linux-user/s390x/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/s390x-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/s390x/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/s390x VPATH +=3D $(SUBDIR) diff --git a/linux-user/sh4/Makefile.vdso b/linux-user/sh4/Makefile.vdso index 272c5d262de..ed2cc11b825 100644 --- a/linux-user/sh4/Makefile.vdso +++ b/linux-user/sh4/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/sh4-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/sh4/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/sh4 VPATH +=3D $(SUBDIR) diff --git a/linux-user/x86_64/Makefile.vdso b/linux-user/x86_64/Makefile.v= dso index 26552b66dba..56fe87af72b 100644 --- a/linux-user/x86_64/Makefile.vdso +++ b/linux-user/x86_64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/x86_64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/x86_64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/x86_64 VPATH +=3D $(SUBDIR) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664372; cv=none; d=zohomail.com; s=zohoarc; b=GBYZ7Pgi3YkOq5RVRoiiESnZjNiVem5nI+gjOufN6Rhd1pZz+FQYaSqCJjs3r6Ic7re2n+2/PtMGlswCn3ndAk5/IT+TJ656vdczkX8gnIcP01IsmDTGGNLEXBP9+lJqnAxTcLNY0Zg6pv9j5BiqpUoYSQlGi0gD8f3VB47cbdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664372; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oPOWxHS0d1jT7jykpKpVrwVuMvWtlcCbSwn8vdkbyyI=; b=PQ6fkbblaPzgUaDds3qlMmBWjQqDcZquoXlw0rfB+Wn2Hjyszq+/JXw64dg4gGKSaS/ZsV/utvC2mslVwXpO+zUS1ElYOIYwaxECb1AiBvnA/x3MmeevbHSkIn+6jB/zleLsN00dYeNBthVxrEh9SNZyK7lAxelhE9ed1i53x34= 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 1789664372088394.0740783822199; Thu, 17 Sep 2026 09:59:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPr-0007uY-8B; Thu, 17 Sep 2026 12:56:55 -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 1x7FPA-0007dt-Kz for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:13 -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 1x7FP8-0000ZU-Nt for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:12 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49cd38e0f79so6574305e9.3 for ; Thu, 17 Sep 2026 09:56:10 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd22dbf2sm82495085e9.10.2026.09.17.09.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AF6845FA6C; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664169; x=1790268969; 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=oPOWxHS0d1jT7jykpKpVrwVuMvWtlcCbSwn8vdkbyyI=; b=vRWVRomMvsD8Pjy/CmcmhvAXlQC0M3G4V52toN1fNlDb2CYtKdyLzHdUZW/SMfYlGw gKatg+MSAGP2UPoKowMx54drTALjRiJ79khF21FpMOc6JTD69ZQ9yL5p0M7YVHIChWx8 PEVdpLRXmEx/t0UVmJMO+maSZcPYPjHSAg5XR7CKMeCvUTEfu0CfYoPWTavZkGtOnnwH NTIINSYuiaYs5RJLyPdJrrDbze57a6QVOC71NFQ9jgqdrPHrIqHhjq8yFTJqJLNnii11 xWSVF2VtJRFuvAMv3K2Bwy3e+4E91yuPP26VnV7aUUAsJigY4gRXUDSjqR/WAVrXDBfg NMHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664169; x=1790268969; 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=oPOWxHS0d1jT7jykpKpVrwVuMvWtlcCbSwn8vdkbyyI=; b=Kiy79V0tLJk9F40GfF+XehQ71ExHzxwKWOU/FRapzfPWyzUQkzXUPtnUMApa9kWwzO M1iq7oXu+Ex/KswmpbXYsAooP2le30c1EjBotdMPVUTjfwSfPwS+awQG0EG77UNjEcvQ PpIl6B+ivrgvny5FfgFoxfcK028SCSo+P5BHpfu7CDOMXjcOUi9SWoCGRxnURNWIVVOD us1KwZw8xV076F9AaqImrpEg9YAA5dckkENTtplHBJm85SWe9GvK5su/uk5Ph3gUZG/i hh+jYICkgWBAFue9GmTos2pJdwAd4bRgBtY5gIMevA+fkAfz1mHzNebhL+Y8wzpQ4imR 2WKA== X-Gm-Message-State: AFuF++lLH40rljcGXLYA/SllQiYwPaSMNYwN0Dgz/kadgzsmdQUX2ECp UlVJr01dLZ0Tg08jeef6GDGex6HY4RD6/u526P38B1h9t+P2+8gQLHtx3TPkwBQNUgE= X-Gm-Gg: AYBFou2ohhHLgycAiCV8qZtBYsy3gTGPk3zLIDptlpxNZMxjlgA9KwinMXOwqtwKgUL qDN6s1p2D5+KDLrEj2r0uMxI6V929kfbO8nIawzGFM1817Fk8cp7fIpcR/c25Y6lwaru93FdN24 cy89jDEY/kDT4AnivAnOWlnMNrf0eLcHJGCXNjl6Jdgki60O6pjiteFPE+Ku2AQcXIjTS9xdQHP XgevjO7sC6fCACuIN1a3dpOWjhdn0sFQkiv++8HYWOzYPS2Gr9f0imeHXxysHOaoz1ZVJ7JteZC xdhBx/xJYZ7+99kqsf2j3Q+E7Q2yamlZtusct7y2Wm23g2HD9I46EHRFyr8WhTU6RUDFjkpb4lT oFqQQlYyFvIWCsfB/M+sO9Gz0itfPlnLUt1iV0OlAGQpscWEx0FrRyT2eyqDcAlPh7mMFj3dyZW YXEU1mXYgglY7siU7YeMe2rFPWGyndOWEw0cpIIdBBwFW/Lb/lf1+w8QUuXAru3TApvprdcjc= X-Received: by 2002:a05:600c:1da8:b0:49d:2555:1a6d with SMTP id 5b1f17b1804b1-49ec0549868mr185819935e9.16.1789664169311; Thu, 17 Sep 2026 09:56:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 05/17] tests/tcg/s390x: Provide the libc bits needed by the system tests Date: Thu, 17 Sep 2026 17:55:49 +0100 Message-ID: <20260917165602.3405537-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::11; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x11.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL=1.623 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789664373111158500 From: Ilya Leoshkevich The meson conversion dropped the SLOF libc include path that commit 3fa010d5317 ("tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests") had added, breaking the build on systems without a cross-libc, such as Fedora. Rather than reintroducing a dependency on the SLOF submodule, which no other tcg test has, declare the three functions that the reused pc-bios code actually needs: memcpy(), memset(), and printf(). Reported-by: Daniel P. Berrang=C3=A9 Reported-by: Alex Benn=C3=A9e Closes: https://patchew.org/QEMU/20260910100120.2076092-1-berrange@redhat.c= om/ Suggested-by: Pierrick Bouvier Fixes: cd81cf86834 ("tests/tcg/s390x: system tests") Signed-off-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Message-ID: <20260915110959.492195-1-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/s390x/libc/stdio.h | 11 +++++++++++ tests/tcg/s390x/libc/string.h | 12 ++++++++++++ tests/tcg/s390x/system/meson.build | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 tests/tcg/s390x/libc/stdio.h create mode 100644 tests/tcg/s390x/libc/string.h diff --git a/tests/tcg/s390x/libc/stdio.h b/tests/tcg/s390x/libc/stdio.h new file mode 100644 index 00000000000..c3e45995f65 --- /dev/null +++ b/tests/tcg/s390x/libc/stdio.h @@ -0,0 +1,11 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STDIO_H +#define QEMU_TESTS_S390X_STDIO_H + +#include + +#define printf ml_printf + +#endif diff --git a/tests/tcg/s390x/libc/string.h b/tests/tcg/s390x/libc/string.h new file mode 100644 index 00000000000..1cabeb90adf --- /dev/null +++ b/tests/tcg/s390x/libc/string.h @@ -0,0 +1,12 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_TESTS_S390X_STRING_H +#define QEMU_TESTS_S390X_STRING_H + +#include + +void *memcpy(void *dest, const void *src, size_t n); +void *memset(void *dest, int c, size_t size); + +#endif diff --git a/tests/tcg/s390x/system/meson.build b/tests/tcg/s390x/system/me= son.build index ca07f503058..1e360e70821 100644 --- a/tests/tcg/s390x/system/meson.build +++ b/tests/tcg/s390x/system/meson.build @@ -6,11 +6,13 @@ link_script =3D files('../softmmu.ld')[0] head64 =3D files('../head64.S')[0] console =3D files('../console.c')[0] ipl_inc =3D meson.project_source_root()/'include'/'hw'/'s390x'/'ipl' +libc_inc =3D meson.current_source_dir()/'..'/'libc' cflags =3D ['-nostdlib', '-ffreestanding', '-Wa,--noexecstack', '-I', minilib_dir, minilib_printf, '-I', ipl_inc, + '-I', libc_inc, '-march=3Dz13', head64, console] asmflags =3D ['-nostdlib', --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664258; cv=none; d=zohomail.com; s=zohoarc; b=gAyiTkdE9sQga3L3ZJZsIb0RxmHBcHGnMe+PvaLS8EXb48ruTuee8Svs+CYKznXB/wNjqfaQxZ/by1NeXStjbJLYMNpwjX9Kl4UghlF6sGn/B1jpIQuWF96UhbH24bqMTsPlP+pNeR2D8iOIvqYzSijQaszDfq5L7x0cLPZVFN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664258; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aL25Ot0fmXEuSCVXG7iCqZEZr1JVeqTGJ9SnFpXQUgA=; b=UTgxuw14OpeC77nyyuUNdIuUjNUwpd0KkP+ZqxOT5OM1U5aOUEhveuPzw4PG+cku7MPsk6PT+U3ZZcmPF3vDT40v90jTBzGZBoyzKwXYA5AZaAn/f/6uakGXg4nmnbDKSl4RYNWIYAMDYg2GIbH86RgElR+NKfDqtm3LuEN5ld8= 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 1789664258972932.5485610927324; Thu, 17 Sep 2026 09:57:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQ9-000868-4U; Thu, 17 Sep 2026 12:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FPH-0007gG-50 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:20 -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 1x7FPD-0000cs-1d for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:18 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccfd61ecaso10392725e9.3 for ; Thu, 17 Sep 2026 09:56:14 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd216028sm88178225e9.7.2026.09.17.09.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C6EF65FA8E; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664174; x=1790268974; 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=aL25Ot0fmXEuSCVXG7iCqZEZr1JVeqTGJ9SnFpXQUgA=; b=E0khSj21ifawzCNcbxrhh0ihq+c7mR5urWAG5X0SBDjYrF4mhZFLLucq6L+rRFtlRs uub9sRxdsqJQL3MVlWeHXRb7JEWOT2bDZQZVYi2XqE3Ph6P4QUnzcnmC3ePnkGLP5bPi X8PeHpxA/LKZQK2aIpgrbzj4B3Po0PyLJA5WIUg7pBWo6ubmbBd9cFH0oyDstrPM2DUb HPGWgA+AFxubrYbg6wnpnLQ/N/SynU6chhH+wbK+RAD5LTi6OTGsz4poatsznnt75YYq cP6LRWZwsKGhjr0H3647t8wWzSbjf4f2/V+cRk7FlRhFycTBYjVHxgo8YWo/7uGwKZcM MY2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664174; x=1790268974; 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=aL25Ot0fmXEuSCVXG7iCqZEZr1JVeqTGJ9SnFpXQUgA=; b=zZRdMpUgwsaQexHL97iyJC7vwySD1R5sQDk5A//oIogFKpzcLZi6wbHHTz+De3X5WN beSfT9z0TNytUinambVWNndmjw/rchJT2/LF/CzzeNmkJSlLdMktQCHa3GqUxo+Asyn7 4imb6EGNuwZhrXaFR/csxMdZkxhgXddzxUqqLq3Vhd7NZKyOnXQCXE6KF7ojMOvCN7Y8 mvUFNer3Y5fbSEqj3HeLucXP9PptXMtjVj+pQejWAIKpE3RyVHGKWTs0Lwg1LTiPFRq9 MD9JFbZtKpO05C+LCHva7cHjC9/8Saj7WjLZ1LCU2q2YE6EP4RyVAejofhJZ/DcgoCoF w8oA== X-Gm-Message-State: AFuF++ne1JxjQJCPl7Du8QgIagx9lcdtVJ4oL9lg/JoPxq8GLAv64Af1 hX/V400g02Logr2b6lsXiywo5hkFmaM5wCaDxfC451qlUCVyHYcWK66UFb9EBIPUWwE= X-Gm-Gg: AYBFou2raRP5S/09Yr6b1dhn7NUQ2MDbeui2kXxvZ/e+/qqzBVCeVUtskrTwLzLdUvG ehQGxe3hw9KtunWuP9rCW30gW5nFL5P92+oAyTNeB0lzyvVa6EVM61cySgSbzrkQOG3oIJbCnqP 0NZMuWQCXMLAe9h0BwcoWmsnmLhudhhDL26ENQKgCBu+s5BcWPbQ65gmTdwg9a5laptEWBI1aZp hvCPJN0ep93b5b63pYr5J7qlXcOUiXHHvHePyFFHZSuit9T6mj9kLqsin7BiCBEiDQvMEiJ4gmZ zN62ofq6SvjFoAsV1S8p3jzEYazEw+XeUHsXTvULX3vgbcp1W5Pq8gtRgiNvEhxL3v0hOANNZAq 9pKDpM6U5zxKbPSfJtEPUkZ9PCjk9lEnRbXNHS3AE6LLOB4UVU1SyY86QnFUdG1bZbGpAWpehRV fU+PbtfCHXAxByLcVECmxZn2cFOfyemnGLjXpbJvc8Dw4qnTVSwg8NJghpRqEuCYAbRTBGdaU= X-Received: by 2002:a05:600c:1d29:b0:499:9240:9a1c with SMTP id 5b1f17b1804b1-49eb72fc10fmr96022345e9.15.1789664173673; Thu, 17 Sep 2026 09:56:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 06/17] tests/tcg: prefix meson built docker tags with qemu/ Date: Thu, 17 Sep 2026 17:55:50 +0100 Message-ID: <20260917165602.3405537-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789664260826158501 With the meson changes we now build the images directly by calling docker.py. However the Makefile.include builds prefix all the images with qemu/: # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ DOCKER_BUILDKIT=3D1 $(CONTAINER_COMMAND) build \ $(if $(DOCKER_V),,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REG= ISTRY)/qemu/$*)) \ --build-arg BUILDKIT_INLINE_CACHE=3D1 \ $(if $(NOUSER),, \ --build-arg USER=3D$(USER) \ --build-arg UID=3D$(UID)) \ -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\ "BUILD", $*) So to ensure we don't end up building every container twice make sure the naming conventions line up. Reviewed-by: Richard Henderson Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier 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 d41a228fb3d..0604c4b90b9 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,7 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', cc_dockerf= ile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) @@ -270,7 +270,7 @@ foreach target, plan: tcg_tests here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '-w', here, '-v', mount, - cc_dockerfile, plan['cc']] + 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif endif @@ -279,7 +279,7 @@ foreach target, plan: tcg_tests if has_cc summary_cc =3D plan['cc'] if not cc_from_system - summary_cc +=3D ' (from \'' + plan['cc_dockerfile'] + '\' container)' + summary_cc +=3D ' (from \'qemu/' + plan['cc_dockerfile'] + '\' conta= iner)' endif endif tcg_tests_summary +=3D {'cc for ' + target: summary_cc} --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664303; cv=none; d=zohomail.com; s=zohoarc; b=nm8ZkKOmA2NGQGeqcwPVnyXhc3senJkgXL+GYe/zcL1j+jSar+0jQ9pCNQlJrpjtOrsRQ4f6EGN2ytmA1AWVUuLohbJZPmxkMgzjJeWUCbZo1f9rAwNzaKGg6Hd55i9DR7cgnAKUjMAKU677BAe6A2KgC8l6GLdSaOsj73fyxAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664303; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Za3IBRxsCVyA6CkYVC7ysWM1r0DTtcSs0KC0+G3mThQ=; b=fVqX2FQpW8nv/3HzrB0c+D7NQAX5EovKPMNNVz1GhPDmfJPZHRFz3x2vXHoOF2HBzfB3TM5OVWmcLbD0+DGgK3ovAXZW1tbHlx5xVLfYCUtySCvQCiUg95wCh/chetMq8D+dyvI62D74F6ujfrMkkVlTgCPgJPLtTffmx8ERaJg= 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 1789664303976743.6971672075673; Thu, 17 Sep 2026 09:58:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPw-0007zQ-7o; Thu, 17 Sep 2026 12:57: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 1x7FPB-0007e5-9S for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:14 -0400 Received: from mail-wm2-x10.google.com ([2a00:1450:4864:31::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7FP9-0000a1-HK for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:13 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b91369d18so8366385e9.0 for ; Thu, 17 Sep 2026 09:56:11 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd24774esm142172045e9.10.2026.09.17.09.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DF4775FBDB; Thu, 17 Sep 2026 17:56:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664170; x=1790268970; 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=Za3IBRxsCVyA6CkYVC7ysWM1r0DTtcSs0KC0+G3mThQ=; b=CJxntfZrOejS/ZASLH2RrucrrhXcA2oFkbCuQgWh/YlQH8zE002/AGUJUOMswGr7Dr D65xfIsfAvgDVZBVT7I3z3/v065wQoTMpboZzAmbsM7f5h/JFDxKHpEwIMLwFurdTsx4 rocO5I46K9lpZs8FQKPKlzStDWzHxWvSuKhLgqQixDtT4TCo8IsALlElRvQJSUh7wjvm jpdLct/TzSTF2Z38SCrW3iQMqapm2P62BJaiY0Pmeo8xjNQ6o2kAXHjYeO5lf2wKAl7F eLesPlcL2W6Ex0QajTYR1wK1jKB1Owuyzd2SSotFqxlDIWsuVY/aFrN+f+u/89zIEwwj 4gtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664170; x=1790268970; 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=Za3IBRxsCVyA6CkYVC7ysWM1r0DTtcSs0KC0+G3mThQ=; b=K8z03ricIXK036pIDJ5aTkpW/I02zOV49eIuF4//t7HNnyEntulcwhHK+vi9ua8FyQ P7NAtg8PzwrWitf3tmXg2C/vSTerwmyHlSvEPiPUZL3n1r48YQ2q1JpPfgQh/5GyfH5g Y38kvFk+gtb+Vey7bODcbxJOxTdStWsouqZ7TZZ1qtAbGsAab6GRGjXVGDaXJkqg4dy+ 49q2hVTpf23Wa5ZgUbt2h35m+ivqN0JnlmnEckR8sHCsUDha+B5EDvkqiS2wQeQBgcq3 fcpRjVIiGf2xM5s2TR+FzMEJsJfwdKUw91arsCYXwff8V274V/rV/Rt/yO+x84ZQx8mN mq4g== X-Gm-Message-State: AFuF++mymFqNCTtgZ4/6aBaGPVk+PRyaV/dLVXX73VCLgD/EoPsEdPEu JxmB21SY5sXrGapJZ2yMtZ8zIEOqvFoxW6saKW4gCmrGax8XRBCRBZi/8x7EISicH/w= X-Gm-Gg: AYBFou2l2b7jZWPKEyraR10NIEE8YpvAv989aYHNyxe2G2x5WuWr4HOFWSayxaIJrNO QgQJWTSLkZXmWFUr6rdp/tODpknDKFX72WnIHq47w1Vs/H+Cw7NqclUdqbRi/fv2UaT1E6hLCRW bt7FnGkBNnGgde9+CoMtVJczlYgnbj0+776OjMjKGR6KFPqsV0RXk9RAk4Cd3R7jjx47ntWVAOW DfjXyi4tIPMPIjL7EaEiArFFH0WaGAfY1LOUO5scaRR/5N3oCVqFbjb51C6Wg+j/z8W2AzjXCiN fihQTRiWJo+E4xeJakv3o8UYQ0D8K4jtHf5OVHRkuZlmB+o/7x3ARmEezapSJRC5m/a5dwL1oup fkQ2AaWu2dx7F4YHtJ1xdK4LT15W78sB1ccl90SYOsUZtLAL8EEUJGEZLUW3H4xIx/dF2LCGgGE f7jjWKEGVR+KDoLsQeUlpu59UTgvy6Q7SQ6gunusoxqIDamUmtcmbq6OhGwWFH8vJdmBoRiT8= X-Received: by 2002:a05:600c:5486:b0:49c:fc6e:a3d2 with SMTP id 5b1f17b1804b1-49eb732cc30mr89424965e9.17.1789664170089; Thu, 17 Sep 2026 09:56:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 07/17] tests/tcg: use --add-current-user when building containers Date: Thu, 17 Sep 2026 17:55:51 +0100 Message-ID: <20260917165602.3405537-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664304742158500 As the meson tcg build routes the container builds through docker.py we can also clean up its hack which involved appending a RUN line to the dockerfile. All the dockerfiles that care will work with the --build-arg. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson 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 0604c4b90b9..814f2f8cd8c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,8 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, + '--add-current-user'] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664276; cv=none; d=zohomail.com; s=zohoarc; b=Uv6kFB85JrABBC0n9b/VSV4WJvvEPzNS8Q8GmDu58VVJSMjzzdjJwyFo8Sy/OLgigEXMSbLbQrWStCNnLiTbAVUMDq/Gf18xak4zlGMwldHueJSjQne+4XDgRkxyl6lWqmG3YiEL9zwbmGWdHjZx/L707ltUexgC89lrBcmm7Ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664276; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vjEGVIoXgiWmRQOuwzLlJ7OnxAMbVyKluxu1drRctLg=; b=DpKpssKMxN/mTxY3a+OJPOJNrMINJV1GlFc6EyGhmZUFSIOC3FmSB3fjz/MNjHMZCj2nEhMaR67niWBsnbTV/FM4kyWmnqZqePFN+CWCxzkOYbAnx/cyhY8NOFwVSau/jRCaW6+dRejl89tEPkw3SDT+HIM9UePtrGBmhxXC8j8= 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 1789664276942146.41161514001521; Thu, 17 Sep 2026 09:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQ9-00086I-4R; Thu, 17 Sep 2026 12:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FPJ-0007iA-V8 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:22 -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 1x7FPI-0000ja-7O for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:21 -0400 Received: by mail-wr2-x0f.google.com with SMTP id ffacd0b85a97d-482f635552aso1008721f8f.2 for ; Thu, 17 Sep 2026 09:56:19 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bef7678sm17381540f8f.2.2026.09.17.09.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 03D125FC17; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664179; x=1790268979; 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=vjEGVIoXgiWmRQOuwzLlJ7OnxAMbVyKluxu1drRctLg=; b=QPYfJGBwGw7JiLB53BZGa/JpNCB7CVRSlYiqgUiUfZd+8JCadWsXGIOU0pvqhtlHAw 1KCRxSXh+ALtiakv8SvOmFOAcjuPr6s47wfgvbivIrWm+nlxMCslRj0p7eXW6s1qn51t 8dhS4bBAvUQn5N+XlHc+DFcYqVN4WXSK0VF2SyBIFKvd9m8iFGgbCtZInYmt2Odo8ZuF dNGIda24GkPYd+eXoQ3f+eicNTJZuI/851FwDJYoLXjTK/wDRR01wEptq/3gK29W7Xe3 YnjudfjMcTT3ETy3igcBfpPqPhx+IRUax7FF2snutXp5RP0RfaLDryXXviXUCAUzpBYf GW2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664179; x=1790268979; 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=vjEGVIoXgiWmRQOuwzLlJ7OnxAMbVyKluxu1drRctLg=; b=hDVNqsKqEG1LeyDOQFz2i2MFxhoexiRWOnaWr8vdZVWJnH7tGL0uLuhBxe0fe7bEe/ T+bokmxsRj53wC/KnMvdak12DXi3+Nv0KkT2YzbiHBwtUrsEvY2RzGzmvJgfhFN8Rl9f L8nJWiZf46kCN1nGFzsk6Tbg4ZFAgZyMmq05qd/t8bMAMQFxTlds+KaCG9G+6JTmFH9N HgL/L1Yoh8u7NR0AW4Q6iohyQ0D3vzk/BN8gDiyVf3lDnzIW1goaCF/CEsOgVoiVKMY5 ZVzPOMUIjCDjbjZVw3kkRgSXvo+1R+mt/icgXztaxux5vpboq/feDt/Us2iSPMpenY3+ sZZg== X-Gm-Message-State: AFuF++lOpnO6HtlFrA/2FCWBQu+dmWJhojDFMBNPKQhYEFbxDVAzmZcq /FE6ZIZhTlmkzNhjIJET6m8aZKj53hNEipIMiIERw9H4AIexH4L9i9OoDhH5LbToY6E= X-Gm-Gg: AYBFou0XRm/sqoGYEPNFzVJF9p/BScqSJwXERA9DBfx+JHkSvc7ejvPVB8yR+syhLgX eoU1HpDBwkhjHXKgyEnQlAHz2995g0/3Bc7ccwfc+8a6PQHwxlRQWuTXAFnaDqomC2Ky/VWYg3H gpoOiMiIpvDGY9IBs/HuPcvK0H7HcC2jn+3Q31I3woYyW3a75yG+W5f17J/hfwRE3Cu9WkI2Ie3 5SfrSxd6sWV8cokRbzyyXMlNiV3c0o369KyDcJ6w7G2lXsekqrcNYR2w5oKirpvvdgPxALW8XXS +SmwjLTQ82n35/Ai+mL1kflQ1duwtRT5Qpyn3rTGrfGXUVtL4dbT+s6VXK7GM9KU+a2nRvu5gDD S4GG0UTR/gFtd3xdRg/YbPcFJz9LOee/EGU3PNjCbZC9G5vwj5nKcYGs3ruM7o4S2HSzg9BCH5u UIBV+kSiv/BhJTHYYs99KfJJrLlSD2ygBSzI4ytWhQNd4QWVJ4cBmSHc+IDDv3KtoD/ziWUjs= X-Received: by 2002:a05:6000:2512:b0:486:f9d9:fe0d with SMTP id ffacd0b85a97d-4870cf445edmr9516416f8f.29.1789664178718; Thu, 17 Sep 2026 09:56:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 08/17] tests/tcg: don't define tests when missing compilers Date: Thu, 17 Sep 2026 17:55:52 +0100 Message-ID: <20260917165602.3405537-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664278966158500 Skip defining the tests if we don't have a compiler to build them. Otherwise we add a bunch of noise to the reported results. We still do report when we skip because the compiler doesn't have the features we need to build. Suggested-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v5 - alternate patch from Pierrick which keeps validation --- tests/tcg/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 814f2f8cd8c..5819fdf0bf3 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -499,10 +499,14 @@ foreach target, plan: tcg_tests cmd =3D ['sh', '-c', 'echo "' + skip_test + '" && exit 77'] endif =20 - test(test_name, env, args: cmd, - depends: test_depends, - timeout: 120, - suite: ['tcg', 'tcg-' + target]) + # Do not add a skipped test when compiler is missing, + # though we still check all tests are correctly defined. + if has_cc + test(test_name, env, args: cmd, + depends: test_depends, + timeout: 120, + suite: ['tcg', 'tcg-' + target]) + endif added_tests +=3D {test_name: true} endforeach endforeach --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664237; cv=none; d=zohomail.com; s=zohoarc; b=AkjdgVZlPpJh5CLbz+2dL938xD39K/bzs1M/nFYlfdmoKZjd0bNmkuhzUbuvqYHdCpuoQq4fH9aLmCVhilU+iwyhjVVH86YSqzkcTYdVhuMTTJgZ+WhABGbvhohZHNmuMp459+zqB+YKlKL0cfymWUTSfXYZ/WrjpNz3e8EjzR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664237; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AKp+lB8e4qtR89JuIFgqF/5ZND10Eb22WPiLefCflLY=; b=Xv7/uatSEIditQjxfvjZjrP2g4yqrQl3WCe+r3o+chS7J/xQPP/O3dUqFD6wTlyFdCTKk311DPfQvBpd3wzhOvF7EpcJDl7tSxcSf7jHtBWTEkpq6kMNuvX8d4ORQ9d2egI2KuNvApTjDzodQN5jfn7cCeMj3aXSA4mdWHX5VR0= 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 17896642370071014.5826227841125; Thu, 17 Sep 2026 09:57:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQ9-00086A-4k; Thu, 17 Sep 2026 12:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FPW-0007lx-Pe for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:34 -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 1x7FPT-0000l7-He for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:34 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912d391aso8530075e9.2 for ; Thu, 17 Sep 2026 09:56:20 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1f98csm16550796f8f.11.2026.09.17.09.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 216155FC28; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664180; x=1790268980; 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=AKp+lB8e4qtR89JuIFgqF/5ZND10Eb22WPiLefCflLY=; b=mmNKKeNaxfLKpQttNGn2M9w+FcgqChu2etlartvFL7vlhCyAUp5dnI+xsYjFknk8/f KtRaOh3cDwCo+O80ngxj0bMzZdnnUJ0M/kZic7d8KswV4ggaBFO1NlAe+uBjEbvqUFux pkup/x2XoZshTlEH7e4flLUYtnanpc3LO3b93CEZdb12BX3Q/gs3QQvhUukifoFnbMs+ fv635v1ublnXukTgt8OIq6v0qi0o1+mA6GZxZECo4aDoURu6m1e4dDD9i7oVpGKnqNZX QQRA8+XFN15hvkSn8KRZkHjYSs7PvuRPUvf+PhpI9ppbaSz1kUAlwENuxyAL9dNr4LsT +oqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664180; x=1790268980; 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=AKp+lB8e4qtR89JuIFgqF/5ZND10Eb22WPiLefCflLY=; b=o71zEcghBQAqbbZWYJAStFtOpMunmsZgROyO+irdunK5f2PBSy2lbYEDiO8JmpYuwk OIoisHFtrpzmCxsJ16qoOclJaSqLNjnkxX7enUSsh7sSogOl84G4omxBMG63yczmrB/K E7WbZMXLuGGGF6Yspu3XaA6KVYzQsIdQ576XDTqmkqEo13g44issU28v3p2tPssa05yy 1/9shH9dc4FTzlg8FtqBQJWMejL2hhAaFLNVKWCxcJuboPPxFyX9vDWvAxRsWbFmusRK +A1B4FLEhFbI0sd0loCjtHNd8BYEI8XfIT6DQwNv99QChBcxeSLi+2uo9z5DTVjrGHK0 50NQ== X-Gm-Message-State: AFuF++mEeWfcqv25JvfHhjALOZkzhPUmbXddBehQ7VqoJCqbGhmokxQi h3tNb93Tal8RC3n9Apg7qtdDS4oThLeVDDlvxRyW3zVthkJWl53hB8uuMW92j1UWPBY= X-Gm-Gg: AYBFou0V3nSTe2GbXm0+Y4/hobbugkSGoBTX48I5gmQ5lG1kDUmM1nFwWDpDxE5G9Y4 IYQ5iMUI1n8HMLdw/aqeN3uNJOwpJ8nWFTOAWCbiyvNzAIA+dnN4K7jUXDyQvbZGl0zv/LgiAyV DhtLEWmhvjVpnutVhPeYPoW1OoqWXBUVDG7nAPOt+//G2BBrfmUQeb9HQNYpo9TJop0Sa6WuXlg nXrTR4FAoCwVEMTDjNJeMhC35L0da6qu3eNBsEjwxUBgBeBFtm2B6wUsUdQJQ8np4mB4qsG4eYV hGbl1+tQgHJPxOgLHlfvWmaAaXoJCuNPvpTIb6HYdanceBI1UP/FH4QJEBkrxe2Pmi77oHDLiH8 /zVrUtBZh2t8MFFim79BOW/Sgj3FEmp1O6Ljn1Qx67ZEyCMF799blIld75jYWxvjHGRAhmINjQL ocjs56TqrtfwhiXJHe5ZPkTzoRNsoGxQblrAhtktijeQgJHVjrcdYCUJGGMZVY3OtSLVkmQYs= X-Received: by 2002:a05:600c:46cb:b0:49c:eb16:9fd with SMTP id 5b1f17b1804b1-49eac463764mr93495885e9.3.1789664179803; Thu, 17 Sep 2026 09:56:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 09/17] tests/docker: add container registry to configure and use Date: Thu, 17 Sep 2026 17:55:53 +0100 Message-ID: <20260917165602.3405537-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664238789158500 Previously we had the default baked into Makefile.include but as the meson container logic will also benefit from it we update the configure machinery. For now we allow direct make invocations to override but for the normal case it is in one place now. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e --- v2 - fixed conflicts from the revert. v3 - regen meson-buildoptions.sh v4 - merge conflicts v5 - fix strays on rebase - update meson_options.txt --- configure | 7 +++++++ meson_options.txt | 3 +++ scripts/meson-buildoptions.sh | 3 +++ tests/docker/Makefile.include | 4 +--- tests/tcg/meson.build | 6 ++++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 667fc7ca19b..af14a9c23ef 100755 --- a/configure +++ b/configure @@ -172,6 +172,7 @@ fi # some defaults, based on the host environment =20 # default parameters +container_registry=3D"registry.gitlab.com/qemu-project/qemu" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -732,6 +733,9 @@ for opt do --container-command=3D*) container_command=3D"$optarg" meson_option_add -Dcontainer_command=3D"$optarg" ;; + --container-registry=3D*) container_registry=3D"$optarg" + meson_option_add -Dcontainer_registry=3D"$optarg" + ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; --gdb=3D*) meson_option_add -Dgdb=3D"$optarg" @@ -1728,6 +1732,9 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak +if test -n "$container_registry"; then + echo "DOCKER_DEFAULT_REGISTRY=3D$container_registry" >> $config_host_mak +fi if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi diff --git a/meson_options.txt b/meson_options.txt index e3570a418aa..6c2de6296f7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -393,6 +393,9 @@ option('containers', type: 'boolean', value: true, description: 'use containers to cross compile tcg tests') option('container_command', type: 'string', description: 'command to build/run containers') +option('container_registry', type: 'string', + value: 'registry.gitlab.com/qemu-project/qemu', + description: 'container registry to cache from') =20 option('tcg_tests_cross_cc_aarch64', type: 'string', description: 'cc for aarch64 tcg tests') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 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 5819fdf0bf3..482de73ac72 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -101,6 +101,9 @@ if get_option('containers') endif endif tcg_tests_summary +=3D {'container command': container_command} +if get_option('container_registry') !=3D '' + tcg_tests_summary +=3D {'container registry': get_option('container_regi= stry')} +endif =20 # plugins come first, as we need to build the list test_plugins =3D {} @@ -257,6 +260,9 @@ foreach target, plan: tcg_tests if cc_dockerfile not in image_targets and has_docker cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, '--add-current-user'] + if get_option('container_registry') !=3D '' + cmd +=3D ['--registry', get_option('container_registry')] + endif t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664303; cv=none; d=zohomail.com; s=zohoarc; b=aThYNrogC4sDptolFdq9o7KnATSINOjb/axIpYujtE0oTa4fKdmPCl4OJ00Gmv0B4qfjldID+tBCKN1kMk6nrMoof6XOV9g7AJ7HNc9lB1z5KifLzkcpZorN4iTvvMiSMGDaMPGxUmxqbEBo0JK+6hi+iuIRqpbQNMrOf4GWQPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664303; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=++nhsAjVYxHqC7ITngNw+KCNgr01nqcmt43kfCcAxLk=; b=Pe0I996bRirVb/WNiLwdi2JvLOARc+rzbVfubSCYsKdCjqnpMuLrJmg5jCQ/Mz1gjImKQqDMwmYQaSICfjrXKfF/e73kBRLzS/I9+fUOJNLxACs4PtC0ZPBxydUs+pxTl8hBM3rJVpLkjq7wL/jL9r0cNKiZMyy0l0BlkXK5z5w= 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 1789664303499599.1463776385114; Thu, 17 Sep 2026 09:58:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FPu-0007y0-VJ; Thu, 17 Sep 2026 12:56: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 1x7FPS-0007kg-BC for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:31 -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 1x7FPQ-0000qQ-OQ for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:30 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f6350faaso682793f8f.0 for ; Thu, 17 Sep 2026 09:56:28 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1fa70sm16797285f8f.9.2026.09.17.09.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3DC5A5FC4B; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664187; x=1790268987; 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=++nhsAjVYxHqC7ITngNw+KCNgr01nqcmt43kfCcAxLk=; b=jbibokHQ542O8uMXsNu1t5mGejUGqJsxwWy1uNInCxCuAbzYNCjvrWhI3LoRXX5+4F vHv5ZGXK/qS1aL5gWfVMzep6L5CPiVyAk4y9wCaBFDK5M/F5XwF6qyE3klQXhEopMPrd y6nJ/7qb5Z1g26untEiSuBKhehvrrTE+708NvJ9YE5FpyX8E0KTsO8Iz6A86LCNEr5vt uZyuClOofQaa25tymqp9I4zJo+//KDNNBDJa3kCfoCuzpoMjq10YlFi0JN90poJy9TDi XqMIyzy50xf7uHMisdQ0pCvIInZ+3c2RP5XWIVB2FhMVYT/R06xL/mQnA3Tc0aZpsuAj 6ZFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664187; x=1790268987; 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=++nhsAjVYxHqC7ITngNw+KCNgr01nqcmt43kfCcAxLk=; b=tTDscVUk5Bx3GTGT0CnNZcjYSDpMHkiC6hOvt7Nt6NJaJ3LQPmriDYT5WxZ0TSmqQm HfRD7m6/F6mQhPPh44lh9ZrDXPP+mL/Gnp20xdqnNk8UNuAc6gg0RRa/IPLtXPbuupBZ kAIz4GKZk1Sji9lnf4lJKdbIMwurFHgoTs5ldV+I3qrUimkbU04NRvFbTq6ZyYMXknGI BKid+9e0iP7Duxmp7CpD3lvKuR22Kdrm/HBH0EKvg3sYwO/DKoWh0Ar9mY1lJW2ySYqv Ryabm7V0dPIhHZ7IN4H+uuWmbZYZNmJtJCLp3GFn0K3FLeF40udsFULCXthDXVxAcqul 53pA== X-Gm-Message-State: AFuF++lY7VTrn6ZjfYbv9UQg7Zyf+xe68ry+c7zV8EmRrKfWFCMzd9Am d+GfoFpbVmROjHq9pKjVMP+xopXroxmYMdzs4a8S9yh+9iVRQVHVIt/+LQZMIs0sMGA= X-Gm-Gg: AYBFou0GsfWDhkMHtGu7Bxkm3Ts31Tm4vNyWlnYbDXknQSV3txcGdGbuR0b0wtFuBfm qNTILb5oXN7gi6Nz/LpO6hCuvCgGt9Wnimy2DFytWqZtqINu9C5QXrgSNBFmW/jqodjoW6HGdhD hDNvIYhwwIfducGAJBXiQ9NMjrsvQlNehwo3yf2FHsACS6cJskxnBDGmFbB83gOKAZNQRBiAWVH tfgM2ivMeqQ5MzHS4hoir7qvCWlJ0zzqBUNwLz5Bxmdgmf9FzpwpDWiO/PQswGAdmET3zcxQhB4 qwTszgUvd/Nz5cFt6fea+YpiB25VNEMG9b4O9fLjNTcA/uO36HsWkn4aD9zt24ERWg2x/bB4DwP /i9pgaUSh8hZS+ziljT4H5U4DQi6gwOstKlMLNpcS0FB1UWh+QmwlLi/p+b5Ice8b0DdAf5T0+z RAIsHHRLvne4/tipWxGHSSyMhX2JXBvPsCxRb0zX3751ldJqlpHBzR/s/DbOSUeYTHQXyEM+Y= X-Received: by 2002:a05:6000:1884:b0:487:71a:be5e with SMTP id ffacd0b85a97d-4870d067873mr10557384f8f.28.1789664187325; Thu, 17 Sep 2026 09:56:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 10/17] tests/docker: remove used _read_qemu_dockerfile Date: Thu, 17 Sep 2026 17:55:54 +0100 Message-ID: <20260917165602.3405537-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664304726158500 This is no longer needed since the functionality using it was removed. Fixes: 07056db1b50 (tests/docker: remove FROM qemu/ support from docker.py) Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier 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:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664402; cv=none; d=zohomail.com; s=zohoarc; b=bAjWjUPA5tGLG1x4e+JmF+UBiOrwt5+IO0i27VqZ8MTjenvMjOX2FhoYSCuY77DvzCcJSLYIoAR37/JbaC5aFfnTpfv9fUjyhIlCkyI5Ayb4eRSUJJBHDTzgSIRndl9/yrEHAucBKzdXUqOluJKw6NshUUtIOEPssexHDaerOog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664402; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yF3Q8DY1Fq2eaMOIb8Tf19RPgSoGXcO86Z2LRqjolcY=; b=CkKDvHzrpz7zoeetJLkSlBXxQCMO6OZsPjM5i3zhZZ09XTGjt6g4yQTPoQesEmiHQhycicpLSI2r86C4w2cEx1BTWci5EViC0raE6rcPYUe0iLftAHBP+2RX47MRY2X2J3EZUHddCSJ+jTisnnwN8n8SrN40Nhv4EeJedvwOWW0= 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 178966440295819.86748455159318; Thu, 17 Sep 2026 10:00:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQp-0000w1-5L; Thu, 17 Sep 2026 12:57:55 -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 1x7FPR-0007kc-Ls for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:30 -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 1x7FPO-0000pj-Os for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:29 -0400 Received: by mail-wr2-x0f.google.com with SMTP id ffacd0b85a97d-482f635552aso1008802f8f.2 for ; Thu, 17 Sep 2026 09:56:26 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf342a0sm16903654f8f.24.2026.09.17.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 57C9C5FC7A; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664185; x=1790268985; 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=yF3Q8DY1Fq2eaMOIb8Tf19RPgSoGXcO86Z2LRqjolcY=; b=Sb9C1gKy+QUmto2ibex6hR6JPFqwhrlaM6FtVTJwRWCWYzb5+xJkMd71jSN250FdAt iN7eRV80b+cXuCnifVd4MLNwaUAKsvgTHtNXvnZyHMZLyvlJmsGNkY46junEEkwYzvAI 0jYFDC9F1sBTL2pW0vLZy3UzvxjLViudW2wUsyvMNu+RcgQMi+udxZPugBcT646HncWu CX97Zyj4yvDmSDveGhESjnx+I7hLkEZtmAXZQtqgwvhztAiNkWSdwLDg4u45cu3zmQfq 3oQNPhoLya6phaMOnEzVBLwaPvNlPgUTBl1DXWoblOkDfImrH3+sk/HXLhnjgxwtF8NN 8pAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664185; x=1790268985; 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=yF3Q8DY1Fq2eaMOIb8Tf19RPgSoGXcO86Z2LRqjolcY=; b=zp3iB2oG8WfDTJL7eS0dm1jGEOUG2lEJYqRHSiOOqStkABE8bAyCPTITy/I05yTDBO ELG7ECyybdtlPlQveEdacHiixuKxifM7sGJe0qylFM+paKQwaXgoJ06jsWPelnPLw8CH qI46NFXDebCPsoKPViv5gpgS/tj1ygF0yKhnNhO6T3mlv81Z6WVm5AHm+wVPkfhPIycW XZrtVoINRaP2bjuyW29v19l048HNIA2KUE1jtgJhsyNH9AaayBHRH9idWH6VW8ZiTa7z tiWWvOxa00impT9f5A25MJ8484AGMmh0238pJDdZER7Yfl9PZ9CL+k2LG9DQz1OaFraS j8eA== X-Gm-Message-State: AFuF++mceefRWJTqjLFcG5W3ZY5tb0rjzrFx4IUm6CgzNggAsf8Z50Wb 3nPTPqV2TzFN7uwEnDXUnRjH8XqqEaQeO9tRIbpifsL8KnnbPdeBekihEaHX80P20jM= X-Gm-Gg: AYBFou3EaDm6XAEKQCyDgi1aorTbOolhOqdohSw6p1f3F6SSzbsQtZHsB0cRHqyuCme cqDhSCzYnDln+ZtsbvDLrMevub1EohVTCyKQYPCP8LbFCf+Iti61cLsY0inJW8gz9bAChNDrPCq wAX/Y080Gjw1iDeXqG2RwqauVp+K5aS5z9Zs4bC8KyOl42/sl3Oukjtcy7uex+PcLhQ0BkOE9GW pbvRF+xTBehLqjSU4Y2P4mAD7gEULCBHO0pWtjtwPOO7nr4AJtlD2rm6AnSzVS5Z8DaRqarxg+8 voWBM0HvWjCtZj/obuURJLNGw0oW6pTSXhKipWf1CzyMDSf6IpuNwXuUCLpNoV5HsX/SJfvHSpK NEUNEvxgacoVB3g0JPgi6547g/U0mf5FT0BWyud5MTfciac0uTTV/EWiO28Ni2qabP/loC4DDYt +PdlGMYQVG+Zcj/Yn93cri8/ev+QZlCPXpZJe/qbmpSQqjsqjt6QBzGjuWaaeteUkNBwWjgrA= X-Received: by 2002:a05:6000:40de:b0:485:8a46:7057 with SMTP id ffacd0b85a97d-4870d048028mr9338392f8f.41.1789664185069; Thu, 17 Sep 2026 09:56:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 11/17] tests/docker: strip remaining caching logic from docker.py Date: Thu, 17 Sep 2026 17:55:55 +0100 Message-ID: <20260917165602.3405537-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664403410158500 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. Tested-by: Richard Henderson 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:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664299; cv=none; d=zohomail.com; s=zohoarc; b=aneTEfjsVrx+dqdF5Wp76Lq07g/ORNf3Vr7m1LNfXuCaAQTLgt1YS4yDVHyz6d1JbkHfSssIJPy6KItBddt87YEq8e1JvV+ti0/F/fsDY3ff55XX+pR72zBGGz/Z8NODU0UGUjFM0rjcli73J+u6Kc580rXHNs4SHi8VO/dRZ9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664299; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KnL6IKhM3dX41QqD22hf7RzeQ5QC61WVqJNh+BsXAJU=; b=A9ugNJ6VHgcNU3fS4kRQAFOKSbah+dMdvQDu3cgwcsd5qc/3QrKyI1ELHXvJcCv4Vi3rp4FyYJMkqgggV+0kTqm7K9Y6ncW551hpusZgpR/cO94SOMc7EuWvt1eivd93Y6P6s7XxRuvCG0Yb37e3R3NE+gXdtshHovEjDi2xifw= 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 1789664299182707.5892023945036; Thu, 17 Sep 2026 09:58:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQZ-0000M0-88; Thu, 17 Sep 2026 12:57:39 -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 1x7FPZ-0007me-S3 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:39 -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 1x7FPY-0000pT-3A for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:37 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e6b885ef8so6507375e9.1 for ; Thu, 17 Sep 2026 09:56:25 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd22dbf2sm82500085e9.10.2026.09.17.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7387D5FC99; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664184; x=1790268984; 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=KnL6IKhM3dX41QqD22hf7RzeQ5QC61WVqJNh+BsXAJU=; b=zp5P1AfWH44Iy6wm9js6reEaV7xNv6pYV6mgtGOdI0uoRWXpJPEZEAIwAqRYhU8+Ga Bnkzi50EzYQ/0aNjBHa0FixgRBJ3sK/rH4NxUjtKJNUz/pkbZBj+MAJ+L8frrzxty6tq gfv6jgkF3azVivk6DOB+i2FuX1YhFRHzxBJ4hJRGqqcSbiuFh6R5bYJE5nAlKkhLAxCn bshB8octaEAl4pjZ9p9yUOzDRXM3l7+PabJpCGh5O7MKEuxQuqTB5zqJuxIR5HAP1geX AnEgta1LUm4vCiWFm/tS3LmH2gLIA+Ml851vfgodI850DCIjX6CkxSO2qLrABnKsj+5e xvQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664184; x=1790268984; 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=KnL6IKhM3dX41QqD22hf7RzeQ5QC61WVqJNh+BsXAJU=; b=kpRSoyq1tFrLW1ytjb1iB7wxwSvTor1DM7Tq3BpIprbtIaA+G+fsjgYFCL1yzRQ/H2 5GuoFSr7F6mN0t8S8bOvazQXvyJxkuK8Wcep/PxaNU7tijI4EQqx2j4dVrBnSA5uLky5 mTxkNs4aAykfeJE6Z9JEgsA48L/39VgjASJ0C3MDEtzcWk+5kqQ5uWlvuZksawUFh1WW LAaHo4e3KqQwJ/Yc1lnHNUHi1k6lPBf5lvCJBa8cRXLly5IYCD/FJ1bfNLfL4FqSC7rq Lr68Rw7bmatGdByVWFGZPey8hAOYfWUSsB76+OIUeLFGPnmS+z4K3PA/GxOzD8NIr1T5 daMg== X-Gm-Message-State: AFuF++l/nTSmAHrPfdf+kuAO0II+CyR1o9vZ+M2ZazMNI9q21bXWGzzV 7TbBHzTefBF6XhhXtiU2U0ViSYOQtqBEX+pAxtJ9mMWHpKu4l2DsQqdVpVR3Gh8ZjWw= X-Gm-Gg: AYBFou0nmy55una3J7Oi2NkBoqk5dU2Rja86obTJ+cHVjekTM/YACVRF064+T/6VGGK iUo7OgiPy4CKn8MNOHLg6TcQuAem1LFU1zhJfLnMhT9DDULio8Z9Yn5fMz3Vyg+1AOOJOZ7TZB0 FKQVqs7RVy52lmK9xSAtQnEFDgOtlt5zXk/MWlRRbujIp8AF3Fb2Z9u71weF6fGeZl/wrbqrGRi R/nWoqibbFpgdUbcIfPkPZcwJjWxs2u7qZ/3jqglsmJPGuLv9Bm+fFUGEGAywmTx9c3nNEO1ubD XDflbem/zu0mqNT/WqeXdAaFkknKRBX+9YHKv94PH1nhX3yLcPgVYD2C9phRdaibJ6BlH3lzWf1 MW9MnaTZ2KgmEYH49fcII8lfXGWNpj9rBYefFfBaYzfvJAGbdZ4XeL31qadRsM+KeA+m8HY166t cVeHfPfQYytWiSGf6Zwpno502dGZqgtnZ2/miftPfQYmXQVixaCZhGtB7Rs7ifbnDt/CteiK+VA qy+EwOHEA== X-Received: by 2002:a05:600c:83c9:b0:49e:7caa:e7b2 with SMTP id 5b1f17b1804b1-49eb733800amr77113715e9.29.1789664184110; Thu, 17 Sep 2026 09:56:24 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 12/17] tests/docker: add specific command to parser Date: Thu, 17 Sep 2026 17:55:56 +0100 Message-ID: <20260917165602.3405537-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664300750158500 A future change will want to use additional flags which clash with docker/podman command lines. Currently they would get snarfed up by argparser. Make the pass-through commands explicit to avoid this. Tested-by: Richard Henderson Reviewed-by: Pierrick Bouvier 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 482de73ac72..053ef147df0 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -275,7 +275,7 @@ foreach target, plan: tcg_tests mount =3D meson.project_source_root() mount =3D mount + ':' + mount here =3D meson.project_build_root() - cc =3D [docker_wrapper, 'run', '--run-as-current-user', + cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', '-w', here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664632; cv=none; d=zohomail.com; s=zohoarc; b=Wzd93uF5bbr40Xjk0COKq02u8lT1eyY71W3NHAmpd/Vlq86ZHf/uvui498bA2Cx0gQZghj53Mzw8Ehf1K+yM6b4WS/1/NrPaL+sEnGXqKQgCJaBKPz56pPSzwCN2dBw3DiSXdXYk8xMK1i38fW8HNDhshM5j5/Hshgh+FChrmVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664632; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IV0tF1sRRNpIOPotsbAY17LevOYRtBEbl2/JNz6ncs4=; b=m+KKbmqefmznZNE2hGw62j/oEFcVdrdyKHye5dHt/yUfKMEGWZUZieP8jwczaVwCzMHn9HbOi93HV+L33MipjB9nAeJx0ttyKDzaZ7FydRNkSJTCZnYmZAHr8CSVG9AT+EB372FZEtcTsGWJcJKS7peykMQdnWtBhOdJYe5rn7g= 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 1789664632800728.693432665977; Thu, 17 Sep 2026 10:03:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FWD-0007Pc-U1; Thu, 17 Sep 2026 13:03:30 -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 1x7FVz-0007FX-0d for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:20 -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 1x7FVv-0001kj-Hx for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:14 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912d3931so8517075e9.3 for ; Thu, 17 Sep 2026 10:03:08 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bef7678sm17418206f8f.2.2026.09.17.10.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 10:03:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8D0E35FCA7; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664587; x=1790269387; 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=IV0tF1sRRNpIOPotsbAY17LevOYRtBEbl2/JNz6ncs4=; b=LEt6ZndEbVdxR6jIsgzPir1Zx+nT6OZuQmKZBiXNtis6gJcHrZcsaog0SX0gE1ZhsS jTHWZsoY03arX27nNEsFnEUXIN9jVojg5TWJJpNU9Sdf2hgMhAR+JYPNAom42oxXGrdA I+wKoIYB/Ua53GHIYs/l1xOp5dmN426rd43gFxHSCBPfia1NwBsRIV+ewY/FGYeSMATv k8Rbsjttx80hhu3SmAoNmeR6rnJphI/UPmUzJ3fOJl/lSApW0evNsprHBtow8e470x/8 xCLcC1L1+ieHnbqnAEkumGsxLHn6lXkliNSGXo/Zmv8K/QDedK7RBGWdCVqYZSD1H7gb SnNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664587; x=1790269387; 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=IV0tF1sRRNpIOPotsbAY17LevOYRtBEbl2/JNz6ncs4=; b=nHcukiWFlvTjOFXLD0N7ngp/v/SW0Jhty0olXoZDS0HSIVyPoZ6ng/+b1d3pAJU9i1 hmK1p+MIgEvxFEh1MW0emkOQAl02ihS1dMby0Z7p5PuOEglG15e7Ntqm16FHZz5aYMTd +ZYyrg6W1mstdn6QUZOuBuEv8gnaHjbLTbg1EZaJdGaDmy2ocziqWT1oTJp0xg36XaMA YImAJeF2/j4NN4T2vYC22bS/PjHKbckcDZgZBzj8gQCYWo417wadYNS9MBoxRlZWhMpT MUO4nAGXY0dl6bc7Rqjc8jK2lBuFVLJOneVEXVvWPbqZvRSoUho5zGqKh9CTPal/e5jo F8+Q== X-Gm-Message-State: AFuF++nOer/hH3IpejxS5W1pRSuixK2C335pe+su+EUe7M5znmyNYtvP a8VwrKa9qIg24dTV0FqZNKodOR94PbjLAs4hxvMXQzLIRs+gClrnCiR7Yg6m3Fd4Fpc= X-Gm-Gg: AYBFou0kZtcGuUA2YN+5+fsdWtua1gpIWGGBVxpLbE4pCRuHGAaA1YrUHxhvC+AJ+js hmCoh+VSvFdXCIlseolMA+cruJV76nTRAAbkhj7b8IfIMDdmq8XmQmu2eJgqyhFl7gsZr1+M/L0 AXmQoG0mCjYTVGDShPGQlglXZXzPbf6Z8Eo+xc24xG0kqcIMwcsN1BIszBDrD1QxaMyzOmxfk4q g5acRip1g5IpGLiH+s8UAAVd+dh2+G3wEICODiDCVnmDoPKXt3vms+ZT230GyO8+gwdzjPe3kUC TGIocZTjAciXiZsf+nunz/fG7hRHUg/z1O2duuYe5ZuiayhTalKS+VOC63KYJF7mL4z+0gogfZe 689Hz/vkc08Z0gWvubkyX4c7wuyJuVtmUi3l7tDvH1Pqb1aAvuuG4nsr2L5tmkSRaTEBPcaCs8e UF7FzDCKRrbuyPEybKLkuhzv8orJkWAzZIPXUZXXnM1ET5/6Gsx9okVdPp//0QuuKCjKNEFic= X-Received: by 2002:a05:600c:3ba4:b0:49d:17d4:d6ad with SMTP id 5b1f17b1804b1-49eb7337325mr121275635e9.23.1789664587072; Thu, 17 Sep 2026 10:03:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans , Anders Roxell Subject: [PATCH v5 13/17] tests/docker: fix ccache directory variable expansion Date: Thu, 17 Sep 2026 17:55:57 +0100 Message-ID: <20260917165602.3405537-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789664634119158500 From: Anders Roxell DOCKER_QEMU_CCACHE_DIR is missing $() around DOCKER_QEMU_CACHE_DIR, so $HOME/.cache/qemu is never created. podman then fails to mount it: Error: statfs /home/user/.cache/qemu: no such file or directory It only works if the directory already exists. Add the missing $(). Fixes: 8a1975e4d44b ("tests/docker: expose $HOME/.cache/qemu as docker volu= me") Signed-off-by: Anders Roxell Message-ID: <20260915072403.347639-1-anders.roxell@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v5 - dropped my fix in favour of Anders with a better commit (an he was first) --- 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 74bf471f171..9237a0dbe7f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -197,7 +197,7 @@ docker-help: docker # Where QEMU caches build artefacts DOCKER_QEMU_CACHE_DIR :=3D $$HOME/.cache/qemu # Use a global constant ccache directory to speed up repetitive builds -DOCKER_QEMU_CCACHE_DIR :=3D DOCKER_QEMU_CACHE_DIR/docker-ccache +DOCKER_QEMU_CCACHE_DIR :=3D $(DOCKER_QEMU_CACHE_DIR)/docker-ccache =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664363; cv=none; d=zohomail.com; s=zohoarc; b=m7FSQynUCJU9HBjVhyOTQt7g5d8z621f4ld3d47Qv9MZv92J4VvdEZeX1YpBsyYeqmcIVFKmBq/M16N2aKMi44YEZ0xCnNL0rJGrwJCLk8CX34EX09pTK9O938tBDt7NymJ5E5mrOFm/FPQLMN07QYWspmPhbe2+VGOBHfAw2YQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664363; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fwUrFGyorIDTBMSXlq8EypmrdttVYEm3Ebm5JuAiB9I=; b=ngkRKpdiYHjmsumAFDtsRzpZRfgoZ15/ocLp8jQPzbAYGOKPmV/J5mU6qX5Ya5LS1QJegJqfU8g0BPJeX7IDGUXLvnQBEOt6rPAceGIsZkACRWHleXxYO2ah81Lxj0BzzeOoyUsxCUaQk9dsOyTRb1EMrRwA49BqbNZzAIm1z+o= 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 1789664363711704.3946208007453; Thu, 17 Sep 2026 09:59:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FQg-0000Wu-7r; Thu, 17 Sep 2026 12:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FPM-0007j8-MD for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:27 -0400 Received: from mail-wr2-x2a.google.com ([2a00:1450:4864:30::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7FPK-0000nu-SQ for qemu-devel@nongnu.org; Thu, 17 Sep 2026 12:56:24 -0400 Received: by mail-wr2-x2a.google.com with SMTP id ffacd0b85a97d-48439feca17so915656f8f.1 for ; Thu, 17 Sep 2026 09:56:22 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1f98csm16551193f8f.11.2026.09.17.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 09:56:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A5D595FCA8; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664181; x=1790268981; 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=fwUrFGyorIDTBMSXlq8EypmrdttVYEm3Ebm5JuAiB9I=; b=n5sHbfVfD13BxVHRKaYG81uxucoLfChbs12p+iSAlD/Fdf1pJqjwFOlowPYxzj2uzb axXDKBQ3eLjOzzr+JcARe9ogXl+ho+pMOlEelgXiAPPl7r3n5RuqTH7gaDiHV2x+jcbO DIdNsfrjAJPN9+G0WViKhYyQ48A7XXCiPOUor0PmrpyfWfIZA6pKbXq3ayETzo2NyIJ2 c7P60lYyOq/qN7Ubiw2E/4NRdm1fqjinbPR0BZ0KkdkEzRVskLWDRD3cC+Nmvus+u+7H gkyhmrIARvqbqHdERnj5Yb8mz3MQ4xSzVQdtV0rwGhFl7p57fSplfKNuCIcZgnCPVvDy LvQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664181; x=1790268981; 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=fwUrFGyorIDTBMSXlq8EypmrdttVYEm3Ebm5JuAiB9I=; b=I7020/04dEzd1JISyhW9mROSk+dBDIxH9chZaFDW5E5WwwH3XhuJnR2fiU0BMBxQkV CszMhYQ0dayI7E3u5UGGsRmW31+/63/svR4E3CBMwPCM9NGnLzDIh0XyOp5JLCE1mwEZ GN/57pQHkEB5so7H5hHUZe2bhqUeRPBmeTm3gV3biFRgLBvMDu60uBP7muTgN2Hbwaoj Q+uWJmztbeeXWSZ9OL+8ER+G6RocrSregObGoZ6dMayCiqLJNHWLk99G5F7KA85WXYgJ K1QCXZjUOpZjANx8TdHD/MWDtlCR3nzKNUNOP42JbPrIDBgLfcvGirGG/orDLc6sYgjq I2mw== X-Gm-Message-State: AFuF++ljlJjUHkg8hFU6sKzkULs9ujMDwKU/as2E4bVTRmTZ+zYx2OIt KfKclLOm2CrOoBdEFqbgxprcvalNHaqRsjz9LnuKDECMHSBmcPuZwZyoebBbOxNVK+Q= X-Gm-Gg: AYBFou10WOoaAsd8atJ+1rEJgku5lwrcOIf6ymZ30Kab0zF/3z013QSV42+6mr0p5IZ OHJWVDmomtNzuRdzw1N3qgQVqYfoO5duZeLkJbW/Mni5BXTscB9beShWL1lLV1PxcnAK0npdUcg IO4KAoQa6DuzoD/KYZ8Rj6asvPK5+7W8B5ZdtZteakO5gThnlafWLUsEbMVN5jAqKRXvU5SZGno sK/gjjxeDZKnmR09J0C/Ws5NNkYT9TRe0p25r7cuiyT/UoEUIF5omX3mA3L47mfVvbZsmjHqqEO UoZc/G2+n9IUj16h3SsQz3B448AZSqCHV0PofsRfSbCji7MeFiXeecxwSjmmXOmtxZNjmF1jqWr OyTFyrbv9rD/wxZzOTEFeLXPPDfyJnzPgcej4kT1MtQjvNqceMKj9ijzKQ1hN1zllXbHWRm2GZT Y2sLfh15NWMivh3WTyDUbJHecoP6TLUrkBLrzu/c0XlfGi9hMK4CZH/dDyP9R+O+qomloFNHM= X-Received: by 2002:a05:6000:460b:b0:487:6f2:1a45 with SMTP id ffacd0b85a97d-4870cf1641amr10020842f8f.18.1789664181257; Thu, 17 Sep 2026 09:56:21 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans , Amit Machhiwal Subject: [PATCH v5 14/17] gitlab: update the @user id mapping file Date: Thu, 17 Sep 2026 17:55:58 +0100 Message-ID: <20260917165602.3405537-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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::2a; envelope-from=alex.bennee@linaro.org; helo=mail-wr2-x2a.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: 1789664365622158500 I needed to fix a POSIX-ism in the script as well. Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Richard Henderson Acked-by: Amit Machhiwal Message-ID: <20260914184534.706637-1-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Acked-by: Amit Machhiwal --- .gitlab-map-auto | 8 +++++--- scripts/gitlab-map-update | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-map-auto b/.gitlab-map-auto index 28ce448f1bf..3f717a15d4e 100644 --- a/.gitlab-map-auto +++ b/.gitlab-map-auto @@ -12,11 +12,12 @@ a1xndr Alexander Bulekov adi-g15-ibm Aditya Gupta agraf Alexander Graf alex.williamson Alex Williamson -aliang1 Aihua Liang alistair23 Alistair Francis +amachhiw Amit Machhiwal anisinha Ani Sinha anthony-linaro Anthony Roberts anthonyper Anthony PERARD +aroxell Anders Roxell berrange Daniel P. Berrang=C3=A9 birkelund Klaus Jensen bonzini Paolo Bonzini @@ -36,10 +37,10 @@ dwmw2 David Woodhouse eauger1 Eric Auger ebblake Eric Blake edgar.iglesias Edgar E. Iglesias +efarman Eric Farman ehabkost Eduardo Habkost eldondev Eldon epilys Manos Pitsidianakis -famzheng Fam Zheng farosas Fabiano Rosas gautammenghani Gautam Menghani gkurz Greg Kurz @@ -51,7 +52,6 @@ imammedo Igor Mammedov jasowang Jason Wang jmacarthur Jim MacArthur jsnow John Snow -juan.quintela Juan Quintela kbastian-qemu Bastian Koppelmann kmwolf Kevin Wolf kostyanf14 Kostiantyn Kostiuk @@ -67,6 +67,7 @@ mauromatteo.cascella Mauro Matteo Cascella mcayland Mark Cave-Ayland mdroth Michael Roth mediouni-m M. Mediouni +mjrosato Matthew Rosato mjt0k Michael Tokarev mstredhat MST npiggin npiggin @@ -79,6 +80,7 @@ pipo.sk Peter Krempa pkrempa Peter Krempa (work) pm215 Peter Maydell qemu-janitor Qemu Janitor +raphael.s.norwitz Raphael Norwitz rathc Chinmay Rath rth7680 Richard Henderson schoenebeck Christian Schoenebeck diff --git a/scripts/gitlab-map-update b/scripts/gitlab-map-update index c134c226aa2..743ad11900d 100755 --- a/scripts/gitlab-map-update +++ b/scripts/gitlab-map-update @@ -33,7 +33,7 @@ glab api --paginate /projects/qemu-project%2fqemu/members= | \ .gitlab-map-auto.tmp test $? !=3D 0 && fail=3D1 =20 -if test $fail =3D=3D 0 +if test $fail -eq 0 then grep '^#' .gitlab-map-auto > .gitlab-map-auto.new LC_ALL=3DC sort .gitlab-map-auto.tmp | uniq >> .gitlab-map-auto.new --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664637; cv=none; d=zohomail.com; s=zohoarc; b=FlU4v4Q8NJqLWBGBwEwlQBSvI6NlnxcNq58HE5WDn349r43/iMj7PGxSUIDxB79GEozw9qrgcLG3NhBz/83C+bCor1quPx1mBpTLtBtLVr65pikQooiXIQZAjI4GYUh8hY1vLt7LV/cSDzle4cGpkKJclF4y6ycJzTpO5Bbfrp0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664637; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1kX6+O4tJe0pWhj+BvPQgaI0joLlV1TeCnlxudU5Yr0=; b=I/GFiz3ColyfwpbRTNO1o01ZtDVm5V/tqgayLkX8ACyNXi/RYCVBF3cwogM0QkgLmJtioZu/m4BtMuyW4qjjp9w/Gxat8jOzF6AhXaZVfohtWe91gYFpnUUjmCIIwPOZqwqP2S0o2REc615c6d4beynIFaZBI9lLxWVy+NDFFWk= 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 1789664637299449.0501278610408; Thu, 17 Sep 2026 10:03:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FWF-0007Qw-5S; Thu, 17 Sep 2026 13:03:31 -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 1x7FVy-0007FD-0D for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:17 -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 1x7FVv-0001lc-HM for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:13 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912e64ccso7722325e9.0 for ; Thu, 17 Sep 2026 10:03:09 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc4886e11sm502475e9.3.2026.09.17.10.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 10:03:07 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BD2FA5FCB8; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664589; x=1790269389; 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=1kX6+O4tJe0pWhj+BvPQgaI0joLlV1TeCnlxudU5Yr0=; b=eUeromc8MwtEv8yxfYcpFO7QOO1SjYfN+pY/0yhMRuz+aSXsRmu4+47/JXc3l4zhWw PTYUU1r4bOC/Z38vm31n43oRzUqP/AIcZhlifD49WgY4uiFDo0Y1IBLmbgI8ULPOkUQG LO/yiZ/B+VOEzBlekjmYVnnUr3zM5V3mhjAzmPHt5yalNlIFlncNn6r6y/uYeFza13EE MzTXkWotUdNNvmGWYqSoCCt/WesekqignnR12EyxYozgWhRBVKD+tXVUsT65wdTM7sDP Hq/MOog8zzQUmG7p2wrbK4ryuRI2++ykIvomjVcxEEq8JXAprKtVBsPa0GGQQdAqO+Ru A9JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664589; x=1790269389; 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=1kX6+O4tJe0pWhj+BvPQgaI0joLlV1TeCnlxudU5Yr0=; b=Fo3LFrguRbzJbD9OkEd00iuOWujUh5GzsSeq+nIeineFjN+32mc8YFQ3zMJASxhR6p ziks1ey8e+tqQIbIw1y480QDHDYu3fqbIypE32DTZIkPhR5l676+S+5GP++kIyl/o8ge 7SauU5+K5+wQqp/mL2WkSDd3QHwyXucWz/gE4mDsDIZkpfOja6ENWxoSepT+m8b3Ri3l 7u7QkLo2KFaNj4er2NRWIWhtE2guphMMz0N5tueghbhY5t149MqDleZJM4q/+KbaEWYg oaPQUO/75iJOOcO1ZOT7LuBL/4oCxaYgJ9eoB2PaPoEP74phPM3AwzZ8CyOiF/MZJdar K36w== X-Gm-Message-State: AFuF++lWKkMFvMon045qinh7oHgjXI4gHKT8z2PFJOoiU6NAwsFD7lp1 YpYScBxl/I4P+ELEeXuLDZaMwkz6Enwc1yM/27LJhFEvpxdyrfxMitvgPopzh2zT3cc= X-Gm-Gg: AYBFou3XBgm5QRViL0sVuoUTOct33ofUtYXjuqrD6DpdXYRxKr5KA4SmNvcGX+AAeLE SSp71WMrsmRGFXyf7lS5pLanCWj4/4OpCZEio+hnAThb1oumUNygiqETELtBt3kRYNQLmWiEeqB xbh9aoYIPTZXPlaPHZvveiFHFNhkItRBbYp2CUJuXF2kRBKg6DL2AeIvKya+HB7ueXnGZJS6kLM CsJ3W380RfQnB4bU/J4LctGgjRIGwjHcTvIMyJLtIurSB3EhN9yLs+9Bnc+twDO27+ZqTJsllyS JkjVMGpjff8FauA72muZ96VH+NyKaGpzEylrTdbiHCw/K8FupdETtqDGo3r3fLQporYJgVvt++q 4jDYRJZnp9jXdTq7MjShxbM1xmPDlxxF0P5JDFzom4I4zKzRbpx/O4q/KQtGzYYxlY6fi/guFa8 Vuza+lxpu1cbcnjV6KEA3yrsUCCY16R4jUV50SIFnNgBHC51JVox6U+UEukHCBnJMaW5O6P5w= X-Received: by 2002:a05:600c:a08b:b0:49f:bd3c:bc21 with SMTP id 5b1f17b1804b1-49fbd3cbcf4mr52074155e9.28.1789664588678; Thu, 17 Sep 2026 10:03:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 15/17] tests/tcg: add console property to docker image custom target Date: Thu, 17 Sep 2026 17:55:59 +0100 Message-ID: <20260917165602.3405537-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-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: 1789664638201158500 According to the meson docs this serialises the target in a special "console" pool which also disables the buffering of stdout. This helps avoid the appearance of a massive stall when a docker image is built. Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Suggested-by: Daniel P. Berrang=C3=A9 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 053ef147df0..95f533b0ab5 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -265,6 +265,7 @@ foreach target, plan: tcg_tests endif t =3D custom_target(image_name, command: cmd, build_by_default: false, + console: true, output: 'no_output_' + image_name) image_targets +=3D {cc_dockerfile: t} endif --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664614; cv=none; d=zohomail.com; s=zohoarc; b=YyyHpnzxQGaknVSQ4dnxwRibyTIZ5gDUcg/Q9kkkuEzE/3V5FwjciciAlg+Px0DlVUva/AT3CBmfEd6hQiXivbwXmM+kIzd5uqS5GRsfPqJnTDkYMP1kiRgRY2nLJ6PwJnp7QcpwyZK70U3VTX1dMQ/brYZZqdDs1m6ww0Ayh3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664614; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tf+mkj5hW2gXQd4FRj9pMR3/7nIVm2YxClIiD4Ub4A0=; b=bcjbbmKwrzOwHpo6pH89SMIZF6kvcTT1OjGYyBA7ywbh40SVYmGQNg3NQAoZzA/EEgrXN8vywBbMFTdNte3/+OH4nJw9C/VlfP7Gm5KsnSJSTfbNeNrKvmYTUzJsu9bgRdmpBEYdfurfwdPqJKk082gQ8cKsSuq/smrF08+6qA8= 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 1789664614169998.523556790646; Thu, 17 Sep 2026 10:03:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FVw-0007En-FR; Thu, 17 Sep 2026 13:03:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FVq-0007CX-HL for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:06 -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 1x7FVo-0001jg-Nz for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:06 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49d1ca5b0d6so8037565e9.0 for ; Thu, 17 Sep 2026 10:03:04 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbbd83e39sm121609765e9.4.2026.09.17.10.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 10:03:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D967C5FCC6; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664583; x=1790269383; 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=tf+mkj5hW2gXQd4FRj9pMR3/7nIVm2YxClIiD4Ub4A0=; b=qH8bL8a9XnlYnjPAWvhPC283AA231wib9sgaqa0+fxAjk2FWczxZwUqZA0k2XGUMDn WFLrocsP5F4EnYgVGYzKyYfWcBFz0+RL3i2BuD+wxvXzXtjZDB20b1e8KDYHNmeiZrNb e+n43Nke6ryvA0eF7l5Mc9R6DHchLfcLy57qNfYqrBqPa12KAqEl/HTnva/iFuXN+Wp7 khprRcbgHnh1m6h9VAkulxOoqdai1qS0iVyOcz3FQWpU/WW6R1aPK+mpV7DUoI4OqR9p kOHYy/Evkl7/LRjsNaRq7c90v+6Erhzso/nqVPK1BJvnuqvyQLjVP83h3xZ5hbrI+ifX lAAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664583; x=1790269383; 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=tf+mkj5hW2gXQd4FRj9pMR3/7nIVm2YxClIiD4Ub4A0=; b=PyCGAV2mmAjZB9gc2JVN8Ze0C+ak07O8tC5frUg4gL1XIvzzrgXx4ksJTyy3Fhev/h Upk/obpciMUFEs5tugvuJj3eJrle+dSJZmuvKa35RTCzATCnx9ezaeIPqxSdDbV0a4e2 YwAltFX8I9We5Y5C7qbf2ZFEU8tHTtCD8yZBxBV9D0wDsoRZfKDvf33+i4zqewRv9e0f QnpDfTKzFyOB01lCjYrubEA+wTmXa2JgFjC+1wK8DVC8O/hHTmwgfmgPKwSfULVFPbPW XzLtGE23kC2yLQij+FFJZB19t0mj6GdHpE/Oxxi90A6lYCw5neFaUjnLBCGhTtHP5G8f GupA== X-Gm-Message-State: AFuF++lB9ojb06JgnxS/0Y6MV+NTyvDtoWl4ncsrIoTv1mpBo7cGpdoO 9DxNKrn6/HMxqcFONtsb47124x0t/pc64Frs5FKJqWTIGSHuRUTXTKRCDyZz3KSDB30= X-Gm-Gg: AYBFou0GEvItK9v99ojxaMMw3kKg+kdTVnPFxMgcunBValUBJTPbbsqXGIzPvtl/9RB DqB4uovncnZPYlhYV3wYGEcCcnfDuaWliS8DG//m7sk6cuBtFthMVgzH68lPfLIMetfsVCKqAGL cuigeaFfY0t8ODcePegvkYXMsGitH7rOsPXmDcCvKcaQ4fTR+c75j4Cehr/oNw8kT8hiO9xwIHm eYujvZN6gCabC5YpM1PiIHM16km7fIqgvMQCVk7p8xtE7Qf/UwKZEdEN7K3SMn7IA5iQWQj1wRU UfZXtslCsgI8ctxHAL/la5ou65BQO6ik/A7ywnaCCfSZyBW/BOyEhOA4lg9Mrf6cF9n8vcPlYAA Iba3IGRzXAQyiLL+SHe64hjmhcXxhX0A7QJu6Mw5bF1y1hL5Wd2BG2ASitMeqGANkD5oqLZjWwx Q8mvsB4yfgbMh/A3IxU0gr9JqX7y5mVI9mT5ZvT7tAIXgpkpX0R1iqQAgpaTHyof7+TAcU3/c= X-Received: by 2002:a05:600c:198e:b0:49c:fc6e:8cb1 with SMTP id 5b1f17b1804b1-49eb7346e60mr90402225e9.21.1789664582984; Thu, 17 Sep 2026 10:03:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 16/17] tests/tcg: Fix building outside of the source tree Date: Thu, 17 Sep 2026 17:56:00 +0100 Message-ID: <20260917165602.3405537-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:31::10; envelope-from=alex.bennee@linaro.org; helo=mail-wm2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1789664616298158500 From: Ilya Leoshkevich Running TCG tests from a build directory that is outside of the source tree fails with: [...]/qemu/tests/tcg/multiarch/libs/float_helpers.c:228:1: fatal error:= opening dependency file tests/tcg/s390x-linux-user-float_convs.d: No such = file or directory This is because the build directory is not mounted into the container. Add this mount. Do not bother with preventing overlapping mounts, they are harmless. Fixes: 27939ad414ca ("tests/tcg/meson.build: introduce cc_dockerfile and cc= _docker_host_arch") Signed-off-by: Ilya Leoshkevich Reviewed-by: Pierrick Bouvier Tested-by: Richard Henderson Reviewed-by: Richard Henderson Message-ID: <20260915110855.491985-1-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 95f533b0ab5..a5e0462732d 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -277,7 +277,7 @@ foreach target, plan: tcg_tests mount =3D mount + ':' + mount here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', - '-w', here, '-v', mount, + '-w', here, '-v', here + ':' + here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif --=20 2.47.3 From nobody Sat Sep 26 20:51:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789664661; cv=none; d=zohomail.com; s=zohoarc; b=lRQo509OUq3dYPWXUEGlfvJDDO8IxPBWYAVsbcGXKF/nZuXzsdivLxHnc3Muz4MDlbzTmVpq4tSiWnoyGPghNU0wTCRD3Qau9Vm4FI/+vhHAR8HFJq0EBPBX5WkAaZP6vb3jBJjoPUdKi6YZDznkeI7fmKhpsJKZZuoPzUhgQUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789664661; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qqeexVrUP7S+bjRwHH7RDoI2I5dpPVlDr3aItml2BS4=; b=BVRMSk8Uxwy9czjW1qyxZqZ+BR/wbY7ItT/Nf3QOLjuRq/78fNR2OZn8r/RuQT56JV4rMyBcJxwPQa/NqEFDwWxhI2wvHRCURw0dw63WofIEDwnN/3fVHc7ZfdL1TVrQ96RB4IiEthgS1M5vztOF60gTUybfOzQW9M3e508IoZI= 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 1789664661024517.7320143366527; Thu, 17 Sep 2026 10:04:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7FW8-0007J9-Bu; Thu, 17 Sep 2026 13:03:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7FVs-0007Cz-20 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:09 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x7FVp-0001jo-Dn for qemu-devel@nongnu.org; Thu, 17 Sep 2026 13:03:07 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-48586861639so425738f8f.0 for ; Thu, 17 Sep 2026 10:03:05 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf418dcsm17047776f8f.35.2026.09.17.10.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 10:03:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0001E5FEF7; Thu, 17 Sep 2026 17:56:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789664584; x=1790269384; 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=qqeexVrUP7S+bjRwHH7RDoI2I5dpPVlDr3aItml2BS4=; b=ECgwnMG/2UYlh/hcci4GXXTtcKqY9VEvDnFal2i7mP+98sgXzxYlzAHA3NAHUHNs4M hUAQeYQh/DK/1AkU5VpYM3gDNUZymoT/B2Z64RFwHRBl7YY5mkd7bP9+dcjB+Vb1dXPT DUH0TXWQ/qPJkIC6cX1ZqnoLca4XY7W2S7AJBgdvUbbJTWiY1YdXf2cIzUb51uUt6Ypp YT1cEq4pTsI4+mxggqARQAToq/pfjaYp3L1aAClflQKbMlsvX30LRN/xOvzBNfkRcRYP kiLxLgEocOJ1SBE2yxDWYcYk4QRh5oTw079X720FG9sAsVcPXxaMoM0l0DRCONo05x9X vUIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789664584; x=1790269384; 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=qqeexVrUP7S+bjRwHH7RDoI2I5dpPVlDr3aItml2BS4=; b=F8uQdc7l59/oIGhTaWtq6/qYsDExRXoEZ3zNfu4J8Gi4hkjbq9rgMG6GJun4JaFNy0 D/T/m19XppAX/TJx+wlq5kY1ffIVoKtPlxUuVRuH28JoubQ+W+AQAcpMNd++Tp1WOmi+ vHcyX0KnOtmwFdIMGzyxTR4sbSWqwTqWndaqcDvr3V+tvx97cP43Ykm4HDcLOSw1399k LqUtvt0x3HTB6Cq4r9ovHfq3n5dfInHVVEFytgF2oONTJqHCfJ09GaPYcw04xqkN4CS1 D25vIljCCl/1acS0Hw+GgJylhx/1JJZiqVU7n/CMX2GlX4EEoMq13UClOxkwvfNPqaY/ TLqQ== X-Gm-Message-State: AFuF++nOLv0Ef9TEAwMWm9PzDy3+bVcy16NphvzcRSJl0beyddDzkySI nZsgjYU81NIDYIn7AgnKbpbrKsFWGEYN6F2yIyVleUhDJb9m8qmfsvqky4SauPCGf9Y= X-Gm-Gg: AYBFou07Hw/SpHoaWcuqbqy0iw4JA0husBXyE3XoItdFF93DVBbs4yaQ3uEtNcDxAJ+ kibLs8Z05w/M6TCD44yfbgGlEOA1WN+OfTawDFdfUQVeRgAd8n1ct1tzNeVLxnkGtPur4uPZEQh B2TP/A1gzHYpv3jNbm6/mmNK9tSZVHW1GsIs9Odgzv8fahJiCapFTO6LRl5NmRnE7z30naP3hTS N+xnGBipwmC3xia5z3gQm2P7KnZdnuTWzQPbq/UhYcWFnVvJy7PvNDbuPAmKhK1QihGR/20CgH7 2cbYVr0nn3FIbl7SqTAeNVvqxAFsYHuxFjic6Uu7s3Ff+KLi5Ji4Ua4LOPtquBwPwhVlRRSx+b3 zJqgZAnNU4971eJAF2vSQ/TU0c/zWRAQcWGV3owjtziP0qQSUHApFPSn6FHwRaBnMhm8OAHxQp5 Rl9Ta8TPSrj6BUWTqxwHFlruOM5ae8YiDij/tgl+e0dVlRq7EOmZ8rriTpZGz7qFNmLlYx4q0= X-Received: by 2002:a05:6000:2992:20b0:487:64b:ea03 with SMTP id ffacd0b85a97d-48713c056damr4437989f8f.10.1789664583856; Thu, 17 Sep 2026 10:03:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Helge Deller , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , qemu-arm@nongnu.org, Brian Cain , Thomas Huth , Matthew Rosato , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao , Warner Losh , John Snow , Eric Farman , Cornelia Huck , qemu-s390x@nongnu.org, Pierrick Bouvier , Jiaxun Yang , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Richard Henderson , Ilya Leoshkevich , Laurent Vivier , Brad Smith , Kyle Evans Subject: [PATCH v5 17/17] gitlab: drop check-tcg from clang-system job Date: Thu, 17 Sep 2026 17:56:01 +0100 Message-ID: <20260917165602.3405537-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917165602.3405537-1-alex.bennee@linaro.org> References: <20260917165602.3405537-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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: 1789664662457158500 We have no cross-compilers in the fedora image so don't bother trying to run the tests. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5f21703645b..a97cc0b20b8 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -441,7 +441,7 @@ clang-system: CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-ubsan --extra-cflags=3D-fno-sanitize-recover=3Dundefined TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu s390x-s= oftmmu - MAKE_CHECK_ARGS: check-qtest check-tcg + MAKE_CHECK_ARGS: check-qtest =20 clang-user: extends: .native_build_job_template --=20 2.47.3