From nobody Sat Sep 26 20:51:33 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=1789503489; cv=none; d=zohomail.com; s=zohoarc; b=c9+rUXz5ZtRHOyHoTAFwH7hM8haGZvF8DOvxJFud1mYlTK9diM9n2+PqEiT9EEDYATHiaWZuDvt6ppftIYYseTUp+uiDNLj6zZ4vNtc4QIhc2VT/ylLzeseyY8C1ASt1+dzXvhx0od3OLstD58NdGE1/4gn9f6zj1CmLPGEtlbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503489; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hjPHD/mcpiasajSkyC52me7tbqriG3hFLgZ3941srEc=; b=XjHkBqRInkGwDqNPDXo08pEpSMUbd+XayxrmEljlcS/unTQ1eIA6fp1lsLhijrl/NktmI54nt80HA/sjeDm08X8+ZwIQE46meTAtS6QSZ54XWW3On5wPmTRLtndQdAOi5U+1sZCwpbWth3s+h3GXzMlFLBnhj4U5I1U+MLDUMyA= 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 1789503489479941.4980413353524; Tue, 15 Sep 2026 13:18:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Zb7-0007IV-IR; Tue, 15 Sep 2026 16:17:49 -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 1x6ZZb-0006sI-Vq for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:18 -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 1x6ZZW-0003HG-NO for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:11 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b912d3931so1517245e9.3 for ; Tue, 15 Sep 2026 13:16:06 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83b031c3sm20245415e9.11.2026.09.15.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B41F1616E3; Tue, 15 Sep 2026 21:16:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503365; x=1790108165; 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=hjPHD/mcpiasajSkyC52me7tbqriG3hFLgZ3941srEc=; b=yFD+BTY42uMjQMeohkff027v9+iy4q4FXPhAIJNujuI7YZIZPOE8lsuGuEzWAwo/ZN 3lLjEx90+xahcXX9bjcAt4Cq0gNmyWZOlbN4Nh4rLokg2wM0Gu7B3RWcLrqEqIc7MvoU Yis37nA7uSZ/oSvWiRHmP8Ypb5xlD+WDcC/eaBhU4Lxk5CrRCsGydfZm7QdOxOfxSpmx 2ezA68gbCh4sxeuGNwNjJWe7Q/SCOdQN5qkCtr0bJeGDgIo3XRN1jqHL5u7Rkr8VfvT9 RoKfBb4PnoLZgoCtaHa7Gq+wt7eFBeChQgJ6XTESNUALdCMUt0pFhqSWUj4SMSpA8EJX zXNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503365; x=1790108165; 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=hjPHD/mcpiasajSkyC52me7tbqriG3hFLgZ3941srEc=; b=hwlx8WmM+haKZ24djPYXL+kUxMifxQOLczbugxsPvrKekdNR+7ag8eHT+tXqjsLW2H UUDG9lYjQ7+uwBduCxu0dByaGaR7KdBHVwTNhw70Fo4m/FcEC/z/X3v5RJRwpr6PTuCx a/aTWYQJr6R8bqYN1RmJxpsU7bk3CCPiq5GOvlISAQXsk6nSRdIVOi4RU9anAbinmX0t P92ZB//aTslbfpqMP4Bsp5dzIQfuSQJSECpNUkTd8DHzivPWXnZtbEIwAsjj+QVMXYs/ wtBDLicU55Sy6TnU2GTY3yVUmc3UivvWcnVZ7jUkUAFASjvYyG28aRqUlhm7n7qYOEoE mjpA== X-Gm-Message-State: AFuF++mxfUudZmZBB8fei37QKnEjdY0YUachlmCPEZ1r6oOl4cEflDt7 0NAQiu5lrvhaNOEKh3aUZD7kyFzjLc6dwOf3j8OELCOx0cqNOD33b4uSD+8YiEJpdm4= X-Gm-Gg: AYBFou10DMwEKzm4r/4gfH4GdnsG01ZEsvBi0MS2nA2f99uNdlD1K+40SvS71WZME3k bzgxtJrswlFJmZI+/HpqTeXGegAXR0JSQHJEH9MWZQNlZzntNJOO2j2oT0gNln0QaMKCAJlH33H 0koHU+kWoI6B3O6ddDxuoXx9VFarnr4yosY2ukC7rCotOx+YQ0MJ3unOX1Y78f+aDk4+zOpCgKW iddQjvHdPpK93W5xOJl9xkQZuLSc3p8xUmSCOvzG0CAixSAoirPaSGOeR8W5nsZguCTmZcNzAg9 lH/nP7rQ755pNmZmRIjx6g1kP2uKeBcX6aBB3ubVeq+gDIeYf0mWJA6PoUU1kDYa0ScEr46+Zn8 HcagxlQwikysWVvcHlREUgI/I6Ipfh5KTjNBYLuR31PjKiOFNZQ1ja2YAcFAXLoog+xfvcaoo0O SxlvT79Wy3Rlu1UQx+tV0OpjCBumg8qYb22FBRRc5KlCLRQx1I8rjFkOOVXNZkJzWb3aGFJGw= X-Received: by 2002:a05:600c:35c3:b0:49c:dada:f57f with SMTP id 5b1f17b1804b1-49e821ffe2bmr40791415e9.7.1789503365245; Tue, 15 Sep 2026 13:16:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/15] Revert "configure: remove cross_cc and gdb detection logic" Date: Tue, 15 Sep 2026 21:15:46 +0100 Message-ID: <20260915201601.1207839-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503491674158500 We want to restore the logic to configure as it's also used by the firmware builds. This reverts commit 031f935567ab8abfa4e84682ecea08915ca9656d. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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:33 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=1789503471; cv=none; d=zohomail.com; s=zohoarc; b=Sjp0pkWh73frMQTNTbp90xnl1+CPLvGu6R8aD220fais+FGWZ9BonMMpMc49VAz7VYJ6lkFoH3RVuOROo2oOWeXpifYcokXnC2t6KUcAfaV/+6khVIWK3gujASG8H9vvX/kD/l3YIDBkmawNGC3OR3nVF9GvkLZk4xyEjvnXPnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503471; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q6i/fKvDOkc3Xva1aph4Fy3PVBJEeCECB3HY1BGCQz0=; b=i7ArIul67cN4kqZejAddqYYAA6zEnM7jW6u4jyITYO5agJi1DCMKhOUNqy2gjTbroSjsIL/nOlc9/7heml+WkyU8oq4fy+UCQtP8f4Hf190NrojWkp9bggMhmJ26OMJFgxMeA/6eSHtzQ9JW8BS4PXsgKl4Zo/uWG4XeHX4dGBc= 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 1789503471347364.3333172182897; Tue, 15 Sep 2026 13:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Zal-0007AU-So; Tue, 15 Sep 2026 16:17:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZZ-0006s5-Ox for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:11 -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 1x6ZZV-0003Gl-CA for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:09 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-48583cc7ab1so51565f8f.2 for ; Tue, 15 Sep 2026 13:16:04 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf462cesm1404953f8f.37.2026.09.15.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CD5F761785; Tue, 15 Sep 2026 21:16:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503364; x=1790108164; 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=Q6i/fKvDOkc3Xva1aph4Fy3PVBJEeCECB3HY1BGCQz0=; b=fWV0MCEy6K+QYzJhxda50cVJ5Pq+U7vRzmGzYWikrpv0j01B0tHvX32edGC69ZpgXw i7YKszJhff102G5Qv70e3goAIwAIaT6aGcocud7futY8PYuPIs4HqEWOwz1jYyNbtyr4 96aPOpIDGsafPWpAWMu2bgdIbEI8AyWdvbmOVlpQKodHqI01mNODercgGLFgCZwa9tCZ FM2w7s1HoVzQoS6SfKPKLNxqMOaUZr63Ymt8we4CMHEdgZECwYzE+O7P0y2Ra5gCA9gj 5AZyhEEfTmADahACvWQVHrZngADwRmyIZ+XlieZRWe3tY3Eu9JnMLiGbOo0yEflPHAa2 f4ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503364; x=1790108164; 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=Q6i/fKvDOkc3Xva1aph4Fy3PVBJEeCECB3HY1BGCQz0=; b=KLC01jogp9u5VjsBP8ZceQPl5rE8IBNaYpyqCaxhrEi70SyLWEOfwstLNeQyI8MbDb Cz3rGlgDEfWkxCk7bXsT9J1jsoF4inJ8c1Aej8CWTk+1517B+Wg6wwibYTe4XzQbooHU AP29iRHNef2OneZKq1klvr4ieT3tPF3ETEBQiPNtK3VteDs+Dn2WXL9Pk57mVy54kttx ik5SePUjahFNCmG2doxYhkgwKcDSjpOKY3fHQLyQyjpsZhnJqd+t3yb6CNuLBqfwXrxI FIhy6xwb3ldFqrH8POLpWl1hUpNB7JGw9J2Bn28e+a+aLKNGN4Fb40QKMRPgQM7buYza 77xw== X-Gm-Message-State: AFuF++kEYD6EAPhBmAtVI5V46uIbKMdyKLQSQCc7I1n4zny2UFgkrCkA 1am6dtdLKs+POksXn+fJvn15RJL/yjcqm8hhr927vL6UaPSWIbNYDRuirlj0jjRsaGY= X-Gm-Gg: AYBFou31UPWstnXDCdjEBqArxo/T1rC/Dast+b2+4L+vLJNmt6UW9cxIYxQ7AIX6uhe Remfrb0Plt9FW6qbh31S6HsA8jupvmp8FIUeBD5l55zvGLVcF5gaMoAtwzvL7iCLrcySfr0cwLz VbPFRcpLh1LagWh7lWtC7O08aVMZindJ1iJpi1TRsGbHCYgoWKySm0YAfqFp5986z0txCnm6QlJ +2NWZNpJWQT8ZSa0wYLYdYtVtwaaGw5EtXMsj4H3IqIhNnApLQAvctT8Jr4k0dcDdQoLj1B4Skl GKPWpxsO5GTcrhI1NrTILnC/ID3+//pOQxpDWD2db/M9MGBA1TtRMA0/8VB5o6qehVYvbKDFlKL 6YlTFtXjMY/mPCfkDgwmVpeFfpVuKyYVOscU+EwCHdDWhtyPUIFSc5jhjAiBmZuy7BvkzLNSzWS V83GfJknIT/13or1mWfhwZ7WpePuHDmheOoe9zke+AWrxR579rsxEm9gRNzbKVK5ZjymgOlyA= X-Received: by 2002:a05:6000:490d:b0:487:342:d142 with SMTP id ffacd0b85a97d-4870d16b276mr92450f8f.44.1789503363634; Tue, 15 Sep 2026 13:16:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/15] Revert "tests/tcg/meson.build: implement ./configure -cross-cc-* options" Date: Tue, 15 Sep 2026 21:15:47 +0100 Message-ID: <20260915201601.1207839-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503473553158500 We want to keep configuring of the cross compiler within configure so it can be used by the firmware. This reverts commit 7e1d54da6faf10e1fc70f6b3d8247068b80b1597. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e --- configure | 27 +++++++------ meson_options.txt | 89 ------------------------------------------- tests/tcg/meson.build | 31 +++------------ 3 files changed, 20 insertions(+), 127 deletions(-) diff --git a/configure b/configure index 1973f023b1e..aa98cf39584 100755 --- a/configure +++ b/configure @@ -227,6 +227,19 @@ for opt do ;; --extra-ldflags=3D*) EXTRA_LDFLAGS=3D"$EXTRA_LDFLAGS $optarg" ;; + --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" + ;; + --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-cflags-}; cc_arch=3D${cc= _arch%%=3D*} + eval "cross_cc_cflags_${cc_arch}=3D\$optarg" + ;; + --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} + eval "cross_cc_${cc_arch}=3D\$optarg" + ;; + --cross-prefix-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-pref= ix-FOO option" + ;; + --cross-prefix-*) cc_arch=3D${opt#--cross-prefix-}; cc_arch=3D${cc_arch%= %=3D*} + eval "cross_prefix_${cc_arch}=3D\$optarg" + ;; --without-default-features) default_feature=3D"no" ;; --wasm64-32bit-address-limit) wasm64_memory64=3D"2" @@ -618,19 +631,9 @@ for opt do ;; --extra-ldflags=3D*) ;; - --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" - ;; - --cross-cc-cflags-*) arch=3D${opt#--cross-cc-cflags-}; arch=3D${arch%%= =3D*} - meson_option_add "-Dtcg_tests_cross_cflags_${arch}= =3D${optarg}" - ;; - --cross-cc-*) arch=3D${opt#--cross-cc-}; arch=3D${arch%%=3D*} - meson_option_add "-Dtcg_tests_cross_cc_${arch}=3D${optarg}" - ;; - --cross-prefix-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-pref= ix-FOO option" + --cross-cc-*) ;; - # cross-prefix is just used as a syntactic sugar for -cross-cc. - --cross-prefix-*) arch=3D${opt#--cross-prefix-}; arch=3D${arch%%=3D*} - meson_option_add "-Dtcg_tests_cross_cc_${arch}=3D${opt= arg}gcc" + --cross-prefix-*) ;; --enable-docs) docs=3Denabled ;; diff --git a/meson_options.txt b/meson_options.txt index e3570a418aa..66d3689d14c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -393,92 +393,3 @@ option('containers', type: 'boolean', value: true, description: 'use containers to cross compile tcg tests') option('container_command', type: 'string', description: 'command to build/run containers') - -option('tcg_tests_cross_cc_aarch64', type: 'string', - description: 'cc for aarch64 tcg tests') -option('tcg_tests_cross_cflags_aarch64', type: 'string', - description: 'cflags for aarch64 tcg tests') -option('tcg_tests_cross_cc_aarch64_be', type: 'string', - description: 'cc for aarch64_be tcg tests') -option('tcg_tests_cross_cflags_aarch64_be', type: 'string', - description: 'cflags for aarch64_be tcg tests') -option('tcg_tests_cross_cc_alpha', type: 'string', - description: 'cc for alpha tcg tests') -option('tcg_tests_cross_cflags_alpha', type: 'string', - description: 'cflags for alpha tcg tests') -option('tcg_tests_cross_cc_arm', type: 'string', - description: 'cc for arm tcg tests') -option('tcg_tests_cross_cflags_arm', type: 'string', - description: 'cflags for arm tcg tests') -option('tcg_tests_cross_cc_hexagon', type: 'string', - description: 'cc for hexagon tcg tests') -option('tcg_tests_cross_cflags_hexagon', type: 'string', - description: 'cflags for hexagon tcg tests') -option('tcg_tests_cross_cc_hppa', type: 'string', - description: 'cc for hppa tcg tests') -option('tcg_tests_cross_cflags_hppa', type: 'string', - description: 'cflags for hppa tcg tests') -option('tcg_tests_cross_cc_i386', type: 'string', - description: 'cc for i386 tcg tests') -option('tcg_tests_cross_cflags_i386', type: 'string', - description: 'cflags for i386 tcg tests') -option('tcg_tests_cross_cc_loongarch64', type: 'string', - description: 'cc for loongarch64 tcg tests') -option('tcg_tests_cross_cflags_loongarch64', type: 'string', - description: 'cflags for loongarch64 tcg tests') -option('tcg_tests_cross_cc_m68k', type: 'string', - description: 'cc for m68k tcg tests') -option('tcg_tests_cross_cflags_m68k', type: 'string', - description: 'cflags for m68k tcg tests') -option('tcg_tests_cross_cc_mips', type: 'string', - description: 'cc for mips tcg tests') -option('tcg_tests_cross_cflags_mips', type: 'string', - description: 'cflags for mips tcg tests') -option('tcg_tests_cross_cc_mips64', type: 'string', - description: 'cc for mips64 tcg tests') -option('tcg_tests_cross_cflags_mips64', type: 'string', - description: 'cflags for mips64 tcg tests') -option('tcg_tests_cross_cc_mips64el', type: 'string', - description: 'cc for mips64el tcg tests') -option('tcg_tests_cross_cflags_mips64el', type: 'string', - description: 'cflags for mips64el tcg tests') -option('tcg_tests_cross_cc_or1k', type: 'string', - description: 'cc for or1k tcg tests') -option('tcg_tests_cross_cflags_or1k', type: 'string', - description: 'cflags for or1k tcg tests') -option('tcg_tests_cross_cc_ppc64', type: 'string', - description: 'cc for ppc64 tcg tests') -option('tcg_tests_cross_cflags_ppc64', type: 'string', - description: 'cflags for ppc64 tcg tests') -option('tcg_tests_cross_cc_ppc64le', type: 'string', - description: 'cc for ppc64le tcg tests') -option('tcg_tests_cross_cflags_ppc64le', type: 'string', - description: 'cflags for ppc64le tcg tests') -option('tcg_tests_cross_cc_riscv64', type: 'string', - description: 'cc for riscv64 tcg tests') -option('tcg_tests_cross_cflags_riscv64', type: 'string', - description: 'cflags for riscv64 tcg tests') -option('tcg_tests_cross_cc_s390x', type: 'string', - description: 'cc for s390x tcg tests') -option('tcg_tests_cross_cflags_s390x', type: 'string', - description: 'cflags for s390x tcg tests') -option('tcg_tests_cross_cc_sh4', type: 'string', - description: 'cc for sh4 tcg tests') -option('tcg_tests_cross_cflags_sh4', type: 'string', - description: 'cflags for sh4 tcg tests') -option('tcg_tests_cross_cc_tricore', type: 'string', - description: 'cc for tricore tcg tests') -option('tcg_tests_cross_cflags_tricore', type: 'string', - description: 'cflags for tricore tcg tests') -option('tcg_tests_cross_cc_x86_64', type: 'string', - description: 'cc for x86_64 tcg tests') -option('tcg_tests_cross_cflags_x86_64', type: 'string', - description: 'cflags for x86_64 tcg tests') -option('tcg_tests_cross_cc_xtensa', type: 'string', - description: 'cc for xtensa tcg tests') -option('tcg_tests_cross_cflags_xtensa', type: 'string', - description: 'cflags for xtensa tcg tests') -option('tcg_tests_cross_cc_xtensaeb', type: 'string', - description: 'cc for xtensaeb tcg tests') -option('tcg_tests_cross_cflags_xtensaeb', type: 'string', - description: 'cflags for xtensaeb tcg tests') diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index d41a228fb3d..ce208e686ff 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -185,8 +185,6 @@ foreach target, plan: tcg_tests continue endif =20 - cc_arch =3D target.replace('-linux-user', '').replace('-softmmu', '') - # Detect duplicated executables/tests, and report an error to force user= to # choose how to deal with it. built_tests =3D {} @@ -204,35 +202,16 @@ foreach target, plan: tcg_tests endforeach =20 cc =3D find_program(plan['cc'], required : false) - cc_cflags =3D [] - - check_flags =3D [] - check_required =3D false - cross_cc =3D get_option('tcg_tests_cross_cc_' + cc_arch) - if cross_cc !=3D '' - # we make sure cross cc exists - cc =3D find_program(cross_cc, required: true) - check_required =3D true - endif - cross_cflags =3D get_option('tcg_tests_cross_cflags_' + cc_arch) - if cross_cflags !=3D '' - cc_cflags =3D cross_cflags.split() - # and that cross cc can compile programs - check_flags =3D cc_cflags - check_required =3D true - endif - cc_from_system =3D cc.found() has_cc =3D cc.found() if has_cc + check_flags =3D ['-static'] if target.endswith('softmmu') - check_flags +=3D ['-nostdlib', '-ffreestanding', '-r'] - else - check_flags +=3D ['-static'] + check_flags =3D ['-nostdlib', '-ffreestanding', '-r'] endif =20 cmd =3D run_command([cc, files('test_cc.c'), check_flags, '-o', '/dev/= null'], - check: check_required) + check: false) has_cc =3D cmd.returncode() =3D=3D 0 cc_from_system =3D has_cc endif @@ -368,9 +347,9 @@ foreach target, plan: tcg_tests endif endif =20 - cflags =3D cc_cflags + cflags =3D [] if 'cflags' in setup - cflags +=3D setup['cflags'] + cflags =3D setup['cflags'] endif =20 if 'cc_feat' in setup --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503496; cv=none; d=zohomail.com; s=zohoarc; b=HzwnYfkwFBoB/SLo+s7uW2nNimFQGQ1VHMaqym9dPibOODAbR0OUnm01UFyNw//2gPdRWLSoZpi26qoEJ4ZDhCFWBAnGQC2DRws2L34b1I2cBCVPL6x7OnDk6vI9kFo/plrc/+87XjnmVmYdLUs0NHKWiw7Qfq6m9X9K/grXFC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503496; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zaMYvSZ2k0eHaB8BN//yVzz35zyXadmvTP++fUkW3Ps=; b=nrNSsee5AQiUl3teMtOfcOcA5SiAe7uffR4xwI6a/s2aZrQ6GDQs43VIWjoQLuNyXzRmoLJ/+gKRxQ21V6cwSoDudGFByg619yQsDfgtDohtMbGE1vacqdUSUpVILLZ3JGBx2fl1RjWGN7oCyqhFGRrTZHAHF6V7FCeJqpzYaiY= 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 1789503496977134.8251028926892; Tue, 15 Sep 2026 13:18:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbN-0007YV-9l; Tue, 15 Sep 2026 16:18:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZZ-0006s4-Jb for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:11 -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 1x6ZZW-0003H7-FF for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:09 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e6b885ef8so1304845e9.1 for ; Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da071asm16254455e9.8.2026.09.15.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EAEF16178D; Tue, 15 Sep 2026 21:16:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503365; x=1790108165; 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=zaMYvSZ2k0eHaB8BN//yVzz35zyXadmvTP++fUkW3Ps=; b=EzeupwjNMzuTXORwDlhfhGr2w85IXYfIy9zoQm5SRHvSPDZacEawX6x/tdmyU9rSgQ tumF9KPGmwLVdqzmllmKWlSuLDgVxil8Vh10xLfl7ydFzMDx3tuDalRUDKNeyR1iNlv0 9Uqlzzr8YTezF0lP+gzWh1aR3ign0CXdUVN6G7rWNBHsThc0Bpv6ZdnL6wE2vYR3Sz65 IhIZLdANgELVw8VoJY8Lm15CCYdmbahtBr5YHiwjSvr/jIC3PAziL1dWbKDQPwF6rgmu p5OLEkXqw86VRluPzm3sHde1HZbUpAKn6TnebvhI/KHvFlLUmb78VhEYhBliJGaaRPCA Swvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503365; x=1790108165; 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=zaMYvSZ2k0eHaB8BN//yVzz35zyXadmvTP++fUkW3Ps=; b=XQ26D5ovdo2KA0q1OXoZv5B3puS9CJvpMw6Un6GmQT96TOPjDt3frJc/Qx5reqV2X6 LQuePUAf/WxN80xdhG/k44mt6YgFX85IjpMxcqjToiw9fFdnkR9otCwqtAJGb+bco6td rXzvWjpkRGeISr50kNJVYpXFFk+s4+kXHTWrjUMrn1IstL0nTZ2wiveWnq1BXXmd/Pvt btGwOdAPq1mJm73QBqC4LQ6XRZ8anR7JT0g2rn0mkD+NcygD22HxsMuN3pFKpHJOWS4c CrnMKLX4vVDHFZ3ZzjvoFLLbG9fPDzbcaRxmcCwVCplx5wMFvguhekV9nBCXT+iLM1Jc CH6A== X-Gm-Message-State: AFuF++nQIJ9TGkoRrLz0mJHHpX40rJLZSqgHy1f8D748UpwHyRl+noO3 TEeR+B5cmhnkVFaU6oEJ/UYzpue+NrQ7BjMrBpHd13WRGVnz0tr0K+5I1hLbX+pnObI= X-Gm-Gg: AYBFou0SeS8c03jIXnZfXuU0ot5ndUP2DzzYECMysX62N9bveB/WXaihMz4hVcX30H7 yLztys0875Y0qdURVKK/4l5OoqTTMz2J3sjcB+KCK48L3FKEmiZC882GAsXPcmAjpB89G93BAyf ZTP5+aVJ0qTFeswRRO2PpvF3RYzwJJzrUKUkgJCLdOFzwJWgcmWNpEgmLiQYcOIIanPyWkcT/lO Mh0U4SCG9pVuaA1eRZNhCBAifXnZmt/8ZOvDMhPYoBgZZG3SfTOyfHkx1quFmr+DEWjwXwwsuEz E92SmH6XF0jPmVB9f54RleXOFGHHHG5kWLiRiKgNrQ5Ax6IA2p+5Jl56rKftVTP6mICNJLIY+b0 ocwZke9YTaKq3+6uSKlkUp6KaSK8wOX7c4btHx7voVb9PUBVVyiwW4IQ7lb1uvdQ9GCnrqc8Tpd telTuM8B5LK8fWzJnI0gewd2TkmomBOpGWoLBphLvnSnvTFMwsBvGZ+SIT/FOF3701naN/ckIku If5SRjmEA== X-Received: by 2002:a05:600c:4e90:b0:49e:73e7:888c with SMTP id 5b1f17b1804b1-49e7a65ce45mr116957105e9.4.1789503364637; Tue, 15 Sep 2026 13:16:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 03/15] Revert "tests/tcg/meson.build: implement ./configure containers options" Date: Tue, 15 Sep 2026 21:15:48 +0100 Message-ID: <20260915201601.1207839-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503497278158500 We want to keep the container configuration inside configure for the firmware builds. This reverts commit 522b299ca4316d8cad57f9496ffcba87dcc20719. Suggested-by: Paolo Bonzini [AJB: untangle changes since] Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Tested-by: Eric Farman --- configure | 11 ++++++++--- meson_options.txt | 4 ---- tests/tcg/meson.build | 25 ++++--------------------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/configure b/configure index aa98cf39584..cec6f18f857 100755 --- a/configure +++ b/configure @@ -172,6 +172,7 @@ fi # some defaults, based on the host environment =20 # default parameters +container_command=3D"" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -259,6 +260,7 @@ ninja=3D"" python=3D download=3D"enabled" skip_meson=3Dno +use_containers=3D"yes" rust=3D"disabled" rust_target_triple=3D"" =20 @@ -725,11 +727,11 @@ for opt do ;; --disable-plugins) plugins=3D"no" ;; - --enable-containers) # enabled by default + --enable-containers) use_containers=3D"yes" ;; - --disable-containers) meson_option_add -Dcontainers=3Dfalse + --disable-containers) use_containers=3D"no" ;; - --container-command=3D*) meson_option_add -Dcontainer_command=3D"$optarg" + --container-command=3D*) container_command=3D"$optarg" ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; @@ -1716,6 +1718,9 @@ echo all: >> $config_host_mak =20 echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak +if test "$container_command" !=3D ""; then + echo "CONTAINER_COMMAND=3D$container_command" >> $config_host_mak +fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "MKVENV_ENSUREGROUP=3D$mkvenv ensuregroup $mkvenv_online_flag" >> $co= nfig_host_mak diff --git a/meson_options.txt b/meson_options.txt index 66d3689d14c..218d003a80b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -389,7 +389,3 @@ option('rust', type: 'feature', value: 'disabled', description: 'Rust support') option('strict_rust_lints', type: 'boolean', value: false, description: 'Enable stricter set of Rust warnings') -option('containers', type: 'boolean', value: true, - description: 'use containers to cross compile tcg tests') -option('container_command', type: 'string', - description: 'command to build/run containers') diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index ce208e686ff..e966774c8c2 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -79,28 +79,11 @@ if gdb.found() endif tcg_tests_summary +=3D {'gdb': gdb} =20 -docker_supported =3D false -container_command =3D false -if get_option('containers') - if get_option('container_command') !=3D '' - # make sure command is working - container_command =3D get_option('container_command') - cmd =3D container_command.split() - run_command([cmd, 'info'], check: true) - docker_supported =3D true - docker_wrapper =3D [docker_wrapper, '--command', - container_command] - else - docker_probe =3D run_command(docker_wrapper, 'probe', check: false) - docker_supported =3D docker_probe.returncode() =3D=3D 0 - if docker_supported - container_command =3D docker_probe.stdout().strip() - docker_wrapper =3D [docker_wrapper, '--command', - container_command] - endif - endif +docker_probe =3D run_command(docker_wrapper, 'probe', check: false) +docker_supported =3D docker_probe.returncode() =3D=3D 0 +if docker_supported + docker_wrapper =3D [docker_wrapper, '--command', docker_probe.stdout().s= trip()] endif -tcg_tests_summary +=3D {'container command': container_command} =20 # plugins come first, as we need to build the list test_plugins =3D {} --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503413; cv=none; d=zohomail.com; s=zohoarc; b=YUFQzp4W99rMsCxBzbXr5J+E+l0PNPvbFXqhE9zB7v1qWeDk7rQn2PKYGX6fwHVtSMQ1xrVo56QJn/2FXpUGFyA7hxu4EMlGNUqFSDK6/PkYDLYTZ9iLJ0po+avPIrBKKVGAbh4FekoqhU3hoefhgpS5wVBb6lJbEoBVONqkyAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503413; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=D29PZr3H3cfpO+id91B+HGAP+7sHnoWBt0JbrktTLys=; b=U0v9AospHONgc7pGobr2dNvxNzv8J3US7XnQVJiQucEUJvSADBtLJb05MVapch1aXjIHeZHls+4tDkLJDegdT4MpFxwmw9Kv7SCN1LA02nN9t99B9UHN5HW1pTmWj2qiH68RgcjGm42zLcjq9ve8UwS/FyRMpvG92CPrW0fBkMU= 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 17895034133461016.5649011075036; Tue, 15 Sep 2026 13:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZZx-0006vm-V6; Tue, 15 Sep 2026 16:16:35 -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 1x6ZZZ-0006s2-Hq for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:11 -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 1x6ZZW-0003Gt-NN for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:09 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cc9f581c4so877075e9.0 for ; Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83d9057dsm18521725e9.3.2026.09.15.13.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:02 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0B4E86182C; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503364; x=1790108164; 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=D29PZr3H3cfpO+id91B+HGAP+7sHnoWBt0JbrktTLys=; b=W4V0HeWa51g4WF51GkQHEX6u0Pd6zwGdXUVV2B7dc9L/9A4Jr5E9bvYpoS6ZNoDTxt 2gaC54Yk7LtdB9N/Nt52lrINbsnbSPlh280t75nSumaoLSfqDesRZmOpEyyIvuFi+Dbf 8tGUMZ4J9+S+7JexbKmXfDzN+jt0Gd/d2dt7JxdcMa/DFNaAJv+3buoLBGEdlDg7cAon g/zpnwgDSBjPgMQJZdmrq7FzHnQUvXcAp8qWA+mPQ2NCb8C8DrXgCPoA4YJ9GEm5mHDe kCT1qL4VPXFX+gy/TnUneufPJDkA0m7gWH+kXyKs4UwVRf8powcw8F8GYYwsdhz5RXwS Xl5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503364; x=1790108164; 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=D29PZr3H3cfpO+id91B+HGAP+7sHnoWBt0JbrktTLys=; b=zzEZ9clvfvgyobhk71pCywE8bp6260i5WmFniw8J+5pV3FhDVU7MtfkxvNnje2GJQ9 gl3QusFsHesV3H8MU0PebTEXy51QS+b8MnrWXn5W7V1cCzQpVbcRQPaBb/P4ay4tM5L9 Ca5K4D+At0D/Hp3JaVONXE8B3TFlGkHJ5P3u9jnukvR1r7VyEnN2VEyGk6xu92/klDDK 9RGapk61pcTBh+bSqRhB53sWnPWp3p5yoNb0vNg/Do3h1vG93Qfp+7/VKSHNEFBRotNu SIwFKNvUsZLFphTXxEyg3Cb9VvFgKz1wGNNFad9AnKJ1HHBq+nJ3ykzXFsiuR7t8SOBZ npAQ== X-Gm-Message-State: AFuF++lO//Cg0vmZRN6e77b1emf4IWiXAduFk4a1cITiFlB9+vvDBDRr MQW0zExCMOCl7s5kociIJIENOygsg4eeKWY9qbExpQPyw3lZUgyO9IRsAhg3iOpfi0E= X-Gm-Gg: AYBFou1/vNKnCQa4mTHYraTgyJRYXSZVq+eBxt/v7/T1jvU5s95cH0KnbknhTQmlivO PjRtRibqRxqp3C706tRMpe/xmWtHkQetablv9IatLlkiMN5SJJdDy3yRwYOo7eO95tlANEQh6jj x3u4H2TucVIwEaTo/g1i/dHKdvTcYoDMGolHYsqQ0th4EpzHqZUi0p+Bf7vYIngolZKsgL0SACK M3a+3CDlI+D3uRH3ylOLeHvz3rWQSXYsRi09KuKKtICDOkzzYVsZGZoLN+jKIQ9BxdUhG5NPDxN 18hhGn0rbDvEMH9beJSaeIUVLfAaDFgUTLt3EWdHW4jyrJYm3iSKp7Qvene4T1TpemKjXX0ngRb f5SMIU9SvJe/bQlM0SHYap3JWCwk9u1c1izgZp2524G3li3xuKZnKZK5rmf3OTBZSPYjEE9Q5Kw S5QqZU8uYZPsIiIm2VbQLZbvpg51NUTVblFL9Lgn7o+cKsK4rDVzxY/u5L0FiMwEEoOLGZNmI= X-Received: by 2002:a05:600c:3104:b0:49b:8f5e:51fb with SMTP id 5b1f17b1804b1-49e7d722a60mr70912635e9.3.1789503364137; Tue, 15 Sep 2026 13:16:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 04/15] configure: correctly honour --disable-containers Date: Tue, 15 Sep 2026 21:15:49 +0100 Message-ID: <20260915201601.1207839-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503415715158500 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 cec6f18f857..7fb90d26e5c 100755 --- a/configure +++ b/configure @@ -1398,6 +1398,7 @@ probe_target_compiler() { esac =20 for host in $container_hosts; do + test "$use_containers" =3D "yes" || continue test "$container_command" !=3D "" || continue test "$host" =3D "$cpu" || continue case $target_arch in --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503583; cv=none; d=zohomail.com; s=zohoarc; b=fy7YBS7f3aoYcophKrUykA+vYT3Dh/tkHqQxPM5qwDOU6t7ZY50co5l9UQu7NlKMWFJVViVbJTnGyK0M/ItflvWEFiLM4y2t7Lz3cO/r6c3UlCrlVR3c037ePJ429W4WK0+F3SI5tszDBBMhCaSfqXb7HwRlSpZLp5EdGQIyDh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503583; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GUTqG0DlS0OOofGrd9CW23z9URjTrNkTI3zBmCNQUBg=; b=HofMjl9d/aOu7U6WlwF0XZ90RSoisi3o+CoLpuHSmPWBppsi7wR9n5v5OhKq7jcHLi/qPMMiWhYIpFsZRWeds4fWhzpu2/Cfon3UBrT//udvE6KZ7XyJyZ+QPP0KK3o5X++GYfjkOIbd9Ovp8E2KZVlLqk0FLY49SsjbYp5nxYE= 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 1789503583301878.2447350523925; Tue, 15 Sep 2026 13:19:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbT-00082v-QX; Tue, 15 Sep 2026 16:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZo-0006uc-P0 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:25 -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 1x6ZZk-0003Ih-Ey for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:23 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912df756so1505075e9.3 for ; Tue, 15 Sep 2026 13:16:10 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da071asm16256555e9.8.2026.09.15.13.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2D60E61839; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503369; x=1790108169; 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=GUTqG0DlS0OOofGrd9CW23z9URjTrNkTI3zBmCNQUBg=; b=ZzLh36+fR0wbWLgf52ujrGmx2sMhaMu2R5pBMepS0GTi9R8AFcncPgTIK/GaRKkJn9 docHq9w0GFAwjg3VFDFwm9AZEBg4Whlu/Fy/VEbJHURqAVJiUVWG/s6CGWKrFkDGAlyw wYBgn3T9DVc8kXRodiVXUhOSk4a+Gzj0sxnAunzM2TTDi6bpAucwDSWnL4avgfnkbhq+ /F6MiyZdYb0ksW5oHJDA2+7aF84BIHzuo6dmNRbyJqtKUupbc/OjW0M+shaHGFSYpKe+ nYjwm+AFEC4tTgoxziFQ6g/Qp9ykodrj4Wc8hxaoXdUk6u8BYiMR0t9PgqQE2mMKrdM1 O+6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503369; x=1790108169; 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=GUTqG0DlS0OOofGrd9CW23z9URjTrNkTI3zBmCNQUBg=; b=ob2aOneBRvvWwOwmqylJF5XsndSdrkHhvPRqcJ4vl8k46HWI15qD+X6iVAqajmyGbE spo194VG0NsMT1RiaSkHp5ZzvT0AcL/lH+GLPJnMHvJI8n3UBdYZXYFK2VSr8TdApt39 xs21ZF/laLBXzzitzxcSKsqJ3LCTAB2SWBhJNonEKDvoJNyPRtNErXVPRe6hUujPMc9l 4w5amudYUg+PNzcEPWWSdOwnno3J3KAZv8XGUMEbC79343+XwZGX+ro/BraMvg+Aqv+f KAiWEddN2OWzkAm16MuALnBsKqXAGrG9pbOJpGmxRRAQ1al+sU1qwF5qpyRZNckHvsHg +5Iw== X-Gm-Message-State: AFuF++nIT/gH046iV0dx12RrylwZ3WVxpwFi3L3FbZa1Y9D8FFLgRa4m aJ7RYRR6g1Gnx3gTydcsW92k1GGtPSfDKkxRn7OUJrW3QwYC10vuKS/l0e5cHIENhas= X-Gm-Gg: AYBFou26v3lOv7HD1blxthdkBJI325MZS2PhcftJuPSgqP0Es+tsGbhHsN2cTrp/XmT g3CzAhHTaRfoiON15LV0Y1q+EuFIgZ9rTyjUPnt5kL/wCulQJ8vUw1IHUxyMSmk0TRgtImInA/O 4uqZINcPDJQnQwoZT+ILxOf8bUTylEX/Bj49/xQf6y2yEPY3Vu7ctF3ctvnsKhvwOSdvKLwmzxQ m2U+9HsYKhtnn9v73da7BZyYKrTietGwLL2bvf5LXlYsjSkIqdrrmuRIAMACZkP9ZK6MJIverF7 O/sqdbUyl9OAu7dJhcEsi3YWGCeUdXUd4YbFPQHVqdBu6QjTm0Ut56/wrpASkefbszQ5Haceyy8 pnFA6nyvSDGdcu3Q1bgYu1GW3XrcXY9t+95AOQulPC9you8gqHIC05JEHilI6AXvWt2C6uj5/dq vIcd6QFH8TW7UpKeoPhltgUn1qv0ZRxN9M9/G7O0TzAENANzSBvfNgbHd4gh1ThWyruVSMcUI= X-Received: by 2002:a05:600c:c48e:b0:49d:1de5:ce0a with SMTP id 5b1f17b1804b1-49e822497cbmr37981255e9.13.1789503368953; Tue, 15 Sep 2026 13:16:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/15] configure: re-purpose the tcg test compiler configs for vdso building Date: Tue, 15 Sep 2026 21:15:50 +0100 Message-ID: <20260915201601.1207839-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503586745158500 All the tcg tests are in meson now so there is no reason to put the config-target.mak files in those directories. We also don't need the GDB feature tests or to emit prerequsistes. The vdso re-build blob does use the compiler definitions though so we can emit the details for that and tweak the vdso makefiles to point at the right place. Note some of the vdso makefiles build both 32 and 64 bit versions from the same compiler. Signed-off-by: Alex Benn=C3=A9e --- configure | 69 +++++++++++----------------- linux-user/aarch64/Makefile.vdso | 2 +- linux-user/arm/Makefile.vdso | 2 +- linux-user/hppa/Makefile.vdso | 2 +- linux-user/i386/Makefile.vdso | 2 +- linux-user/loongarch64/Makefile.vdso | 2 +- linux-user/ppc/Makefile.vdso | 2 +- linux-user/riscv/Makefile.vdso | 2 +- linux-user/s390x/Makefile.vdso | 2 +- linux-user/sh4/Makefile.vdso | 2 +- linux-user/x86_64/Makefile.vdso | 2 +- 11 files changed, 36 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 7fb90d26e5c..c89f3c61f7f 100755 --- a/configure +++ b/configure @@ -1733,65 +1733,48 @@ if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi =20 -tcg_tests_with_compilers=3D +# Export the compiler details needed for rebuilding the vdso blobs for target in $target_list; do - arch=3D${target%%-*} =20 + # Skip anything that is not a linux-user target case $target in + *-linux-user) + ;; + *) + continue + ;; + esac + + arch=3D${target%%-*} + + case $arch in xtensa*-linux-user) - # the toolchain is not complete with headers, only build system tests + # the toolchain can only build system tests due to missing headers + continue + ;; + aarch64_be-linux-user) + # there is no BE user space continue ;; - *-softmmu) - test -f "$source_path/tests/tcg/$arch/Makefile.softmmu-target" || co= ntinue - qemu=3D"qemu-system-$arch" + aarch64|arm|hppa|i386|loongarch64|ppc64|riscv64|s390x|sh4|x86_64) + # arches which need a vdso, some 64 bit arches build both ;; - *-linux-user|*-bsd-user) - qemu=3D"qemu-$arch" + *) + continue ;; esac =20 - if probe_target_compiler $target || test -n "$container_image"; then - test -n "$container_image" && build_static=3Dy - mkdir -p "tests/tcg/$target" - config_target_mak=3Dtests/tcg/$target/config-target.mak - ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/M= akefile" + # note container_image is set by a successful call to probe_target_compi= ler + if probe_target_compiler "$target" || test -n "$container_image"; then + mkdir -p "linux-user/$arch" + config_target_mak=3Dlinux-user/$arch/config-target.mak echo "# Automatically generated by configure - do not modify" > "$co= nfig_target_mak" echo "TARGET_NAME=3D$arch" >> "$config_target_mak" echo "TARGET=3D$target" >> "$config_target_mak" - write_target_makefile "build-tcg-tests-$target" >> "$config_target_m= ak" - echo "BUILD_STATIC=3D$build_static" >> "$config_target_mak" - echo "QEMU=3D$PWD/$qemu" >> "$config_target_mak" - - # will GDB work with these binaries? - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches"; then - echo "GDB=3D$gdb_bin" >> $config_target_mak - fi - - if test "${gdb_arches#*$arch}" !=3D "$gdb_arches" && version_ge $gdb= _version 14.1; then - echo "GDB_HAS_SME_TILES=3Dy" >> $config_target_mak - else - echo "GDB_HAS_SME_TILES=3Dn" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 15.1; then - echo "GDB_HAS_MTE=3Dy" >> $config_target_mak - fi - - if test "${gdb_arches#*aarch64}" !=3D "$gdb_arches" && version_ge $g= db_version 16.0; then - # GDB has to support MTE in baremetal to allow debugging MTE in = QEMU system mode - echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=3Dy" >> $config_target_mak - fi - - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs - tcg_tests_with_compilers=3D"$tcg_tests_with_compilers $target" + write_target_makefile "update-linux-vdso" >> "$config_target_mak" fi done =20 -if test "$tcg" =3D "enabled"; then - echo "TCG_TESTS_WITH_COMPILERS=3D$tcg_tests_with_compilers" >> $config= _host_mak -fi - if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { diff --git a/linux-user/aarch64/Makefile.vdso b/linux-user/aarch64/Makefile= .vdso index c33a679c0f2..82ed2011087 100644 --- a/linux-user/aarch64/Makefile.vdso +++ b/linux-user/aarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/aarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/aarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/aarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/arm/Makefile.vdso b/linux-user/arm/Makefile.vdso index ede489e2363..16ae8d7aaae 100644 --- a/linux-user/arm/Makefile.vdso +++ b/linux-user/arm/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/arm-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/arm/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/arm VPATH +=3D $(SUBDIR) diff --git a/linux-user/hppa/Makefile.vdso b/linux-user/hppa/Makefile.vdso index f4537ae7169..78642c42661 100644 --- a/linux-user/hppa/Makefile.vdso +++ b/linux-user/hppa/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/hppa-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/hppa/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/hppa VPATH +=3D $(SUBDIR) diff --git a/linux-user/i386/Makefile.vdso b/linux-user/i386/Makefile.vdso index 95bc616f6d6..ca2e37fa6b6 100644 --- a/linux-user/i386/Makefile.vdso +++ b/linux-user/i386/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/i386-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/i386/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/i386 VPATH +=3D $(SUBDIR) diff --git a/linux-user/loongarch64/Makefile.vdso b/linux-user/loongarch64/= Makefile.vdso index 1d760b1e47e..ceb61101209 100644 --- a/linux-user/loongarch64/Makefile.vdso +++ b/linux-user/loongarch64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/loongarch64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/loongarch64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/loongarch64 VPATH +=3D $(SUBDIR) diff --git a/linux-user/ppc/Makefile.vdso b/linux-user/ppc/Makefile.vdso index e2b8facbb50..6b9be843817 100644 --- a/linux-user/ppc/Makefile.vdso +++ b/linux-user/ppc/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/ppc64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/ppc64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/ppc VPATH +=3D $(SUBDIR) diff --git a/linux-user/riscv/Makefile.vdso b/linux-user/riscv/Makefile.vdso index 2c257dbfda5..2eefdb70cf9 100644 --- a/linux-user/riscv/Makefile.vdso +++ b/linux-user/riscv/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/riscv64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/riscv64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/riscv VPATH +=3D $(SUBDIR) diff --git a/linux-user/s390x/Makefile.vdso b/linux-user/s390x/Makefile.vdso index e82bf9e29ff..51f7c50a2de 100644 --- a/linux-user/s390x/Makefile.vdso +++ b/linux-user/s390x/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/s390x-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/s390x/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/s390x VPATH +=3D $(SUBDIR) diff --git a/linux-user/sh4/Makefile.vdso b/linux-user/sh4/Makefile.vdso index 272c5d262de..ed2cc11b825 100644 --- a/linux-user/sh4/Makefile.vdso +++ b/linux-user/sh4/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/sh4-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/sh4/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/sh4 VPATH +=3D $(SUBDIR) diff --git a/linux-user/x86_64/Makefile.vdso b/linux-user/x86_64/Makefile.v= dso index 26552b66dba..56fe87af72b 100644 --- a/linux-user/x86_64/Makefile.vdso +++ b/linux-user/x86_64/Makefile.vdso @@ -1,4 +1,4 @@ -include $(BUILD_DIR)/tests/tcg/x86_64-linux-user/config-target.mak +include $(BUILD_DIR)/linux-user/x86_64/config-target.mak =20 SUBDIR =3D $(SRC_PATH)/linux-user/x86_64 VPATH +=3D $(SUBDIR) --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503493; cv=none; d=zohomail.com; s=zohoarc; b=CRgTsttVYGE1oqkbzUWavBoTUxtmfrnm/1Y89anoavmydicZbktph97MLz9L/iKEON4YZkSQezTXi3cxigL48uDFdlaDo/UInok51w2girMOaG83Af74h5i33XXMCFzWTM5lkPJ9BL3l6+nsYgD7YzxpCWtHzgNyHjngQN5gHyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503493; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=i2pNwuGcBwt0BxWbSG8CHdPY5nQmjF0lkQPM8IZXhujrjCh5UVRBcZOCdm1YAGyJkbZd2EGlwNHlzByTg+FgE0i/XaPaNCYNmnMOVuhU/9z6Z1JJlMoEaF3xMo6E1pxQYr7dVtYicqk9S68+DXUS/O6BMa12GmU7EQSN0genqPc= 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 1789503493407146.93169345046897; Tue, 15 Sep 2026 13:18:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbN-0007Z2-CH; Tue, 15 Sep 2026 16:18:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZe-0006sS-05 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:22 -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 1x6ZZZ-0003IE-QQ for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:13 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912d3931so1517575e9.3 for ; Tue, 15 Sep 2026 13:16:09 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e84202028sm8631125e9.0.2026.09.15.13.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 46B00618BA; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503368; x=1790108168; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=J5ffZsfKuwsn1F/QQ2FzcwyiZVLzoMBIILibkeTAPsoFnmytOdPm8i/QOnaZk8ksXJ wotXpQL1lmBoTbydJPvizpi5HmKzq2DV1gUulIAQ07sSZ9G2MRzR0cA0nS6MJdIZ88Hz 1Ochdo+fCq7bAbwscUXKnel6Ay5NePMy3QifbNoPlojxzo1F1Y9uR/eu1P7jisdkJg2h YYkGqoq9Q2A52krVNx4TOSdAQNbuHLsEHJCknR3cDU5e6IRATVTZ5MGyPu8qhpDLcHi1 b5bT2XTs4TpehHRHycD+I4o3uEM1iazBeoMSe4IoszjpoLI1IXZw8pZghNzRGO2FZgLw olXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503368; x=1790108168; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Fckjvkn7unttlgUnvhFoPtFBnYywFxwoNxy67Zrv6pY=; b=JGIvBmm6Lco/RAhWnahqC0ORFi/qULiLCdS35udgrha2WORm0s9tubs5i67sYq8yK+ gnieAlSHi81ci4BSdtM5b5aqobKay7xH9tMOUy1s96QjZXnSb9xWu0Fb/hwry9Sf5/SO SF3bSsIpPebC7RPr0vfRBXm8+ZNl62+Yyiqngcu+VbtKPKGL5Oo6xlPxky9vSE31Jv5R 5x1imd5R4JKWHQeqvRaRU3hrEOzjxlPB5jjEd0pjnpJ9NBFJWGOdA9gHq63P39zsL+Pw DbO5XVMs8Q/Dfi5YmrTBOfbJZtMPMJW604fbNaYSI41e+A7Pp8PKhFYBhn/UYpT8EKjh uIEQ== X-Gm-Message-State: AFuF++kjRD6p1S/q6PwAyCXqdBJvDtloWdWJIyeu27iVhXGWjK3Kt9TP sI7/LFFQrEnj1ymyNyzexYHudaL8LNQWtnBDnzblSQlFm2sutvp99djI8u27d8KFeZc= X-Gm-Gg: AYBFou0mpRa9Q1fyw/yEEpNmm8aNA9Ch86dzZ3UCDdTBoMSGJnsEjcd0J3KAtDV2v0C RG/p283HBth8IXcoowzO9WPUaWUdsXvSqrtcV+6l49pT65nXygoce9+vjxTUKsC5CvCiyLjCVzD ueBClseJOj/Z8LolGwpgUXrRZMJ7U1lwXnNhcfUAemSx+zlSijS48TsooNKpav1zZ8jL4rFoY+C AToqX+g1eG5W1nzGp96nISk9GZFRAPmTAd1Cp5WG4K1st53VCkwS3K1HZz3C1dRadeCCBcigbcv uickrnWNJleSu3waTEcTMZ0lFbb4eNF/j4HOV3C31pMebZyjX80Sl3DK9vl2EvsobObG4/c6PaP avlmAdwOmsAbEKWzPhlYl4NtL/m7XCapYp11vxtvfTN8pNNfMRvAczzH+IPwo73lUW8Stg96pv7 eUAC5OaAOmfPDOhj9D7w2KndCjRk4SBrCZW3s4i/Ehk9q1TYk0/EYgodmjMSo4+Wr6tVfUa4TJk A0A5CCiUw== X-Received: by 2002:a05:600c:4743:b0:49e:7cfc:a9b7 with SMTP id 5b1f17b1804b1-49e82257f4bmr35173665e9.18.1789503368369; Tue, 15 Sep 2026 13:16:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 06/15] tests/tcg: improve check for working cross compilers Date: Tue, 15 Sep 2026 21:15:51 +0100 Message-ID: <20260915201601.1207839-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503495288158500 From: Daniel P. Berrang=C3=A9 When it finds a cross compiler, tests/tcg/meson.build tries building test_cc.c to validate that the compiler works. This includes "stdint.h" as a witness for working C library, however, that is not a good choice as it can be provided by the toolchain alone: $ rpm -ql gcc-s390x-linux-gnu | grep /stdint.h /usr/lib/gcc/s390x-linux-gnu/16/include/stdint.h As a result, if you install the s390x GCC cross compiler, but not any C library, meson decides to use the host compiler instead of the container: cc for aarch64-softmmu : aarch64-linux-gnu-gcc (from 'debian-a= ll-test-cross' container) cc for loongarch64-softmmu : loongarch64-unknown-linux-gnu-gcc (fr= om 'debian-loongarch-cross' container) cc for riscv64-softmmu : riscv64-linux-gnu-gcc (from 'debian-a= ll-test-cross' container) cc for s390x-softmmu : s390x-linux-gnu-gcc cc for x86_64-softmmu : x86_64-linux-gnu-gcc (from 'debian-am= d64-cross' container) Eventually this results in failure to run 'make check': [33/40] Generating tests/tcg/s390x-softmmu-hello with a custom command FAILED: [code=3D1] tests/tcg/s390x-softmmu-hello.test /usr/bin/s390x-linux-gnu-gcc /home/berrange/src/virt/qemu/tests/tcg/multiar= ch/system/hello.c -o tests/tcg/s390x-softmmu-hello.test -static -MMD -MF te= sts/tcg/s390x-softmmu-hello.d -Wall -Werror -O0 -g -fno-strict-aliasing -no= stdlib -ffreestanding -Wa,--noexecstack -I /home/berrange/src/virt/qemu/tes= ts/tcg/s390x/system/../../minilib /home/berrange/src/virt/qemu/tests/tcg/s3= 90x/system/../../minilib/printf.c -I /home/berrange/src/virt/qemu/include/h= w/s390x/ipl -march=3Dz13 ../tests/tcg/s390x/system/../head64.S ../tests/tcg= /s390x/system/../console.c In file included from ../tests/tcg/s390x/system/../console.c:8: ../tests/tcg/s390x/system/../../../../pc-bios/s390-ccw/sclp.c:11:10: fatal = error: string.h: No such file or directory 11 | #include | ^~~~~~~~~~ compilation terminated. Adding more include files to the test program ensures the meson probe makes a better decision. Fixes: e5d084d622b1 (tests/tcg/meson.build: check host cross cc is working) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier Message-ID: <20260910100120.2076092-1-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/test_cc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/tcg/test_cc.c b/tests/tcg/test_cc.c index d3614a01fe6..fafee055b40 100644 --- a/tests/tcg/test_cc.c +++ b/tests/tcg/test_cc.c @@ -1,7 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ =20 -/* Include a standard header to make sure cross compiler provides them */ +/* Use some standard headers to ensure the cross compiler provides them */ #include +#include +#include +#include +#include =20 int main(void) { --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503451; cv=none; d=zohomail.com; s=zohoarc; b=a9OBzIB+YKMVQIMP1+H2G0/yYH0RCq/oNRLNB/1Wu0TH6wMc2fCrFDIjVI/oFtabtpbd08E1ZrlzzJDH8g3iNekLxxIsV+aG4vIv/4zA8wX+aNrE6zNN5pUEQ8YnnhXJ4HoCwDV1IZJwJr1R6bFfk2auzGOZ+wat4blXUDIY+Q8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503451; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=D/BpOkw3+cKTFoQ19A1HbKBNq+LOSJRCohlvJM81+pqCwAihEqvPtW0ANPwIXxyylONihvG6AXP1ha1k4QgbZ0RrgerDMbzb3Phtg/lyX56sFoFmCACPf8FgELErLUdldYcCEv1PyuZZdKXkGLNRKZorWPEwMOfr4wGcT2kdZtg= 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 1789503451413211.20033823186736; Tue, 15 Sep 2026 13:17:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZaR-0006xc-PJ; Tue, 15 Sep 2026 16:17:05 -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 1x6ZZb-0006sF-C5 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:13 -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 1x6ZZX-0003HU-Kt for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:10 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cd4ba9f68so2872385e9.1 for ; Tue, 15 Sep 2026 13:16:07 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83d9e77asm14611505e9.7.2026.09.15.13.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5F28E618C3; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503366; x=1790108166; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=nRfvcP/Q17+u97qLF5BUbSfv+9qANozmW7G4OfaNzBH7S5NeYA6Lcxiluud/O/zr3g m+5seFw9hpqB8uIPPGFLntFD1zBHs0r5vWuZ9XXQ3CAafFThePyjthtKJpxEkZ19sCVz /BXoS5hZCysOmMZSRdmLIg8Me+w1rnZtbvkx66Zq9fagvZbrNJdJFb2CpXvSsj5bQuir idF0E7negfHywBzsBCUhbwByCBxCbfoHVT7/a33x1WoVxR8eY0kzmhoT7L8k0PZQsc3F Uz0SyLQeVBbmK0WGSIxdPYI0VJTSm/3lg8KzR8q4g3YFDcim2+0l08wJfyWK2okMBJVY RxRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503366; x=1790108166; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Oc6yr6zbpyTI1sBnf60D2N+15kHWjne7Pv8s7CbUCQc=; b=XRwpVN8rspWHXEXcYqSF+FxSbBZpqA1Xn3RGeu3CpukyUsYd7Yf79pzgXTmfpf/Mgn odjx4R+CaUdZCkKuJz6UxVYMHvQpx/owL1bH/zDi/UQBJJnEwZWZo5zfCQL274w/3lYX I9a1Fv1k8SWIZ2aGmyCLdgp92JKMUuwgCAey42jRsPHtRnxl+diJkivw3FLk12eIXPI+ BAhp4tZ01qUX4RqP+EE39lHVRNrT/ICMjZK5iSG+91SbwlM/RmEWohqRHpLSB2V/OgJl z42DMhkP8nB8vFO92FWhyUUTd5OjiYWZTZUS6OD5/Fo+y2tIeuGGvEIQVAJ/ZibzBYNa G2DA== X-Gm-Message-State: AFuF++mCnkhq7d31qrY/QW+b5cTAecSjqoBCVj9qeu/jsgLjMH4qMO+4 HF+ZImSLON7Evb7jtTWudmZWEJBLOL9lE1mEZpI9R2d/Si46aKvoq7uwKEBXO/URht4= X-Gm-Gg: AYBFou2EfDS8l+5hILpujIYcVk8fKG3dqwm9H+V9q6LB6Jkiulxx9jmFBk2ppeeWXuL M+37Apy/jsCv8nRnXJPHKwEi8N/bZSB+Ib1E7BTvLoj5vnCTvEscMdvtKe8iP7Jp3oTQD7pIiOS YI3urknDcp6KO8sxGA9llqbpFdarQeVRoIbcfURhI83fpXBofcahYQ726AU31tr5wfDVNaAmaCi DX+4Pmo4wYwTiCJu4rVB3m9U3kOL7g84PWmOk3vEUWGTC6VfXMonta8y1eA4owG2uF4xdeONKac TVzUSxOto7Xfj2tH0ztlghiyUf2KhJAdVcq8SnQngAtQo14je40jg/d+m452cov0w3AeHjZZRRn /L6l4uQ0dF6fNpbkFK5p//vuc3Yfrp/TglrOswXRCTxUO5AUBIQ4K2ERDrPWEyU6qO17mqOyuoJ PcNcjcaj9N31QqgyMQdGMKY59boPso6jtTJWfGaLdPyK6MsdHJ+MjBaJBUJH3bxwjTtVkPFBE= X-Received: by 2002:a05:600c:4743:b0:49c:fe46:7219 with SMTP id 5b1f17b1804b1-49e8227fd96mr36589545e9.20.1789503366100; Tue, 15 Sep 2026 13:16:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/15] tests/tcg: prefix meson built docker tags with qemu/ Date: Tue, 15 Sep 2026 21:15:52 +0100 Message-ID: <20260915201601.1207839-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503453374158500 With the meson changes we now build the images directly by calling docker.py. However the Makefile.include builds prefix all the images with qemu/: # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ DOCKER_BUILDKIT=3D1 $(CONTAINER_COMMAND) build \ $(if $(DOCKER_V),,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REG= ISTRY)/qemu/$*)) \ --build-arg BUILDKIT_INLINE_CACHE=3D1 \ $(if $(NOUSER),, \ --build-arg USER=3D$(USER) \ --build-arg UID=3D$(UID)) \ -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\ "BUILD", $*) So to ensure we don't end up building every container twice make sure the naming conventions line up. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index e966774c8c2..5e2ee3e6e3f 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -217,7 +217,7 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', cc_dockerf= ile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) @@ -232,7 +232,7 @@ foreach target, plan: tcg_tests here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '-w', here, '-v', mount, - cc_dockerfile, plan['cc']] + 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif endif @@ -241,7 +241,7 @@ foreach target, plan: tcg_tests if has_cc summary_cc =3D plan['cc'] if not cc_from_system - summary_cc +=3D ' (from \'' + plan['cc_dockerfile'] + '\' container)' + summary_cc +=3D ' (from \'qemu/' + plan['cc_dockerfile'] + '\' conta= iner)' endif endif tcg_tests_summary +=3D {'cc for ' + target: summary_cc} --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503661; cv=none; d=zohomail.com; s=zohoarc; b=JkyPL8a0OkRov3SaNuNXbKbGmYUx1rErcxedumanuG61GRxbMF9PtlgI0jtaZTMw507ux8tycXb9Qd+w05Gehc8ou/8YSOqbO9yoxcDuSCN/hrD+YbINFCqT28wJqvGMsYMZ32RzRZsLj43DvSiwIsBlSNlOf7Lxxy6Lruj7Sfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503661; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=Vta+4DXDGEn+vO1Tv23e2JrN4a1Jvflp80hfxXXVQxrG6yjOFpYerlytKkG739P4HnCKuFbmd1pjgosdlsclrEyVzM8FVaXPeQXztI1ygKxhDO+1SgQzgnHm5Rc+l5S+tlZvXC8YQRtMSFPN4a20rs37EZZlsQGZrJaxX+Nertk= 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 1789503661851543.3232021819667; Tue, 15 Sep 2026 13:21:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbP-0007fP-CT; Tue, 15 Sep 2026 16:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZc-0006sN-Mb for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:18 -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 1x6ZZZ-0003Hw-6k for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:12 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e8185e037so1165915e9.3 for ; Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf43542sm1375171f8f.32.2026.09.15.13.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 770C4618D2; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503368; x=1790108168; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=QC8yCTLdcPgtHfTbF7MklQhgHjb44i8kV+EtXRc2cyT1QDCVmlhmNf5vnL9W8dFaVM 6tJH8hHg5aizhpMJM3eCsFBV5GF/OGVdiD//sJu299Cb3cquX7X4pU6euZPDuNXPZzuE 1TzamFvdxBgcq5CFox7zOEVZaS1QtB/NLZ2l98M2wGCmbOyzXJRJYK9zjutL31qBwOlq JmTVFTVNQMwp3ilZ3VbhiMu7hcKe0g7tnu30fyyph6XpIDXr6SwpliT8ANZkXsVbt9oK fxbj/d2ETw96GGL0520JGyHGSrakRAabPTgTHYPHwVba6tSkQq6IW4BpUJhoT0axVIi8 6Y4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503368; x=1790108168; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=n037Ir9RlPxu5Jvv/I4vRtw1w6P183tFYwhqNEy4JVk=; b=LBwb6qezD1LRYCEQOlygQ90MWhUqucJ09eHZ7REhEHdk5inWsWINhDTIr0bdwssf+6 A5W9DOvX829eaEBq8EIAEhebkmZ/ZvBSGaLCCOIjRu4F5VfJJGzfSf1AYl/KRCUB39xv rGbwBecR+eE9qyO/7hj4sKs38jeUTO9/EOrnZKTw+kVdr4lfi3kR5UIHsNSRMGR2cU5n AW/6baViVygHmhkY+Ss0mTgqSOZbLD8STqSfmeNiiQIL8HNYSKrWROU8YZcxaefUpLcw 2tuV8UbTPz0ino6A/dWCV+N033sXqt4tjotyNOc+aS3clFw1YX6fz1Dxtp0diGAcdvSO CoVQ== X-Gm-Message-State: AFuF++lN5NEFu5Pb/4SWgJwDKoDWJUqKyC4/lGyY4LcRcUais9ne1F0o H8NrsRs1gHTekcEJF6onVkQQq6prl2Ioyqb+zsLhLwvC+2N6rJ2oe1+f3jALDTZhtVw= X-Gm-Gg: AYBFou2NtvM4A6kDCEpG91Fn+4kv3RrDBO2Vqwqx3lfZ3Iyt0QKvpmTA8hofbiGQvK/ 7WfXSanH2odva0k8sCATDGLezK0vF7vUYuQ9nDaYSVR4JEo7TO8cvEnLE0kSpJ+pHUkzoE0sGcx oqRJqLzTppLErAzoBwxxoIrPIl81/BwTp2YwZGDlD65YFYNj7A5iYjwK+2+2Y5PkWgSLOmVN7ca VxoBXnA4B2eWnRa7zv4ppGUBclEL0uxhmD92zbuZI/GxqNzO2n86YdPCNTlXvdZEjLiYB9lAKcm eBNg9s3Q744VjxkX4oSxItQ1oZBAGwltI3I7XMGDKn6U3vTz8yd20yneBtQByr9lVsP00QdI6GU nNMxuNTngGB+fFboO/mblCafTRaE4E7VsxAvGVNbyBjLKCojnCpzYm4j7xGK1ZJrSs2Fq0LLkmp JggOwFlyXrtBbkYhMOjuYsHALsZFKpQZ3mN4AHY5q0lJn13pozXsd9dr5W7uQYud9qmxz1XUnWc v+Lg4Et8A== X-Received: by 2002:a05:600c:5486:b0:49c:cee2:1697 with SMTP id 5b1f17b1804b1-49e7a66aaf9mr105862885e9.16.1789503367703; Tue, 15 Sep 2026 13:16:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 08/15] tests/tcg: use --add-current-user when building containers Date: Tue, 15 Sep 2026 21:15:53 +0100 Message-ID: <20260915201601.1207839-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503662217158500 As the meson tcg build routes the container builds through docker.py we can also clean up its hack which involved appending a RUN line to the dockerfile. All the dockerfiles that care will work with the --build-arg. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 13 ++++++------- tests/tcg/meson.build | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 315fa2ff848..6090a9dc957 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -297,13 +297,6 @@ def build_image(self, tag, docker_dir, dockerfile, dir=3Ddocker_dir, suffix=3D".= docker") tmp_df.write(dockerfile) =20 - if user: - uid =3D os.getuid() - uname =3D getpass.getuser() - tmp_df.write("\n") - tmp_df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % - (uname, uid, uname)) - tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s\n" % (checks= um)) for f, c in extra_files_cksum: @@ -315,6 +308,12 @@ def build_image(self, tag, docker_dir, dockerfile, if self._buildkit: build_args +=3D ["--build-arg", "BUILDKIT_INLINE_CACHE=3D1"] =20 + if user: + uid =3D os.getuid() + uname =3D getpass.getuser() + build_args +=3D ["--build-arg", "USER=3D%s" % uname, + "--build-arg", "UID=3D%s" % uid] + if registry is not None: pull_args =3D ["pull", "%s/%s" % (registry, tag)] self._do(pull_args, quiet=3Dquiet) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 5e2ee3e6e3f..28a8e7a0558 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -217,7 +217,8 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, + '--add-current-user'] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503649; cv=none; d=zohomail.com; s=zohoarc; b=jdOjXzwpmdaX6A0xmd7RcPj18GH9eJigAxOEnCApLisvkKo9j/gxlt0QHronhNElT+UllzePfKI1ZVW31SlNQDtVNSFVUeFdLMswe7Rge6zgDr4JpEFtgHYUDiF47hczoYUAZnh7B+YTosMqDkl09Dz1nXeaJs+akNmdgkHHbXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503649; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NZWPhlLkOuk9iA3jYBR1D22Zr4Gwpb30arbfNP6pIW0=; b=IIJlCtQRNa2YGjjDfUYsZ6CJg/F6FRwUaMbwcZqvPr+PPmxfd5l3p9n4Rzy7MmvsZ32yWESxopZEhusEopfuY/tBvyV1vceRIKWklP+f9qkerqn2CQHLfpHGaQddG5bfKhFYL8hyFq6r00i4vXgnasgPOztHnCdzYMYUmpHKnoQ= 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 1789503649447879.7881694836915; Tue, 15 Sep 2026 13:20:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbZ-00008r-Mf; Tue, 15 Sep 2026 16:18: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 1x6ZZd-0006sQ-Ko for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:18 -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 1x6ZZZ-0003I0-C7 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:13 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e8185e037so1166015e9.3 for ; Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83db9102sm15986175e9.12.2026.09.15.13.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:07 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 96235618D5; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503368; x=1790108168; 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=NZWPhlLkOuk9iA3jYBR1D22Zr4Gwpb30arbfNP6pIW0=; b=wo0PEaay6p9X0UKERY/hIioL2N7Vqps45XVR61wuzQCtfs24sDhYfoxVQFjuWqJ4KG HEbj4x/hQxJLav0wyXoosR/DMVlEbo+bWXE77vaCcfDENN0m84GlTUEViyd7MGx4sDI9 0AQLeUmaOtA+z7j+OFMU0ie0er1rb+nPQGMQF333SHuZBdmTsRgmLk/MyjmKSbgvEOY/ 3W7MJ/KhMym1WFhEI5oFpxcgUgh+MQUNoSCOIdj4Z84TD+AcJIgIk73UwMWMFpXidWad Vm/KOfSVjBtyeubWwCP45ytpcMwfg5IOJge8JGhNWI/qYzLkrNLZvudzKpNybJ1QpaXa cDLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503368; x=1790108168; 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=NZWPhlLkOuk9iA3jYBR1D22Zr4Gwpb30arbfNP6pIW0=; b=VesIvmPHUYaNHiytOkD4uGpQ92AF1u91WqWCHW+RgTjeRdOw50lSRZv+bWk3TT7Ycz 2uIrpTX5+bbN/RspJwu68pu5r6RJU6K4QlAblXDynC7Ox/TFduOdlvQX+IednSOx9iYe ocFF15cQjbvEQJzQ7OFwBWxE7hRW7zpk4D4zHR1Qv2LbygGv4jrsB/IH0FH2jKLhdAxH R3IfbNB/acZ365QCiXUMFdl8TChBuKA8xIBrp7EhVkX6iDBfFYVIead1heMSsVs9DY/o bFK+exg0dZH2QOihjDrSSndqxhP20S4EoDPO5Etv+wcS5xwN2UNRBhOFyGTI3lHuaFLh h2sg== X-Gm-Message-State: AFuF++kDCkXZogIzKZwW2ytpRi1iZQTPWN5IjaBzy/savJ3nu6OnhJSY w9YfO4/sXux4Ve7GyEz4HLX26WpiLv1SRLk+uWxZWq6A9bOsMiNg346vW+YhICXILzQ= X-Gm-Gg: AYBFou1gIet5XbeE1QVJdeEE+U5J7wbW1bT02l2DUANvlAzQeGTSe8IPxi4SCvqJbQk VsycLvFPzK2hiXNdFL4jG48HlP4q0cZTzJwIEpinffwvxyzTCKRoIEdQsZPCJ7hk2B7M9LggCiN mPOjPHg6CSRPb7stgcmdQgSzEQ/aCuuLdRtwBi4l0pNROx/2B/JM7MKIMRQJbf/bYqQxyFBPPVG hcIW9WGSVkzJjQolQiYvK9xFW3m/5goydT2CXGwwo7+NLj5lxt5Tr+v8g7qWX5nVGn9rxnoPDKq lSFXNhXk8vc3CZu91R2II3FvGlStd1UwSNsRkVadccUuHvIS8QUY9WFM6LjCEO7agMlUECk5l7H uDwsb18jV3BLW651A9rLbKcNynjJ+vDu9RpbSmRZBOM8UdsmFG5Xx5fANs4wV0v2sZ69Gs3rp3b hKU69fKUsOMEwQG/rvQGJk5lPNwK/3lYDBT+NWZAOTte6Op/4nNQ2YFLfC5Soej9ifYn34W2q76 5EdZs43Ag== X-Received: by 2002:a05:600c:871b:b0:49e:69e3:884d with SMTP id 5b1f17b1804b1-49e7a63770cmr102539025e9.4.1789503367895; Tue, 15 Sep 2026 13:16:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/15] tests/docker: add container registry to configure and use Date: Tue, 15 Sep 2026 21:15:54 +0100 Message-ID: <20260915201601.1207839-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503650398158500 Previously we had the default baked into Makefile.include but as the meson container logic will also benefit from it we update the configure machinery. For now we allow direct make invocations to override but for the normal case it is in one place now. Signed-off-by: Alex Benn=C3=A9e --- v2 - fixed conflicts from the revert. --- configure | 8 ++++++++ meson_options.txt | 4 ++++ tests/docker/Makefile.include | 4 +--- tests/tcg/meson.build | 6 ++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/configure b/configure index c89f3c61f7f..fc85555c48e 100755 --- a/configure +++ b/configure @@ -173,6 +173,7 @@ fi =20 # default parameters container_command=3D"" +container_registry=3D"registry.gitlab.com/qemu-project/qemu" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -733,6 +734,9 @@ for opt do ;; --container-command=3D*) container_command=3D"$optarg" ;; + --container-registry=3D*) container_registry=3D"$optarg" + meson_option_add -Dcontainer_registry=3D"$optarg" + ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; --gdb=3D*) meson_option_add -Dgdb=3D"$optarg" @@ -867,6 +871,7 @@ Advanced options (experts only): --cpu=3DCPU Build for host CPU [$cpu] --disable-containers don't use containers for cross-building --container-command=3DCMD which container command to use [autodetect] + --container-registry=3DURL which container registry to cache from [$cont= ainer_registry] --gdb=3DGDB-path gdb to use for gdbstub tests [autodetect] --wasm64-32bit-address-limit Restrict wasm64 address space to 32-bit (de= fault is to use the whole 64-bit range). @@ -1729,6 +1734,9 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak +if test -n "$container_registry"; then + echo "DOCKER_DEFAULT_REGISTRY=3D$container_registry" >> $config_host_mak +fi if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi diff --git a/meson_options.txt b/meson_options.txt index 218d003a80b..5a080b2360c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -389,3 +389,7 @@ option('rust', type: 'feature', value: 'disabled', description: 'Rust support') option('strict_rust_lints', type: 'boolean', value: false, description: 'Enable stricter set of Rust warnings') + +option('container_registry', type: 'string', + value: 'registry.gitlab.com/qemu-project/qemu', + description: 'container registry to cache from') diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0adddb6a5c6..74bf471f171 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,9 +11,7 @@ USER =3D $(if $(NOUSER),,$(shell id -un)) UID =3D $(if $(NOUSER),,$(shell id -u)) =20 DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles -ifeq ($(HOST_ARCH),x86_64) -DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-project/qemu -endif +DOCKER_DEFAULT_REGISTRY ?=3D registry.gitlab.com/qemu-project/qemu DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 CONTAINER_COMMAND ?=3D $(shell $(SRC_PATH)/tests/docker/docker.py probe) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 28a8e7a0558..fce70f8e56f 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -84,6 +84,9 @@ docker_supported =3D docker_probe.returncode() =3D=3D 0 if docker_supported docker_wrapper =3D [docker_wrapper, '--command', docker_probe.stdout().s= trip()] endif +if get_option('container_registry') !=3D '' + tcg_tests_summary +=3D {'container registry': get_option('container_regi= stry')} +endif =20 # plugins come first, as we need to build the list test_plugins =3D {} @@ -219,6 +222,9 @@ foreach target, plan: tcg_tests if cc_dockerfile not in image_targets and has_docker cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, '--add-current-user'] + if get_option('container_registry') !=3D '' + cmd +=3D ['--registry', get_option('container_registry')] + endif t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503649; cv=none; d=zohomail.com; s=zohoarc; b=na2tvlSEJxdz8cDqc8sGDXkNbi//kp6paZCmy3AT3n6UI5lEoYdrlkePouIJzQmZoXK7BZvcKs3EoxzZNq/hp+sBQ/ZKbbfrz4XGVJ4tevKIpWIrnEP213U5fsBbRQAckHDV7VGx0qyt0Lj5ku58mvoj90tzD3v8JI97B8qJVFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503649; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=Ft+QgozEJjqzHNG+eXwfsORHyv1BP3EXdLAyjk+RCEawD3srUpNmsLMxQO+zEX9zEIpYQGRM8nrJPl6RbzYEojh9sdLhHPOGoy4PSe76VaaeKV77GisqcCbqj01ZzaTaXDOFt1hF/h0sXvDvwU5I+O7G8s9k+3by/2sV4kQyeno= 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 1789503649463854.3025758575868; Tue, 15 Sep 2026 13:20:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbT-000824-KT; Tue, 15 Sep 2026 16:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZf-0006sZ-Df for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:22 -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 1x6ZZb-0003J0-CY for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:14 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49b91369d18so1683685e9.0 for ; Tue, 15 Sep 2026 13:16:10 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da071asm16257725e9.8.2026.09.15.13.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:07 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B1582618F9; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503370; x=1790108170; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=VWEpMMhK2PIrUJfKgFNPVfZ7RKom+0iKk+vatiGQnwHLiMyS8Dndtk/kP0G3EVqqS/ fmp8KMw53MXZM90xiDiaobtVZAkrtEcDIYLE4dyQdtf4b/hGxFJEYqgHD2n0WppZBoaQ m9ff+fQVr+9m0aYCNlCUDYsuD0Z57lalVZXuOJmf3Ifrr/Z9Nwo4lMvZpwj2hvVYNCtw ARz/csbtnbA3epiqGk761WqbvoGy7uluBsIj/u1UbWUyrm+PhgbwaKUWi6X9DnGtnNOM JSfAjsJAoZGrNAdlVNgcNn32//FEBG8D6eZtOFsuyU4oEWqUDOvRuf+0lcVRGLNVZSTQ L0mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503370; x=1790108170; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=985RXYgmuubKbGZhm5YGlCDe8xIWjFc7WGyDS1rZ3h4=; b=aEezQ1EMEOxRmZuOlRVjicb5AlqqoULTqRq475ZBFZsTLyRsOJMqV8v0QF5wlvWTNS 6OK4ZJjQWg8dIrwAa/UrvKAUbtXYD6km06HAid1OuEfi3KyrW5C+Xxzbvy0aPVxxSJIA ycU+v1ebz7+mh1CVO5fPP7pqd9+r09fuDepM2PUDG0GeqlLBYb2glxE0UUJOoeEeMkyI I2ASN0D7MCzSuIT6fwhVfyn4lsVzZ0Bm2Y8siRKhhFKA3WQjJspZ6a35lzyIN9XLiffe L/eu2eT1gaUx292PW9ktWLct5FRUqG3hXsRAgNAzbviaiFsgs9/+iytIcRr45JgolrHr RRpA== X-Gm-Message-State: AFuF++mAsJzFwGvJQMW3jzwSgExjvzmaRMQlBTgPO++FCr4SRd9A+UU0 WnRQ5XpJYH5rG4RK/LCMHahj6yYuR/wJFFVx+oTVF6qGkcybeyTcZLGEILHd8L0vd0M= X-Gm-Gg: AYBFou3cp6mG/FzI+xVNCNpcIfedk4+8EFtBmNE4m9yZV2jI2+A4BkVt/08goZ+DXy0 gvG81o+nT12ab72g7Qyjb+9fUWFl+Ec2dWS8z9RgeVeubgqdVPB0DumsnbSEUFju5Fq3IZsm1Yz Zcb11sHfLC1sG78y4SFiOuZoK7eLP6cvxBAoUau7s0q8vdefkqefFPA06U7c8ESY+ft4Y2gfJr0 Mfxt3Nb+I8EWIPMldyn6/XzylPxQJ2CxxkNV6xnIkmxarSYiKuu+z0EOG0DOVC4j3gP8S0jjkb5 zT4vI1iOUOyyGMArXuFT3Eszi98JWgGLjV7+LXs04JlKM/uzyAfj5XRb4zTbY2Yds86qhvbMmAT qAHrjFhevVNzc0OgvvVMlMIETs/IhCrkrAsl+1merJS3hv6WjBrgWWHAgdBGN2iPt/o56/lKYbt KXrlNZofI1VU4TphhkjlbovzsUwvkT8b9ibQ8QGy1/ttTfMn2PfGbDzaNT7r9SZx5iE2Mxtgk= X-Received: by 2002:a05:600c:3548:b0:49e:6e7c:d895 with SMTP id 5b1f17b1804b1-49e822a8fccmr28817495e9.26.1789503369870; Tue, 15 Sep 2026 13:16:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 10/15] tests/docker: remove used _read_qemu_dockerfile Date: Tue, 15 Sep 2026 21:15:55 +0100 Message-ID: <20260915201601.1207839-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503650305158500 This is no longer needed since the functionality using it was removed. Fixes: 07056db1b50 (tests/docker: remove FROM qemu/ support from docker.py) Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6090a9dc957..fd0cbdfe856 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -175,16 +175,6 @@ def _check_binfmt_misc(executable): return interp, True =20 =20 -def _read_qemu_dockerfile(img_name): - # special case for Debian linux-user images - if img_name.startswith("debian") and img_name.endswith("user"): - img_name =3D "debian-bootstrap" - - df =3D os.path.join(os.path.dirname(__file__), "dockerfiles", - img_name + ".docker") - return _read_dockerfile(df) - - def _dockerfile_verify_flat(df): "Verify we do not include other qemu/ layers" for l in df.splitlines(): --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503628; cv=none; d=zohomail.com; s=zohoarc; b=doiJcMzY9GOPqv4u5SL84zwsXYbhHgDCrjLrDbyVxaHmAJTux75IUXLxfj2nd2Ptmc5QYxHKH387TsHWTQR8SC68gcXj6B0kkWCPxs3DuPrBg6O1SUgDV7WTW1lEbCXau4df7oA9i6VuWFMm2rx4XQSMc1yzr2PT+BZKi4HIVOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503628; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=eimpSQIw5XyQckxjKHWJKFkzL+mbN5bOseg1vDtY40SQpDzfYxRMMSxMkNMtFb1zt8Wn8VLJq7b5/mz4ULfIPz7Lg0S7YYek3SeDVtCBZ5ZbHTIZLkhRuAqCSgeua1NCzpEcqWjPxXx4lbA1xYsBas3ThV4W5HuFKF/GGPUT4iM= 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 178950362890261.060436707044005; Tue, 15 Sep 2026 13:20:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbX-0008Or-Bz; Tue, 15 Sep 2026 16:18:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZr-0006vl-9v for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:32 -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 1x6ZZn-0003Jt-CV for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:26 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49cd38e0e5dso2050375e9.2 for ; Tue, 15 Sep 2026 13:16:12 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf462cesm1405272f8f.37.2026.09.15.13.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C86BE61901; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503372; x=1790108172; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=PGFPnfiNaO7MoZseckKBQqqwsbsr2tUXagyq+hyoCtPTQ0zPeKUOcvWXTNOFBltL3Z /zxAMic7DXm0jzYYqB4fuPu7r5mt/VMETu4Og/jpOF0DU39R/rA0Gz7hAYm1J/xjzZ0c HcyfSfki35KMhiZ118lEErviygVzH/qJO5kMCdOckPLtfdfyAbfXWWIOjZkC53PIKT+A 7LlI0WuAURzWqGYgZN52z0DFlW0RK9d8/WeS9u0mKLWu0bj8cImAwrhDKvR4MWMpTi2D pvgJ0G/tsHFuXR6htk02fZsytB+JjTfNTroBylEfv5J5ECbHin8vYpaIXFFHOUgB4Im5 HZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503372; x=1790108172; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7O9UJOMF0J+VNfP7rnUceN1KGDlS3Etlt1DaVQnlEaY=; b=wbPasbUhvUy80LFeHCrksMP5F+AESfFrpmGEcWA5PAw3efltu/cH8MhBpGU8zIr8r9 lQoPqAamCJ2WMmRKYG4CqE2pcM+sHc5Fu8SVvt09KRf3wlSIt7asAJJR0nzDKNW1+uKk jdmJhK/0ZYt3slXpyvcyydaIDu7IENzLmCCmKYCOSvXVC1RPSzT7O9gV9XzUFhtr0vc0 az9qFsoZYiXELDrtWRkpCmEzIcgbBqD3UhwA1ya8mFedjT90dGHJF3+YuPfBYWZlHf2z 0bYxX7xfSvaszONzSPlbptXrrjLReh4pD24gbJlAoreq5qza4H4WgAEVxHvLgDPRoNFy gXUA== X-Gm-Message-State: AFuF++kAkkc0fu28zw3o7G8a/2CMfjuP0DV70q0ToYymrRiys4smWF55 STWfvBiciY9NUWvX1IWQ68D4Ynrt6MyX3P2gzRrLC85Fsimr49pUjj5eatZqrgwG1p4= X-Gm-Gg: AYBFou0bKe/kHIz3/Fn+iGWGIKuZO74ow7z1yAvckurHwrzk1nx4XrT7PNFcTZNY5rj OqptdbZE3eEfuxyr9VXLytSUrMI34d/nPEWgE90qBlMqJUMcmz56pP/R3dpCoBTvm30h/JGKfQZ QJa/CPeO0THvd01Hj9wxggBAoj1sd7BK1LPAsLMUbaqP+O0qKhLgQIPyzp3ewd0soe0VDUN4ZLs szSt/lhHFl++Z0ZFSMH6p21xKm/xhrhLgaVGqqX7cNQSoulu9BrG7t9FfQCD0yIrld1zIYHTEo7 gYG6Cfr2S/nfKpsFXBNzLjmeH0fJeXOGRNtGD6kFecd+9GcBh2XrG58bnjtE5KrhX1WsnfA1DbW hd+/px60Xw7sUf6KU5XpvXCZRlyEXztMHeTxGqAKHG1z2qDLUa5lUCy62L5KSIk412kjfwEburY 7CGt4K3H3fkK5mHyVP6+4Gxk74eSNFD3j7v/iVfi9pLPZjOaH+9Gwe7Jyk7HqRbQuQVrikWJaOI 7N9bK3Eig== X-Received: by 2002:a05:600c:6217:b0:493:f140:c3fb with SMTP id 5b1f17b1804b1-49e7a656c01mr212379805e9.7.1789503371668; Tue, 15 Sep 2026 13:16:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 11/15] tests/docker: strip remaining caching logic from docker.py Date: Tue, 15 Sep 2026 21:15:56 +0100 Message-ID: <20260915201601.1207839-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503630374158500 The caching logic was a remnant of an older time when we had multiple shared layers building that went into the final image. It was arguable that it worked back then but it is definitely not needed now so into the bin it goes. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 148 ++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 99 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fd0cbdfe856..a2e97061240 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -15,7 +15,6 @@ import sys import subprocess import json -import hashlib import atexit import uuid import argparse @@ -27,7 +26,6 @@ from tarfile import TarFile, TarInfo from io import StringIO, BytesIO from shutil import copy, rmtree -from datetime import datetime, timedelta =20 =20 FILTERED_ENV_NAMES =3D ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -35,20 +33,9 @@ =20 DEVNULL =3D open(os.devnull, 'wb') =20 -def _bytes_checksum(bytes): - """Calculate a digest string unique to the text content""" - return hashlib.sha1(bytes).hexdigest() - -def _text_checksum(text): - """Calculate a digest string unique to the text content""" - return _bytes_checksum(text.encode('utf-8')) - def _read_dockerfile(path): return open(path, 'rt', encoding=3D'utf-8').read() =20 -def _file_checksum(filename): - return _bytes_checksum(open(filename, 'rb').read()) - =20 def _guess_engine_command(): """ Guess a working engine command or raise exception if not found""" @@ -263,38 +250,15 @@ def inspect_tag(self, tag): except subprocess.CalledProcessError: return None =20 - def get_image_creation_time(self, info): - return json.loads(info)[0]["Created"] - - def get_image_dockerfile_checksum(self, tag): - resp =3D self.inspect_tag(tag) - labels =3D json.loads(resp)[0]["Config"].get("Labels", {}) - return labels.get("com.qemu.dockerfile-checksum", "") - - def build_image(self, tag, docker_dir, dockerfile, - quiet=3DTrue, user=3DFalse, argv=3DNone, registry=3DNo= ne, - extra_files_cksum=3D[]): + def build_image(self, tag, docker_dir, dockerfile_path, + quiet=3DTrue, user=3DFalse, argv=3DNone, registry=3DNo= ne): if argv is None: argv =3D [] =20 - if not _dockerfile_verify_flat(dockerfile): + if not _dockerfile_verify_flat(_read_dockerfile(dockerfile_path)): return -1 =20 - checksum =3D _text_checksum(dockerfile) - - tmp_df =3D tempfile.NamedTemporaryFile(mode=3D"w+t", - encoding=3D'utf-8', - dir=3Ddocker_dir, suffix=3D".= docker") - tmp_df.write(dockerfile) - - tmp_df.write("\n") - tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s\n" % (checks= um)) - for f, c in extra_files_cksum: - tmp_df.write("LABEL com.qemu.%s-checksum=3D%s\n" % (f, c)) - - tmp_df.flush() - - build_args =3D ["build", "-t", tag, "-f", tmp_df.name] + build_args =3D ["build", "-t", tag, "-f", dockerfile_path] if self._buildkit: build_args +=3D ["--build-arg", "BUILDKIT_INLINE_CACHE=3D1"] =20 @@ -320,13 +284,6 @@ def update_image(self, tag, tarball, quiet=3DTrue): =20 self._do_check(["build", "-t", tag, "-"], quiet=3Dquiet, stdin=3Dt= arball) =20 - def image_matches_dockerfile(self, tag, dockerfile): - try: - checksum =3D self.get_image_dockerfile_checksum(tag) - except Exception: - return False - return checksum =3D=3D _text_checksum(dockerfile) - def run(self, cmd, keep, quiet, as_user=3DFalse): label =3D uuid.uuid4().hex if not keep: @@ -412,61 +369,54 @@ def args(self, parser): help=3D"Dockerfile name") =20 def run(self, args, argv): - dockerfile =3D _read_dockerfile(args.dockerfile) tag =3D args.tag =20 dkr =3D Docker(args.command) - if "--no-cache" not in argv and \ - dkr.image_matches_dockerfile(tag, dockerfile): - pass - else: - # Create a docker context directory for the build - docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") - - # Validate binfmt_misc will work - if args.skip_binfmt: - qpath =3D args.include_executable - elif args.include_executable: - qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) - if not enabled: - return 1 - - # Is there a .pre file to run in the build context? - docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" - if os.path.exists(docker_pre): - stdout =3D DEVNULL if args.quiet else None - rc =3D subprocess.call(os.path.realpath(docker_pre), - cwd=3Ddocker_dir, stdout=3Dstdout) - if rc =3D=3D 3: - print("Skip") - return 0 - elif rc !=3D 0: - print("%s exited with code %d" % (docker_pre, rc)) - return 1 - - # Copy any extra files into the Docker context. These can be - # included by the use of the ADD directive in the Dockerfile. - cksum =3D [] - if args.include_executable: - # FIXME: there is no checksum of this executable and the l= inked - # libraries, once the image built any change of this execu= table - # or any library won't trigger another build. - _copy_binary_with_libs(args.include_executable, - qpath, docker_dir) - - for filename in args.extra_files or []: - _copy_with_mkdir(filename, docker_dir) - cksum +=3D [(filename, _file_checksum(filename))] - - argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v - for k, v in os.environ.items() - if k.lower() in FILTERED_ENV_NAMES] - dkr.build_image(tag, docker_dir, dockerfile, - quiet=3Dargs.quiet, user=3Dargs.user, - argv=3Dargv, registry=3Dargs.registry, - extra_files_cksum=3Dcksum) - - rmtree(docker_dir) + + # Create a docker context directory for the build + docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") + + # Validate binfmt_misc will work + if args.skip_binfmt: + qpath =3D args.include_executable + elif args.include_executable: + qpath, enabled =3D _check_binfmt_misc(args.include_executable) + if not enabled: + return 1 + + # Is there a .pre file to run in the build context? + docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" + if os.path.exists(docker_pre): + stdout =3D DEVNULL if args.quiet else None + rc =3D subprocess.call(os.path.realpath(docker_pre), + cwd=3Ddocker_dir, stdout=3Dstdout) + if rc =3D=3D 3: + print("Skip") + return 0 + elif rc !=3D 0: + print("%s exited with code %d" % (docker_pre, rc)) + return 1 + + # Copy any extra files into the Docker context. These can be + # included by the use of the ADD directive in the Dockerfile. + if args.include_executable: + # FIXME: there is no checksum of this executable and the linked + # libraries, once the image built any change of this executable + # or any library won't trigger another build. + _copy_binary_with_libs(args.include_executable, + qpath, docker_dir) + + for filename in args.extra_files or []: + _copy_with_mkdir(filename, docker_dir) + + argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v + for k, v in os.environ.items() + if k.lower() in FILTERED_ENV_NAMES] + dkr.build_image(tag, docker_dir, args.dockerfile, + quiet=3Dargs.quiet, user=3Dargs.user, + argv=3Dargv, registry=3Dargs.registry) + + rmtree(docker_dir) =20 return 0 =20 --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503519; cv=none; d=zohomail.com; s=zohoarc; b=KYI/9fuDUod0dIIJVaZTSBB/zJeeWSjJpFKU9Yiq6+0bCHI6jAkZywi61LWZIACOHfLDqS8L8knRdcLVRpdjbEfO8oVEqnx1Y1+MhmGVp1jOFB0X0Ys5mEhlCyvlWDSd199StX2+Z1g2TyDuJMSqw39NXTynZB21gRBaty0lQiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503519; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=MMKalYLUAeVU7xfoHJz/x+PrwBJ4ZV9/Z9UiIHhtNqvKAVMR/3AS7GBQTtE+v0TEWiBNGrWldON9cFBdtrufsSYHX6BWxkkm2jXryG8KSsr+rVmq1CeUNV0cYIWdmPErO45JcBjxsuK/mm1qBACsD0ZWuVBCWLUczmbY6hL+vS8= 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 1789503519126501.49990424543944; Tue, 15 Sep 2026 13:18:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbS-0007vu-Q2; Tue, 15 Sep 2026 16:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZl-0006tG-Dp for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:22 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6ZZd-0003KH-Vx for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:18 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-482f633ecdeso95345f8f.2 for ; Tue, 15 Sep 2026 13:16:13 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bef7659sm1685601f8f.3.2026.09.15.13.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E1A596191C; Tue, 15 Sep 2026 21:16:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503372; x=1790108172; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=tNhTFAvOomXLzFwDi5gbteLOcRJ10lt/48SeoIBzFMYxqiR0zRpoD8F4TsgemkMzOk NZuBOCnr5gwYYPxxCXrHuFojtQtzax3plbh3FQBHzxDUI5X2DBMyaXUBtKd494mhahgC N/i/toLHtK+/c9sZcpWirtldJNVgJpN1edUlEfI3A9JqK2rv9d4+SNOh7BPg5IW2Ak7E ilTvHvEcil30wcMbhAJna+l6vL+XGOljTVrPuTGQZemn35e6UBwj31OHiipZP05mqBfx XgSsrEphgmFfG4dM3FWYI9qQpk2LeUoV77yv5ijzuYwbSd7B/JNhVgc2c7+TFL8boIg1 /ylw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503372; x=1790108172; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zGF8Zru9UFaw3tvZdLkb/lAyT4SI/GstcoOfFvkorMM=; b=ULuzzFDuBisiTu2TnbB8pasLl2RAUbesuHY+uCDpjmD6Xn/H1vZFYFtVuJu1HGVJoz hCmrOV2T9jhN+yRtrbdjAh5xf10RWGENuYnrs7jl51+vbIZQzOWoVEw4Jk+fVYQdDHwo 20YWo7l21loPhHSPTw2yzxjKhXGMPObhonhpFK22wNfMowlgme0piYyetmo6+l2fvanb bA0lhAJC378NM2+UsCciYS3OTsalxfgASq4cdtlbfwSUzk+CUWSx2xOGGKKxqKZZZMWT 5pVEXwm2WEF7x8M+uKJlb9NPr3Iq+B+iKNDJYuPoju1WzuDiMedfT0i0mYwlZ0oWKy+c u7kA== X-Gm-Message-State: AFuF++n1obPhaqPtSyUP2Eu2TCBvemQMJ8kTXaTg3m0G1MAN9oSSSZkD owXdlbSnmQ3eLdcSXqqig+HiWXGHY+BJrebk8+/xAy2pKS3BcU3kPVtxTFYINgUIffM= X-Gm-Gg: AYBFou2c90GSYKnYnGtRo/XGvfvZx5lJgPS8A9t+bTss+zXzu5Zg6k+u2yVk3KBvqTB QMsNUGgHMOb00m5e+iHPwwewTeHv9io6AlOBpJPP4aEDxXlwwlv29LLwTgafMvS/REkcR3OuO+B MrhUHm0ZbY6ZHRcRd5o6/tcJm22OIOuBvdHHyKQqG2wmAeg8yklcA/PuV/OFkyo/yWjG7Ms/aA5 sWCFiZwdlNO2pjNCXRvXTxSx/N+abgA7xMWQj1P8G4bTWN1obj7bM8MKCzDzARsUo9FdFoySN8Y 3WbiPFTESzsqyxQr/QW+EEW4I0zrMjp5vAptgmRY8QIpSU5IEkKBeOnXMVjAqzcY0M2O+Va+0wm LlXVPlAhc9oAaQRhrnXMmdjpN3VUUjJUYWYEFPqtLOu0JD9nUtTlNSiQWVgl5q3Va9WlfXvaCAa SPiSdA2vbsyp1Kh18qu1PTaa/7RWiDS3xW8+xq/u6/erHJ/usge9LL8/kpw0VH6TJvTbpGO0k= X-Received: by 2002:a05:6000:430e:b0:485:ac35:5c5d with SMTP id ffacd0b85a97d-4870cf1136bmr99464f8f.15.1789503372503; Tue, 15 Sep 2026 13:16:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 12/15] tests/docker: add specific command to parser Date: Tue, 15 Sep 2026 21:15:57 +0100 Message-ID: <20260915201601.1207839-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503519723158500 A future change will want to use additional flags which clash with docker/podman command lines. Currently they would get snarfed up by argparser. Make the pass-through commands explicit to avoid this. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- scripts/coverity-scan/run-coverity-scan | 2 +- tests/docker/docker.py | 5 ++++- tests/tcg/meson.build | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-sca= n/run-coverity-scan index 2f9ccd5e44b..0e1361606e0 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -381,7 +381,7 @@ if [ "$DOCKER" =3D yes ]; then # Arrange for this docker run to get access to the sources with -v. # We pass through all the configuration from the outer script to the i= nner. export COVERITY_EMAIL COVERITY_BUILD_CMD - tests/docker/docker.py run -it --env COVERITY_EMAIL --env COVERITY_BUI= LD_CMD \ + tests/docker/docker.py run -- -it --env COVERITY_EMAIL --env COVERITY_= BUILD_CMD \ -v "$SECRETDIR:/work" coverity-scanner \ ./run-coverity-scan --version "$VERSION" \ --description "$DESCRIPTION" $ARGS --tokenfile /work/token \ diff --git a/tests/docker/docker.py b/tests/docker/docker.py index a2e97061240..d7eb4cf6811 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -336,9 +336,12 @@ def args(self, parser): help=3D"Don't remove image when command comple= tes") parser.add_argument("--run-as-current-user", action=3D"store_true", help=3D"Run container using the current user's= uid") + parser.add_argument('cmd', nargs=3D'*', + help=3D"""The command to run. You should prece= de with + -- to avoid confusion about its flags""") =20 def run(self, args, argv): - return Docker(args.command).run(argv, args.keep, quiet=3Dargs.quie= t, + return Docker(args.command).run(args.cmd, args.keep, quiet=3Dargs.= quiet, as_user=3Dargs.run_as_current_user) =20 =20 diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index fce70f8e56f..17974e4d15c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -237,7 +237,7 @@ foreach target, plan: tcg_tests mount =3D meson.project_source_root() mount =3D mount + ':' + mount here =3D meson.project_build_root() - cc =3D [docker_wrapper, 'run', '--run-as-current-user', + cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', '-w', here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503494; cv=none; d=zohomail.com; s=zohoarc; b=OfZNwpKForitqki2GtkxbaljpBBzWE9ObM1pIeVqzoZFZ2oYTjfHi+6Kc1Mzc0pl6stiHOJ9EkmaNc6mXnPyuwAWhA+5aQhfe5ao3zC9p0i4ewBTs8JHT9Kgts/uDSnSx7xwvJvmVO3k06RjivrNkfsQbyjCtKArxcNNe1LTVpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503494; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HlUNZ7JGzsbO42Hhk0mF6bv3uGqsFUKiR49vVBrXMEE=; b=fFMSrdAYVgGV8Rf10LXUZw9eg2CSOAjxEboGw/nfDoiAXqg1PjKDbX8728Fp7ahG/yvBIwrUi4t0KxJcwJdikoPZDPzAA8/sPVO3cF64p0CBAexdgddVuHlf7S1FUf58w0K42ovB4kJ8kx7fRXMgCnHGdGZUnP+vNOhbLII4Y9Q= 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 1789503494936485.49594246900733; Tue, 15 Sep 2026 13:18:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbT-00081V-Go; Tue, 15 Sep 2026 16:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZo-0006ud-PA for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:25 -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 1x6ZZl-0003JA-VG for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:24 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49b912d3920so1564755e9.1 for ; Tue, 15 Sep 2026 13:16:11 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf1fad3sm1215976f8f.12.2026.09.15.13.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 084B061926; Tue, 15 Sep 2026 21:16:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503370; x=1790108170; 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=HlUNZ7JGzsbO42Hhk0mF6bv3uGqsFUKiR49vVBrXMEE=; b=B0L9h0rpR+7/AQexC/N9ZgVOTca6A0wXwqeej/Owp/5MThmLCC2KBvEJAqAAcDK1xS MoGMemZHwYc4/nuUpto2JBgkNY3uLky2fKERxUFGLwEvf4kMI77eToVYorpwfQnh6omT g8Nhk+RlHIRaFwvuhDRuIJ8pqWFbJCMqLKJHA/nf1tHeIFcH1qhpSs4Xbi1GakVOus5R y2NsqN04QfJUa0QGTCUZhUPqShyIeUUd/9aa6TjSq/cGorld7/tq5ff11spbxpacFc4x atBM5uC09TSgF2Mbu26WZyxYFUhaK0rAQ00Hpk9YAUgQ0h78AqVS2vW6n8SSVVy9H3/1 mE5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503370; x=1790108170; 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=HlUNZ7JGzsbO42Hhk0mF6bv3uGqsFUKiR49vVBrXMEE=; b=tVgacJjuDAZ48fzpuD8u3GxvpFDIeh1DJRCFTSIWn9ZaCOWinXhCPXGBZZ2xyMk+e4 jgYE9cn+rvgDwjmbSYAOK8Qb2vmZn2uylx/EkITpQyIe3UzHH2iLKxMlLX0rduGqpOOz XExB2Zh2hfaynUT07CuZ2EOJEe43LzXyK8EzojPCemyZIHLUhjFHj3Q+7UcfXP64WDMu XpiSeW9l5EuUTY7nvMaftZY8WLVdYvgNU5UpYqbvrnqW43kcdc4jiiY6+BbOUKGISFwP VzpH8+MwN516kZv3E2DZHwQGZbqs96XPsegi9DOSA4fI/fNm4az5r5+I3Z58Yyfw2tMJ IrHQ== X-Gm-Message-State: AFuF++mWlfwxpd8Xl7wrYX8m7c0VBGY+o9PPmzxYkH39EY50WH6wuo3Q hCXtz3PZeXBBuHc5TZ/ibuA8n9Prm0gW8QtzS2FFxfsRu7S3UrqGQvSBT02BLNOL8vg= X-Gm-Gg: AYBFou1u1V6UvQetwNLZwnpcuUFUGMX7sEns/XJJIvAOpdWAITxaYr8oU39Uzqnarxo ASzPdvseAChCWsN1bP4Ai6HHU56YUY7WYSmsrZuQYwIxIqxMDI54dmRB181meBJQPxl3kq8/T5j J/3XovmjF17v9Ck/glZxQgCozCiPhTBznGconpk/iCcaFznpEgspcHGg5WHZAOaga4Grv+CJmDh nN4I1c1oe7nmkTpDFfi8/MVST8dY/hKRuMrT/BUJtdpUfEtiLWs82NnGmQXrULI5PGlLdPD3biF ulncPQ/yPsG6TMmd6D9CjCkgpUZTPpYrURo5hyBX3df2t9YhdtiHN88bgrbv6M3cOT2uDfKI7k0 lanqDFsPf9dAJM+1C+6aSBzfMJKe37HssdC7LdsYk/sHWehDiiL7c08M3Qid+RROHjX/TF0JKni 4txlyKeZc0bhiHEtZzYEaR+zJONcGDVXDnBt+xjR+JZhjakafvEtMOGUm8Top+HjLxUBbdbJc= X-Received: by 2002:a05:6000:2304:b0:487:b32:9d6f with SMTP id ffacd0b85a97d-4870cf25729mr91263f8f.22.1789503370529; Tue, 15 Sep 2026 13:16:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 13/15] tests/docker: swap --quiet for --verbose Date: Tue, 15 Sep 2026 21:15:58 +0100 Message-ID: <20260915201601.1207839-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503495256158500 Running the docker build in meson spams the output so default to quiet and make --verbose the options. If we want to expose verbosity in meson we can deal with that later. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 10 +++++----- tests/docker/docker.py | 22 ++++++++++++---------- tests/lcitool/libvirt-ci | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74bf471f171..85825d74dfb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -72,13 +72,13 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debia= n-bootstrap.docker DEB_TYPE=3D$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=3D$(DEB_URL),) \ $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ - $(if $(DOCKER_V),,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),--verbose) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/debian-$* $< || \ + $(DOCKER_SCRIPT) check qemu/debian-$* $< || \ { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 @@ -103,17 +103,17 @@ debian-toolchain-run =3D \ $(if $(NOCACHE)$(NOFETCH), \ $(call quiet-command, \ $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ - $(if $(DOCKER_V),,--quiet) \ + $(if $(DOCKER_V),--verbose) \ $(if $(NOCACHE),--no-cache) \ --registry $(DOCKER_REGISTRY) --extra-files \ $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ "BUILD", $1), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),--verbose) \ qemu/$1 $(DOCKER_REGISTRY), \ "FETCH", $1) \ $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $(DOCKER_V),,--quiet) \ + $(DOCKER_SCRIPT) update $(if $(DOCKER_V),--verbose) \ qemu/$1 \ $(if $(NOUSER),,--add-current-user) \ "PREPARE", $1)) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d7eb4cf6811..10cb4cbde11 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -312,8 +312,8 @@ class SubCommand(object): name =3D None # Subcommand name =20 def shared_args(self, parser): - parser.add_argument("--quiet", action=3D"store_true", - help=3D"Run quietly unless an error occurred") + parser.add_argument("--verbose", "-v", action=3D"store_true", + help=3D"Run verbosely (default is quiet)") =20 def args(self, parser): """Setup argument parser""" @@ -341,7 +341,8 @@ def args(self, parser): -- to avoid confusion about its flags""") =20 def run(self, args, argv): - return Docker(args.command).run(args.cmd, args.keep, quiet=3Dargs.= quiet, + return Docker(args.command).run(args.cmd, args.keep, + quiet=3Dnot args.verbose, as_user=3Dargs.run_as_current_user) =20 =20 @@ -390,7 +391,7 @@ def run(self, args, argv): # Is there a .pre file to run in the build context? docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" if os.path.exists(docker_pre): - stdout =3D DEVNULL if args.quiet else None + stdout =3D None if args.verbose else DEVNULL rc =3D subprocess.call(os.path.realpath(docker_pre), cwd=3Ddocker_dir, stdout=3Dstdout) if rc =3D=3D 3: @@ -416,7 +417,7 @@ def run(self, args, argv): for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, args.dockerfile, - quiet=3Dargs.quiet, user=3Dargs.user, + quiet=3Dnot args.verbose, user=3Dargs.user, argv=3Dargv, registry=3Dargs.registry) =20 rmtree(docker_dir) @@ -435,9 +436,9 @@ def args(self, parser): =20 def run(self, args, argv): dkr =3D Docker(args.command) - dkr.command(cmd=3D"pull", quiet=3Dargs.quiet, + dkr.command(cmd=3D"pull", quiet=3Dnot args.verbose, argv=3D["%s/%s" % (args.registry, args.tag)]) - dkr.command(cmd=3D"tag", quiet=3Dargs.quiet, + dkr.command(cmd=3D"tag", quiet=3Dnot args.verbose, argv=3D["%s/%s" % (args.registry, args.tag), args.tag]) =20 =20 @@ -513,7 +514,7 @@ def run(self, args, argv): =20 # Run the build with our tarball context dkr =3D Docker(args.command) - dkr.update_image(args.tag, tmp, quiet=3Dargs.quiet) + dkr.update_image(args.tag, tmp, quiet=3Dnot args.verbose) =20 return 0 =20 @@ -532,7 +533,8 @@ class ImagesCommand(SubCommand): name =3D "images" =20 def run(self, args, argv): - return Docker(args.command).command("images", argv, args.quiet) + return Docker(args.command).command("images", argv, + quiet=3Dnot args.verbose) =20 =20 class ProbeCommand(SubCommand): @@ -574,7 +576,7 @@ def run(self, args, argv): cmd +=3D ["-v", "%s:%s:ro,z" % (p, p)] cmd +=3D [args.image, args.cc] cmd +=3D argv - return Docker(args.command).run(cmd, False, quiet=3Dargs.quiet, + return Docker(args.command).run(cmd, False, quiet=3Dnot args.verbo= se, as_user=3DTrue) =20 =20 diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 76b5dd5b5c8..5176e136ab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 76b5dd5b5c84511e2e799c2b3d6a2a9b9f6a081d +Subproject commit 5176e136ab11e275eb9f57c3d5c80e77af6507cb --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503659; cv=none; d=zohomail.com; s=zohoarc; b=YTO5sJ7VdIK/gsAe6nw4U/McUSgf97hkNItaov7S1dPsKsWdlEhvMOCrou0gN4jL1X7fNABDSk5y2QOhy24WGUr6nCPjIoM8s4e9t9lalnsXs8epSuOTuqw1Gbdw7SUIqX7TdOphgayScg1wuTdAN3X0w6pFPV3q7uH128wqoyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503659; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=IV9k7irvhct8WrPWd6aAXHDzjqomwl/eo7meRjt6OU+++Aj8LY9/IehC1e5SjxjUSdqUUiCFgRE/3pYz56DyLGvV1O1JXAyDbCG5bqMBk0J5ps6kSPSPFkgxE6PM/64yyc7is0KndA1C+JwacvTrh3bzw96LyZgV6hgcM5AIvO8= 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 1789503659457634.6855038898805; Tue, 15 Sep 2026 13:20:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbR-0007of-E4; Tue, 15 Sep 2026 16:18:05 -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 1x6ZZl-0006tE-5u for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:22 -0400 Received: from mail-wr2-x10.google.com ([2a00:1450:4864:30::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6ZZc-0003JT-Hi for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:15 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-48449f62b93so45306f8f.0 for ; Tue, 15 Sep 2026 13:16:12 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4870bf342a0sm1392279f8f.24.2026.09.15.13.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2333E61929; Tue, 15 Sep 2026 21:16:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503371; x=1790108171; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=XuqjymPAcHSzvA6yTHZkwnRwL6e5klvbuBcfWhrl41DPjUHkiKVg1KgNMCdf8H3WLT fqf0ae1r0GTIgBsub7dh357/EY8cG+0ue1kfoe/ocnItiJWa5f+/ZFbTlsvTEVpl3MQ6 upATmzkWL9902VjSJDLsDhi7wCuze7ZsUoM8td9ewd0LNM8H0IJ3eKfPUIFZsXmt1g60 YtkkXbfp0DC/PPQSflgs0ZdDy6dj4aSe5VOlEodwZ4DpHMwsg8m3nj8SpLEGmJCC5RWx FnV2ntziBN6J5ho7QQb2fR6F1aZjuVwVP+hRcCePNQ57N4Tf3p6j++PkE5cozVynwOW3 YmHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503371; x=1790108171; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=dM4u0r6eILzCbZESrBWVF/DDnjUwt9qXh1+CvKMqj6s=; b=SxuucFwiTmtaQz8YALJINzJimVywwQ168YdooAVibtZXBRg/rLdlIjMXwg+54n/t2z hc+j2oH1ogf30dgey7H9IjmHlfHxyUmQkUumz5WuN/TU4TZj4Q9B0d9l2D42XncXcwnB wTzk6EgAU7SEZcGi5uq7NmUY1Ygdgawer21SghfEN9DPAR7OBWscF+58BZbAefq1J+Ls tSTn2Dvw8/btWwF1tJpMoGQKGC6k73wV8xhUE44GdMFJ+UaXHnmFOirsb6QXAG5Esnhv GTn/AEa0fbwq+26uqeM0yDKLFdBtV+2qiuRiW4P3pZcPTK7HJnGCSAYiwVV/YWOUytRx cUdg== X-Gm-Message-State: AFuF++nJExj+8iA48NbNzeGX5dQ4//6Yl125ZOOhDhuQJ4ntx0rBtaJO 9k4XA0JKQTfBZBRG1H8ns84kiL9UPBU8nr+zYEo+0PsPdOVQDmpSyqcw3HCZBnPV6THFUHPlhHW MZdoDP90= X-Gm-Gg: AYBFou3v5Unk8qwTFMZLHjC0P9Hj/FAtHceMZssYFvDpk9ty2+vA8+C1ejiyCcbDJmX S/UXahRV4cybmqfPcLq41Q8kZQngPzarTE0xQemkk3Wn5vsZFPouFYjQ6m678wk+E5e8hLBVnR4 V2Kl/X8XQKxwIJRMyUOhvsvEhGOIcrmoSUpjc/w9v4uQCNbIDBc/Upgoq/yaQ9t8tIiXeHm0mqP YbWS9+QWF/OdKR2UYk+OMYFpWte2M8gzRE6dIaMa6C7e3vyfy36WJEXUHK8q66NTmG4FSrm6Feh SMG6sJGt1ahJnTDLes77IEB7/MLFWkrOCz+b7JPVh3DVq6Ryi0pFrRWEz8YilgpjQmbw0CYNMn4 MnC5BTvvhw772o81U4oXpozd0aKeWxbgvU8jyLZl4CyWdWZqia+I2xRpz7dhWOhd/E/yhG9iMEx 7KzDZmiyZYUR0mkiiT3XgW764iCyA0AcM9LvJjqZCa15vd8EkX65/6FGOk4GjNwklTsT9ahwi/ X-Received: by 2002:adf:e589:0:b0:486:f46d:e77f with SMTP id ffacd0b85a97d-48705a4fa47mr5817998f8f.15.1789503371019; Tue, 15 Sep 2026 13:16:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 14/15] tests/docker: fix brown bag typo for docker-ccache Date: Tue, 15 Sep 2026 21:15:59 +0100 Message-ID: <20260915201601.1207839-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503660453158500 Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 85825d74dfb..fa873e09b4f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -197,7 +197,7 @@ docker-help: docker # Where QEMU caches build artefacts DOCKER_QEMU_CACHE_DIR :=3D $$HOME/.cache/qemu # Use a global constant ccache directory to speed up repetitive builds -DOCKER_QEMU_CCACHE_DIR :=3D DOCKER_QEMU_CACHE_DIR/docker-ccache +DOCKER_QEMU_CCACHE_DIR :=3D $$DOCKER_QEMU_CACHE_DIR/docker-ccache =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make --=20 2.47.3 From nobody Sat Sep 26 20:51:33 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=1789503493; cv=none; d=zohomail.com; s=zohoarc; b=G8oJtU9d76ofgpBDY+CwQXhp9SOAar7dwQT4YgDN2/qP29DxCtQb9Mh37Zd0NV4k94p/IkKjzJ9grhDNrFvhwpGM9MEWFyy+a2TgUL0FPsfRFYuCpjqHrEdfy2lv7I41J+u19TblPqYPpGHqHdlrNFxUqI8gSEUd84qaHu1SG/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789503493; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=U/9jnQd8QBSLqh1SbjiifAO11Xw38izBrZzyQB94wpfmTlLSSpT1v3dPKgbZvkDTazOzqvBJTz9aw1qCW6h34c234SeTR8F/fmdoU5E8KAUCi2CjMRMlvNXSy3v2Q/wdqVfYPc2vMy7fSh5ptSzv9Ir3tH+TAx+F1dnmAeXOegw= 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 1789503492902417.10558809758686; Tue, 15 Sep 2026 13:18:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6ZbO-0007d0-Vx; Tue, 15 Sep 2026 16:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6ZZs-0006vs-HR for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:32 -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 1x6ZZp-0003Kd-2h for qemu-devel@nongnu.org; Tue, 15 Sep 2026 16:16:28 -0400 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49e71cdb22bso1685885e9.2 for ; Tue, 15 Sep 2026 13:16:14 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e83da071asm16260275e9.8.2026.09.15.13.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 13:16:09 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3B89361971; Tue, 15 Sep 2026 21:16:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789503373; x=1790108173; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=S8CbPDXpZkAGBaBC6qj/UbjJQOvqXQcONDZrn35ojDZYHV5ZqfnlfvQaaeKagyuNij OqIIGPI9fWENh2F+uj3RIW3M465CRv46F5fDZVccuFaepLGH68T01Kr1bPcIU4PoYhgv og4tH917QBIkedIG1QT/xypUd3v08ZvBqOlhBli+aQrZnSs/x+g1NiR/51/2O9WxS9ox bfeMrURjr2XcladcNq35LqGO/7NuLV+WG5eCFQ+Wq5V+ezDV6tyMupm4RMwcye8wjzqq z8C72x/Xy/k8W6XkfQpLDtf+g5TLVSjhDaRs+Zjp7xq6DnnY1OmBicT5zeM6Jm1ZacWS OUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789503373; x=1790108173; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=5jEk54sCARbNqwEALWIYvVVIO6zgDvVb82j7zjwYhno=; b=iXrOveinH56HfiVFYk499O5ld94r3dUc5UWUZ3Q1HBdZA1anT8E7XlZUgcGrt4maJ0 EBz0GWeB3pM9q1tMU1JiEEZ+3Sduw7VRA/QmQzJ2gxSTbhKoIKdgeLytrRYkMqzRk811 7/d62D+5pPUs0zDDTqW7oxogPNju6EEzmVuKaFfXVckCjQJBPFDMc9GL6PVmulZxkvP4 p+cb+sX9bWphwTUERXoquG3fv6/6pWIMGHZXcLeitfnouytRhrjUPPjAt5a/MF5OCH+7 T3ICXxDVuzNUjt7rGOLpJSb60A/qqAkHPr7723wkfk4uwQUGCxuUzs0I3iRUQ/va4kd1 KFpA== X-Gm-Message-State: AFuF++kpQ4apxBi25Fj3qsJZgBOs7qqF6SstOgLQ5h5Ost9jHw8J6IF9 DITzP8DB5c38WIgZ1E85gGpwT/0GU7Tc4o7IYnC8UVisOXwr4FVHbwi23T7YAYHIF3g= X-Gm-Gg: AYBFou1DQ4UyxpQb3alvsdxstB/MoHxZutAANGK0j/525SR8myGStSiDXhAGLZcZj3r QklB+OlC56Gg+VezFtT41Q3jZzyLf8C4Exz8bD1T0q8MqS9uUAju+PlZuhc+fA3j2xUpHSQU7WO IVNcCjP+gFf1y47n8uqZIH9SX9zhh9WKEEKmTBTPxDVZWp+hff80gmcSpwiMvvf38c5UH5CtOdN QrGqmXj4ba1+T665LpJCiJnfVP2BfZ+lz4V4q02qdnh7zwHcUkZsdExJ6831S9i0afb10qgQcXh NJ+eSOmRIVB25CdUH2yrvr42BMLV91m8EdwlXMJJPBciIflq6AUyG1noxYegOXClHtN0BcfnSwL 0HbtRca+1sbflkg65X0YgiHHPSutBQeSkWqE2pQGRoKZnoQUy7atwKiBIYPnU8WT8G616v1rqGn etGx1cWRt2WAukMSTR3NR5HHWtl35KOtBwLQir7qfbQtFPrAJyYZRm87LmO7xk27Cik0yexZY= X-Received: by 2002:a05:600c:3545:b0:49c:fa20:cc04 with SMTP id 5b1f17b1804b1-49e7a679271mr94888725e9.27.1789503373210; Tue, 15 Sep 2026 13:16:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , Helge Deller , Jiaxun Yang , Song Gao , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Warner Losh , Brian Cain , Kyle Evans , Eric Farman , Pierrick Bouvier , Cleber Rosa , qemu-arm@nongnu.org, Fabiano Rosas , Richard Henderson , John Snow , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 15/15] gitlab: update the @user id mapping file Date: Tue, 15 Sep 2026 21:16:00 +0100 Message-ID: <20260915201601.1207839-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260915201601.1207839-1-alex.bennee@linaro.org> References: <20260915201601.1207839-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: 1789503495291158501 I needed to fix a POSIX-ism in the script as well. Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20260914184534.706637-1-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-map-auto | 8 +++++--- scripts/gitlab-map-update | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-map-auto b/.gitlab-map-auto index 28ce448f1bf..3f717a15d4e 100644 --- a/.gitlab-map-auto +++ b/.gitlab-map-auto @@ -12,11 +12,12 @@ a1xndr Alexander Bulekov adi-g15-ibm Aditya Gupta agraf Alexander Graf alex.williamson Alex Williamson -aliang1 Aihua Liang alistair23 Alistair Francis +amachhiw Amit Machhiwal anisinha Ani Sinha anthony-linaro Anthony Roberts anthonyper Anthony PERARD +aroxell Anders Roxell berrange Daniel P. Berrang=C3=A9 birkelund Klaus Jensen bonzini Paolo Bonzini @@ -36,10 +37,10 @@ dwmw2 David Woodhouse eauger1 Eric Auger ebblake Eric Blake edgar.iglesias Edgar E. Iglesias +efarman Eric Farman ehabkost Eduardo Habkost eldondev Eldon epilys Manos Pitsidianakis -famzheng Fam Zheng farosas Fabiano Rosas gautammenghani Gautam Menghani gkurz Greg Kurz @@ -51,7 +52,6 @@ imammedo Igor Mammedov jasowang Jason Wang jmacarthur Jim MacArthur jsnow John Snow -juan.quintela Juan Quintela kbastian-qemu Bastian Koppelmann kmwolf Kevin Wolf kostyanf14 Kostiantyn Kostiuk @@ -67,6 +67,7 @@ mauromatteo.cascella Mauro Matteo Cascella mcayland Mark Cave-Ayland mdroth Michael Roth mediouni-m M. Mediouni +mjrosato Matthew Rosato mjt0k Michael Tokarev mstredhat MST npiggin npiggin @@ -79,6 +80,7 @@ pipo.sk Peter Krempa pkrempa Peter Krempa (work) pm215 Peter Maydell qemu-janitor Qemu Janitor +raphael.s.norwitz Raphael Norwitz rathc Chinmay Rath rth7680 Richard Henderson schoenebeck Christian Schoenebeck diff --git a/scripts/gitlab-map-update b/scripts/gitlab-map-update index c134c226aa2..743ad11900d 100755 --- a/scripts/gitlab-map-update +++ b/scripts/gitlab-map-update @@ -33,7 +33,7 @@ glab api --paginate /projects/qemu-project%2fqemu/members= | \ .gitlab-map-auto.tmp test $? !=3D 0 && fail=3D1 =20 -if test $fail =3D=3D 0 +if test $fail -eq 0 then grep '^#' .gitlab-map-auto > .gitlab-map-auto.new LC_ALL=3DC sort .gitlab-map-auto.tmp | uniq >> .gitlab-map-auto.new --=20 2.47.3