From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064225; cv=none; d=zohomail.com; s=zohoarc; b=W8KRmvVM7c2ZQhIIRV1Nu9ghDwciY4SxR6VCPm7Jt3AhD6JuzN0JNki3Zg0Ey5io/QuHI5GzGNDoSeSbKh7PoDki1hxT3U47k1QMzd6dPnL4HWIXztP7QcQvElYqaG+Og6FHrp6w0d7gQllaJFMmLIGvkWIfcqnLJZdY5pAVEV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064225; 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=tZcQDE9NLA8D1/7Rk7TIcfTc7fMZq6HAOUgnPmCd/Z4=; b=BNWPcgyvOvyKQEWLzJsOh12dy7feIznLgzMTMqPgk9+IRel3tSS80cCI+/jVFrtKoo4XYOjhKj+zfy2bta5aMj2Paibc40H1Ngeql6LNpfcVdxB+hHwHUJrybIGyx1MjsSqn08fDtxMbRxrMOFg1zgaC527pFmixt/xenYMM4GQ= 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 1789064225205676.56802987202; Thu, 10 Sep 2026 11:17:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIr-00042r-FA; Thu, 10 Sep 2026 14:15:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIo-0003vr-Al for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:14 -0400 Received: from mail-wm2-x10.google.com ([2a00:1450:4864:31::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIl-00073P-PX for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:14 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ccfd61ecaso1314065e9.3 for ; Thu, 10 Sep 2026 11:15:11 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e61a7a604sm1717985e9.3.2026.09.10.11.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 248195F915; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064110; x=1789668910; 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=tZcQDE9NLA8D1/7Rk7TIcfTc7fMZq6HAOUgnPmCd/Z4=; b=XKaQX6x3Yc30q5dIWbEFUNpslmGzi/Ojd+YV3i9ZLYqReCBJ4nT3ZxAVqo8eSb6BOq LlXXX2IegkUZAJfqVeIZcf7R/ay12ZRbo2fWUfHb4mVEAXHWUO7MypA1+u9hJhmNyAIf VQ/pvPuOsKb/1h3KCYxlMLHdQJchRbPaWnesB19ycDDg2ViM3LzrhwsRgKrMsaEnFlFY i7KII4HpxP6l3p2sIoFn6yJz4QYFugxG9WSD8YACWIMqBKtmBM82VV2cd7q17dq61mwS 8gUnjvetdIri+KLU6wsltQ5/13F5zTiJ/aHpw9qS9G00oaP5koBiLJghNzD1+gY1BGmi OsYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064110; x=1789668910; 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=tZcQDE9NLA8D1/7Rk7TIcfTc7fMZq6HAOUgnPmCd/Z4=; b=JUR/OtRTZE3tKN9cSNt90uOJbU7SlsJ/p+D3I9CfVlSQ5Vzf3sx7ndyEyFsZZdYqix 7h9TQVHejhKSlNvDH77QJqfXlU9MC9ObaefhsKzXA5VFZ+Ntk2DsnDsoDrJVcv6q4WDf vooEdwCjF9cMGWTVKU9gELcf+W9XMWuN60gX8rOzXCe2BE70yU7gkGgka4cVx3xPQXm4 fZfynUgvTlhXTGRvLhxiIHru8uKZ2qK2QnMUhlreqMIhm6wTlJ46LqvQOMLxJ6vYnHRf mPignUfefZeHmfAXUI+OB0d3nkLu041dWTCjc6jJAKguQpMm5SjRjKzPOynbmeVqbZUj 5s+A== X-Gm-Message-State: AFuF++nsHJyyBB85eZa7Q0YUKW1qaane3GLMtWlQ/WGenniseBcWzKma Ncu4YcLB0Acma10g+nu3IOHzCJLbr20dVmZYVyXTmV7WjGZlgepYLtlv6fdFrt7VQEc= X-Gm-Gg: AYBFou2eI1bXIv9+3CxrQlg0f8HQFDoU2WAxIzx7GocS7rY5ClyEdTX3sKgM72uiRG5 p4X601mpsPYXTJDED1UswEKSBcHTTNVKGeeoT9SFSn2lBOG4RvymxY68+5jDqRLWGq+u+Z4q0zS XVa/MWCCEnzFfMIJkJCYKpIFqyXE+b29xclAtPfHzch6GngYocNcJ5qXDpcesihl9y4T1migNbw Fpncun+b1l6iojMTUWszGtW5DL345o6RVKqm6F/il1mT1s5TTiPeTVguSO2IpPJx6QU3hvuCWKz mHArP34Vo9GdEsbUAq0btSyxMUEvL7BfAt1UGCsnb3dR5nsvFCe4i5WzaQ0x/wbVpiyG8CeqXw6 XNbYr9BQshVHPv5m2qZWknCrUNO9rXIjQEVbKnPC8Q0RJH7oA6bZakCiCQ3aao5OfpOZ0473Io5 JPnHqi5sNUKaB60p4ptMbpph5XY11eEBdMkIkV3cQPzqZGOeRi9/wy8qAaxkk17ovPQVKchxk= X-Received: by 2002:a05:600c:3ba9:b0:49c:fa21:e73e with SMTP id 5b1f17b1804b1-49e619c0558mr2627255e9.20.1789064110082; Thu, 10 Sep 2026 11:15:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 1/9] scripts/meson-buildoptions.sh: update missing options Date: Thu, 10 Sep 2026 19:14:56 +0100 Message-ID: <20260910181504.1010916-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-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: 1789064227160158500 This should have been updated when the meson check-tcg changes where made. Include it now. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- scripts/meson-buildoptions.sh | 142 ++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 5a67e59a167..67c5e33b011 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -10,7 +10,13 @@ meson_options_help() { printf "%s\n" ' --block-drv-rw-whitelist=3DVALUE' printf "%s\n" ' set block driver read-write wh= itelist (by default' printf "%s\n" ' affects only QEMU, not tools l= ike qemu-img)' + printf "%s\n" ' --container-command=3DVALUE' + printf "%s\n" ' command to build/run container= s' + printf "%s\n" ' --container-registry=3DVALUE' + printf "%s\n" ' container registry to cache fr= om' + printf "%s\n" ' [registry.gitlab.com/qemu-proj= ect/qemu]' printf "%s\n" ' --datadir=3DVALUE Data file directory [share]' + printf "%s\n" ' --disable-containers use containers to cross compil= e tcg tests' printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better per= formance)' printf "%s\n" ' --disable-debug-info Enable debug symbols and other= information' printf "%s\n" ' --disable-hexagon-idef-parser' @@ -77,6 +83,94 @@ meson_options_help() { printf "%s\n" ' --rtsig-map=3DVALUE default value of QEMU_RTSIG_= MAP [NULL]' printf "%s\n" ' --smbd=3DVALUE Path to smbd for slirp netwo= rking' printf "%s\n" ' --sysconfdir=3DVALUE Sysconf data directory [etc]' + printf "%s\n" ' --tcg-tests-cross-cc-aarch64=3DVALUE' + printf "%s\n" ' cc for aarch64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-aarch64-be=3DVALUE' + printf "%s\n" ' cc for aarch64_be tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-alpha=3DVALUE' + printf "%s\n" ' cc for alpha tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-arm=3DVALUE' + printf "%s\n" ' cc for arm tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-hexagon=3DVALUE' + printf "%s\n" ' cc for hexagon tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-hppa=3DVALUE' + printf "%s\n" ' cc for hppa tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-i386=3DVALUE' + printf "%s\n" ' cc for i386 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-loongarch64=3DVALUE' + printf "%s\n" ' cc for loongarch64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-m68k=3DVALUE' + printf "%s\n" ' cc for m68k tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-mips=3DVALUE' + printf "%s\n" ' cc for mips tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-mips64=3DVALUE' + printf "%s\n" ' cc for mips64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-mips64el=3DVALUE' + printf "%s\n" ' cc for mips64el tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-or1k=3DVALUE' + printf "%s\n" ' cc for or1k tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-ppc64=3DVALUE' + printf "%s\n" ' cc for ppc64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-ppc64le=3DVALUE' + printf "%s\n" ' cc for ppc64le tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-riscv64=3DVALUE' + printf "%s\n" ' cc for riscv64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-s390x=3DVALUE' + printf "%s\n" ' cc for s390x tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-sh4=3DVALUE' + printf "%s\n" ' cc for sh4 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-tricore=3DVALUE' + printf "%s\n" ' cc for tricore tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-x86-64=3DVALUE' + printf "%s\n" ' cc for x86_64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-xtensa=3DVALUE' + printf "%s\n" ' cc for xtensa tcg tests' + printf "%s\n" ' --tcg-tests-cross-cc-xtensaeb=3DVALUE' + printf "%s\n" ' cc for xtensaeb tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-aarch64=3DVALUE' + printf "%s\n" ' cflags for aarch64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-aarch64-be=3DVALUE' + printf "%s\n" ' cflags for aarch64_be tcg test= s' + printf "%s\n" ' --tcg-tests-cross-cflags-alpha=3DVALUE' + printf "%s\n" ' cflags for alpha tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-arm=3DVALUE' + printf "%s\n" ' cflags for arm tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-hexagon=3DVALUE' + printf "%s\n" ' cflags for hexagon tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-hppa=3DVALUE' + printf "%s\n" ' cflags for hppa tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-i386=3DVALUE' + printf "%s\n" ' cflags for i386 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-loongarch64=3DVALUE' + printf "%s\n" ' cflags for loongarch64 tcg tes= ts' + printf "%s\n" ' --tcg-tests-cross-cflags-m68k=3DVALUE' + printf "%s\n" ' cflags for m68k tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-mips=3DVALUE' + printf "%s\n" ' cflags for mips tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-mips64=3DVALUE' + printf "%s\n" ' cflags for mips64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-mips64el=3DVALUE' + printf "%s\n" ' cflags for mips64el tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-or1k=3DVALUE' + printf "%s\n" ' cflags for or1k tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-ppc64=3DVALUE' + printf "%s\n" ' cflags for ppc64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-ppc64le=3DVALUE' + printf "%s\n" ' cflags for ppc64le tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-riscv64=3DVALUE' + printf "%s\n" ' cflags for riscv64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-s390x=3DVALUE' + printf "%s\n" ' cflags for s390x tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-sh4=3DVALUE' + printf "%s\n" ' cflags for sh4 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-tricore=3DVALUE' + printf "%s\n" ' cflags for tricore tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-x86-64=3DVALUE' + printf "%s\n" ' cflags for x86_64 tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-xtensa=3DVALUE' + printf "%s\n" ' cflags for xtensa tcg tests' + printf "%s\n" ' --tcg-tests-cross-cflags-xtensaeb=3DVALUE' + printf "%s\n" ' cflags for xtensaeb tcg tests' printf "%s\n" ' --tls-priority=3DVALUE Default TLS protocol/cipher = priority string' printf "%s\n" ' [NORMAL]' printf "%s\n" ' --with-coroutine=3DCHOICE coroutine backend to use (ch= oices:' @@ -281,6 +375,10 @@ _meson_option_parse() { --disable-cocoa) printf "%s" -Dcocoa=3Ddisabled ;; --enable-colo-proxy) printf "%s" -Dcolo_proxy=3Denabled ;; --disable-colo-proxy) printf "%s" -Dcolo_proxy=3Ddisabled ;; + --container-command=3D*) quote_sh "-Dcontainer_command=3D$2" ;; + --container-registry=3D*) quote_sh "-Dcontainer_registry=3D$2" ;; + --enable-containers) printf "%s" -Dcontainers=3Dtrue ;; + --disable-containers) printf "%s" -Dcontainers=3Dfalse ;; --enable-coreaudio) printf "%s" -Dcoreaudio=3Denabled ;; --disable-coreaudio) printf "%s" -Dcoreaudio=3Ddisabled ;; --with-coroutine=3D*) quote_sh "-Dcoroutine_backend=3D$2" ;; @@ -517,6 +615,50 @@ _meson_option_parse() { --disable-tcg) printf "%s" -Dtcg=3Ddisabled ;; --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dtrue ;; --disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dfalse ;; + --tcg-tests-cross-cc-aarch64=3D*) quote_sh "-Dtcg_tests_cross_cc_aarch= 64=3D$2" ;; + --tcg-tests-cross-cc-aarch64-be=3D*) quote_sh "-Dtcg_tests_cross_cc_aa= rch64_be=3D$2" ;; + --tcg-tests-cross-cc-alpha=3D*) quote_sh "-Dtcg_tests_cross_cc_alpha= =3D$2" ;; + --tcg-tests-cross-cc-arm=3D*) quote_sh "-Dtcg_tests_cross_cc_arm=3D$2"= ;; + --tcg-tests-cross-cc-hexagon=3D*) quote_sh "-Dtcg_tests_cross_cc_hexag= on=3D$2" ;; + --tcg-tests-cross-cc-hppa=3D*) quote_sh "-Dtcg_tests_cross_cc_hppa=3D$= 2" ;; + --tcg-tests-cross-cc-i386=3D*) quote_sh "-Dtcg_tests_cross_cc_i386=3D$= 2" ;; + --tcg-tests-cross-cc-loongarch64=3D*) quote_sh "-Dtcg_tests_cross_cc_l= oongarch64=3D$2" ;; + --tcg-tests-cross-cc-m68k=3D*) quote_sh "-Dtcg_tests_cross_cc_m68k=3D$= 2" ;; + --tcg-tests-cross-cc-mips=3D*) quote_sh "-Dtcg_tests_cross_cc_mips=3D$= 2" ;; + --tcg-tests-cross-cc-mips64=3D*) quote_sh "-Dtcg_tests_cross_cc_mips64= =3D$2" ;; + --tcg-tests-cross-cc-mips64el=3D*) quote_sh "-Dtcg_tests_cross_cc_mips= 64el=3D$2" ;; + --tcg-tests-cross-cc-or1k=3D*) quote_sh "-Dtcg_tests_cross_cc_or1k=3D$= 2" ;; + --tcg-tests-cross-cc-ppc64=3D*) quote_sh "-Dtcg_tests_cross_cc_ppc64= =3D$2" ;; + --tcg-tests-cross-cc-ppc64le=3D*) quote_sh "-Dtcg_tests_cross_cc_ppc64= le=3D$2" ;; + --tcg-tests-cross-cc-riscv64=3D*) quote_sh "-Dtcg_tests_cross_cc_riscv= 64=3D$2" ;; + --tcg-tests-cross-cc-s390x=3D*) quote_sh "-Dtcg_tests_cross_cc_s390x= =3D$2" ;; + --tcg-tests-cross-cc-sh4=3D*) quote_sh "-Dtcg_tests_cross_cc_sh4=3D$2"= ;; + --tcg-tests-cross-cc-tricore=3D*) quote_sh "-Dtcg_tests_cross_cc_trico= re=3D$2" ;; + --tcg-tests-cross-cc-x86-64=3D*) quote_sh "-Dtcg_tests_cross_cc_x86_64= =3D$2" ;; + --tcg-tests-cross-cc-xtensa=3D*) quote_sh "-Dtcg_tests_cross_cc_xtensa= =3D$2" ;; + --tcg-tests-cross-cc-xtensaeb=3D*) quote_sh "-Dtcg_tests_cross_cc_xten= saeb=3D$2" ;; + --tcg-tests-cross-cflags-aarch64=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_aarch64=3D$2" ;; + --tcg-tests-cross-cflags-aarch64-be=3D*) quote_sh "-Dtcg_tests_cross_c= flags_aarch64_be=3D$2" ;; + --tcg-tests-cross-cflags-alpha=3D*) quote_sh "-Dtcg_tests_cross_cflags= _alpha=3D$2" ;; + --tcg-tests-cross-cflags-arm=3D*) quote_sh "-Dtcg_tests_cross_cflags_a= rm=3D$2" ;; + --tcg-tests-cross-cflags-hexagon=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_hexagon=3D$2" ;; + --tcg-tests-cross-cflags-hppa=3D*) quote_sh "-Dtcg_tests_cross_cflags_= hppa=3D$2" ;; + --tcg-tests-cross-cflags-i386=3D*) quote_sh "-Dtcg_tests_cross_cflags_= i386=3D$2" ;; + --tcg-tests-cross-cflags-loongarch64=3D*) quote_sh "-Dtcg_tests_cross_= cflags_loongarch64=3D$2" ;; + --tcg-tests-cross-cflags-m68k=3D*) quote_sh "-Dtcg_tests_cross_cflags_= m68k=3D$2" ;; + --tcg-tests-cross-cflags-mips=3D*) quote_sh "-Dtcg_tests_cross_cflags_= mips=3D$2" ;; + --tcg-tests-cross-cflags-mips64=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_mips64=3D$2" ;; + --tcg-tests-cross-cflags-mips64el=3D*) quote_sh "-Dtcg_tests_cross_cfl= ags_mips64el=3D$2" ;; + --tcg-tests-cross-cflags-or1k=3D*) quote_sh "-Dtcg_tests_cross_cflags_= or1k=3D$2" ;; + --tcg-tests-cross-cflags-ppc64=3D*) quote_sh "-Dtcg_tests_cross_cflags= _ppc64=3D$2" ;; + --tcg-tests-cross-cflags-ppc64le=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_ppc64le=3D$2" ;; + --tcg-tests-cross-cflags-riscv64=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_riscv64=3D$2" ;; + --tcg-tests-cross-cflags-s390x=3D*) quote_sh "-Dtcg_tests_cross_cflags= _s390x=3D$2" ;; + --tcg-tests-cross-cflags-sh4=3D*) quote_sh "-Dtcg_tests_cross_cflags_s= h4=3D$2" ;; + --tcg-tests-cross-cflags-tricore=3D*) quote_sh "-Dtcg_tests_cross_cfla= gs_tricore=3D$2" ;; + --tcg-tests-cross-cflags-x86-64=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_x86_64=3D$2" ;; + --tcg-tests-cross-cflags-xtensa=3D*) quote_sh "-Dtcg_tests_cross_cflag= s_xtensa=3D$2" ;; + --tcg-tests-cross-cflags-xtensaeb=3D*) quote_sh "-Dtcg_tests_cross_cfl= ags_xtensaeb=3D$2" ;; --tls-priority=3D*) quote_sh "-Dtls_priority=3D$2" ;; --enable-tools) printf "%s" -Dtools=3Denabled ;; --disable-tools) printf "%s" -Dtools=3Ddisabled ;; --=20 2.47.3 From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064204; cv=none; d=zohomail.com; s=zohoarc; b=VV5si3raSL2AGdnuUQC9sU9Y+6vHTXkW+QX+hJSuqO/Kts7Tof7GTtFRsML166LsKPk25zFx3TvtV9VmErTS07Xh0LnOjSWWgcaBRV4ZTdIhAACxOKCEtE0F5+8g2y7c13cP/wTwJupwihoYlATBYGElCmXsl7tDfgG2TDFYSbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064204; 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=BKgIyT7aV8pe2TGa9imwfq6KhgrYp2WoRmbiIUOnyok=; b=dwgN+vMkf4KRrIeYvorpaKcmHK4pWMUru/T2QFKSvQTouVOmaBGU9RS7AQhwpHWmFk2Obqs1ADR3wGE8fy+VkCqkPfMo3xRyI9C3Rf/Z1TxkiL9O4gdFLOFbQY7YMT5t1kx0+VElU+EiRw3/ph88esZwU5SqACKS4ur5LPLVuIs= 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 178906420419573.24819487211983; Thu, 10 Sep 2026 11:16:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIn-0003vL-HR; Thu, 10 Sep 2026 14:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIl-0003s5-Fj for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15: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 1x4jIj-00072I-E9 for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:11 -0400 Received: by mail-wr2-x10.google.com with SMTP id ffacd0b85a97d-4843cedd129so27098f8f.0 for ; Thu, 10 Sep 2026 11:15:08 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb33fc02sm184020f8f.16.2026.09.10.11.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3AC035F954; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064108; x=1789668908; 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=BKgIyT7aV8pe2TGa9imwfq6KhgrYp2WoRmbiIUOnyok=; b=DHLLwQmjlMNVKTYq/aqQYd26sX9KbwSvqnwKZKPqt0GbE/op/lGn00iPVSxBx64ZCd xL1Yd8GgIvSsv2+NqQqRgOjIo7FVB6r5yTlHnyLIgJEStRqdOldgy0LYfD/ZEiR8vym7 99mmrveK0bcw4H1b+kmHioo/8CaJaH3HLhAxY11yaKz2FmKaYi843nlYiL+n5MBuFlf3 KfllZL6Z7a/gsXl80aZTPuHSeKykh9LTmBK+MaekiC8231+zdSXsZhY2kq5ROhNEU3C3 6WD/3w6CihioVZfoPezzrdxwusRl/qEzHmSRcXnOtUiJnF+Bj8HqASKHOiInZM/aWfKW hPeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064108; x=1789668908; 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=BKgIyT7aV8pe2TGa9imwfq6KhgrYp2WoRmbiIUOnyok=; b=ZegTV0xnBRvCiXKiOxzuLqdWlA0yeV8repD/9V/qJwEGABOTv4l63DOBJc2JPubw2t YnurYwRUDi6DjFIJ061nBNH+O8mp2ZZv46HDGeDHapDjVxy3zXVtEhKFhsZjmMedbMvR t49vPIDoVDinIR2K7+DT7YCHF2kZEggp8FFLcyfjAoD0G7uW39PEBGf24/PM30PXdpfj 3fwkeenxH29im5/KhWu2Ypnx8FjvDVjwaRxI96iwA/7QDIp8KTJe9OZhicxTsC3EYa75 MQbXmsYQlU6hNAt7BpgR2WG16BMNmN89C39d5SYqRAIoPQ9AD+18F7HL/P4SjWM0K9IO PkOg== X-Gm-Message-State: AFuF++n3z3g4Tf9YjaGSvor0g18Z1LoMw0cRGEr17UA3nrkJ6FrfQ95b icBWj9muK/1s7QM3xr1RPy4SYOBtyB/3T8B8WgMZvkSiB+jajlLI1tdlMSC4FW+/Z20= X-Gm-Gg: AYBFou1CiTqdzokTV5HOyp5F09gbrV9s1od7/RJ/ZLkodOU0x5cvFosB9UFUxErJB78 hEJtCSLFxnR58/ybPBrzjz1PLgEeVPiW617Kq2y9q6FFZeAMuw2u5ZKMbb5IBb+ptTjEa7gKtPJ ZKDHIbhR60MeHWR0oQT3wOsrp78eHibPbqHFhkfCpLbMjwRV7MjBdroBaY3bNB86uuCPUCXD3Y6 W/41IFBYyDfAyoR4TIMUk4YmMi5riwCVjVgUYag6snP7IqKRMA9iGDfihzhosPgmk6jeLoSeN/R 906zPirGUuLSmioSIedCpQX8Vl4A/SpBrZGMlV982AdmJZKiG2JaKcl6meKPLIpJYGSma8j8Knx QqvC107DEa4kikkqNWaz5xoTIzHklmjmgbVXAvxVhthUETBH4aKRnhDZOTHCnveuY+jiTj7VGyg gSCPubQ2BXyfXTUc/4hDAP/Iq702IZ9XE79MP8W++hOqXyq6WOiM+VqMcwy345kHXXDVs1iiYVU Eh87NGfVQ== X-Received: by 2002:a5d:5e82:0:b0:485:8101:dc40 with SMTP id ffacd0b85a97d-486eb2d8278mr594551f8f.9.1789064107791; Thu, 10 Sep 2026 11:15:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 2/9] tests/tcg: improve check for working cross compilers Date: Thu, 10 Sep 2026 19:14:57 +0100 Message-ID: <20260910181504.1010916-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-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: 1789064205570158500 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 Message-ID: <20260910100120.2076092-1-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064193; cv=none; d=zohomail.com; s=zohoarc; b=lVrNAQEeTQgfjXtgkmmciaeeHpGx4CyAvTD1N4vOdq2btVBEd/Mh3Gga5lyPus9XrC/C6An5QSkc0YGSLz4yH1zfmmKy1kRNxbRISfOuzIvy4gpo20TzDqycVUDVsdKWKSDESWDkwHooQW2vQc1L10EN6lfrpSi/z8eXDHoohMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064193; 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=auvQxRv/L/Tm2MzJSSlg0H26UMesvAeamwrbPdUcFpY=; b=N9I3kIhf7D4PlTG29jRVEx8pVlEZIDR4iAkp6R+MQ78wdr3V4BrynVst33sLRJCWyooDVt91cz8kyABVFB8Qqr89LPfxt6FFcZ0QX2vSQAV6N0RxrEqC+YIxGsGsB0g0wx1tfPCuvzs+oIR2Gv87owzi8aLC2tdrjAOw1t3B4Ew= 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 1789064193110573.5055639898268; Thu, 10 Sep 2026 11:16:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIm-0003u2-Ve; Thu, 10 Sep 2026 14:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIl-0003s4-9i for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:11 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIj-000726-4s for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:10 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-49cf4f81d86so1010555e9.2 for ; Thu, 10 Sep 2026 11:15:08 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49d26be3e0asm93795445e9.1.2026.09.10.11.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 50BD65F9DA; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064107; x=1789668907; 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=auvQxRv/L/Tm2MzJSSlg0H26UMesvAeamwrbPdUcFpY=; b=o4INtrBrDy7ReVYZWfMgcPIiJ6JpSS1OwPMUlH72EaxA9K5tNfdh+NS6wpwUsquD6f Pa6O5krk/KwU/omMf/CDzCn49dhJDjFHfrPbt6M22xVKamcX89sIUeHRMb0LctGjh6GW 8VItoeJeXvAtUQ4+Fz2KUvn9b/B4N6WDaeDcOquSIr0iH54qPyxk68/BPMMxBB7cqADp jJ4DTO2nN6L4EW2hcdf+oulVFiS/MNdIVGDj5ErWfT9gWKliy3G/jYdndZa85YpQfGjS LHx2qOhHng6e55G8Wj2Utxnqs87kJGPwB+xr3zL3L60YUsWNn0gh3l105O3+W9SD3N+P c8/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064107; x=1789668907; 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=auvQxRv/L/Tm2MzJSSlg0H26UMesvAeamwrbPdUcFpY=; b=sB5iREJ6Pm34q+GgUu6B9Sk7lQTKYfFZ24i/zByEZl2WqlHXSWWbllRdlBSo4vgKhW FXPKA6DqfOuY9ZpMvwLKixJS/ndojxcvDyyxLlqh7HCGZKm/lUulFvtrJp5qoYDq1bw1 qglbnv/MSEagGlbdZvgyWIMe2jIuhox9FazX9FGh4whEnemp5G0d3ILIH4l1Tsd68DNJ staeL2AuYf/6ibFdHqvtccZP1nXektFkLSAz5g+h/2LK7k93h5xNcLU1oLwC8d4insPs DTdzpMYqzGwTNVrJxE4GPeHhdvAUXat7G8EOLY3YAp3nKseOSJXtMb4WxwJGhKZOaZ/N hDtg== X-Gm-Message-State: AFuF++mTJIvEQXq2DBJ0OSFjNu4qTpzPWt7CFh6+rTE4UDN6Qwr/5gVP otpUuji6XxxpcQk56eO4fXkR8fOcelBvRwTvhjoWmZ7Om1O/tHsUwRaEwuIsh8pIzGI= X-Gm-Gg: AYBFou3iS0Jk1MZZN8kj2EakAkJshiULe1ZUOdBif6G6p2dHLz7xctwcCwb4vpvkn7q 3Vh1G1stsKgPizoirgtj9lKhypGIuI2W43a7xh5ykm9w2/t9L0oHc1KVkJjTimtskcWF6/jN0vK O4wUpXoQ/a45CoJlYSu43DKJ0VEHrlPqaqBoKS9tkpyKEAaMF1Dr73pBaF679q50DZeIgCQDMyI hZpsE6Wbril3NdX2z1MKd5Hwl1q7Ghz+IVVfUGsKEe6DB8QawZUt5Di5fku92A5KgmiVEwCs6Zp kqq8SHW4UjuBaBpfndLalF+y4IvRHZIxREBLb67Uyv4NgXy6+U4u7TbPaU2p4O4aUVtZj0UcpZQ FrLAhevKZlxr4Vf8ftRa0w0zQXa6MiPydTiy4Dwojg5iO9IGE168E+o9y2sDLwo7AZA9bAQYI1F TEjpJ6WB5Td+/v2Sfw2Jqp1cY8syo9vDolRza7W+hEXDEloWz1wFYTfSXYKT/eT6WR/TNTDq8= X-Received: by 2002:a05:600c:c049:b0:499:60bf:c6f7 with SMTP id 5b1f17b1804b1-49e61992b43mr2853525e9.13.1789064107114; Thu, 10 Sep 2026 11:15:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 3/9] tests/tcg: prefix meson built docker tags with qemu/ Date: Thu, 10 Sep 2026 19:14:58 +0100 Message-ID: <20260910181504.1010916-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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: 1789064195335158500 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- tests/tcg/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index d41a228fb3d..0604c4b90b9 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,7 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', cc_dockerf= ile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) @@ -270,7 +270,7 @@ foreach target, plan: tcg_tests here =3D meson.project_build_root() cc =3D [docker_wrapper, 'run', '--run-as-current-user', '-w', here, '-v', mount, - cc_dockerfile, plan['cc']] + 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true endif endif @@ -279,7 +279,7 @@ foreach target, plan: tcg_tests if has_cc summary_cc =3D plan['cc'] if not cc_from_system - summary_cc +=3D ' (from \'' + plan['cc_dockerfile'] + '\' container)' + summary_cc +=3D ' (from \'qemu/' + plan['cc_dockerfile'] + '\' conta= iner)' endif endif tcg_tests_summary +=3D {'cc for ' + target: summary_cc} --=20 2.47.3 From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064204; cv=none; d=zohomail.com; s=zohoarc; b=eIRfF3H17aMwtZ3j4d02NATcUW31cHJq3VyE6ojVnr7dIw3CSq1gH6+gPPoFQKTV/MLbqEHnwh8Gl6ThTpT6VmW2zFJYvtUEVbtpwsTqpDCXWCEt1TTeEJIKNrR0pWOS3nVw2HwjKLKO+I7CPFx6K078X0lnWH4K8dIQmcVUK/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064204; 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=C9qlVmOnQkWE+xFF6u070uQ1ams8HXddt0mJhaLqyXQ=; b=GVA8Ye17Dm+oJPn1NsbdHTGK9+oNC/4C0zX/hD1UaEEdVHIv/fBmlLRPVhpZcjA+/nzSItuLeEFmQSEvd4BbeYfEiap3jnBCOpMtthw0mMkGMy/xFl/m1hvq7496KOw2sFfN0pvCtHG3elw0KCzlsaxGON2XGBLO1g4R22OElNg= 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 1789064204325143.40489405890014; Thu, 10 Sep 2026 11:16:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIp-0003xN-Fj; Thu, 10 Sep 2026 14:15:15 -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 1x4jIl-0003sz-Vx for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:12 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIk-00072a-1K for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:11 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-49b392ccaacso1919245e9.2 for ; Thu, 10 Sep 2026 11:15:09 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49d26d49d57sm81356795e9.14.2026.09.10.11.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 681A35FBD6; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064108; x=1789668908; 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=C9qlVmOnQkWE+xFF6u070uQ1ams8HXddt0mJhaLqyXQ=; b=OnvnqQf4cNWBeit5+aJuJ/6bU4r+YHsRakComzHrJRyzsUbeR/W3z8QjhsieCCjrkH MKmot2uceTtFcjXPXDprX1Q+OoKapXuLnr7VX9YJkA0dS0maueuKP+O5z8xU88HEq6X0 jyKO3tEhTSR4PZJTxAPzJ7uVt2xY4tjsdAiVvu43R4YEa8vSstnoMDpm6M0WJCyeEhbR uAHyktlnKrp3gxePlHbwAU97wT9MfxWdDZIg2etOAQJyJg/WaCQWggyPF+T6dHIRH0W2 yQFoO7z7UYZlGBHikIs9e1X9v7f6Q9k7LDJm86YFd64BsW43Nm8fg9QLrBtgiw5TTcGh V08A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064108; x=1789668908; 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=C9qlVmOnQkWE+xFF6u070uQ1ams8HXddt0mJhaLqyXQ=; b=JewXy81/h13JWjBbobU98s7AAeYBQy7tsdE3AxsFN3NDlDbvgWsZQUyZIGA7L7x1qf 6Y4/JTDMFsBYT6fcR6E/Sa5/WlrTKun8w+2Tu+7gai6nkcLdIm8lJwo/e89N/1HWo39U /4LoD8pIjoE2MN40VU3PgBpxLQR9IFJy+smlMMv9XyMITytYbNaksyobelKWDqIwbvF+ 5b4TfNozlG8sWjjbGjL/5eKRjcXaDJE+ATkRyCZHDKZhaFK7LG2k+t24WpA75yBKN6bJ 8E5kW7QGiz+5kLCR44gp39cBWmByJObBiwOtB1EA1QIt3neeGvzg4+Kxn/T5w7Sbw1Qg e6yg== X-Gm-Message-State: AFuF++nTsvYqJzXqkt7VLnqbnUpFonDJLnn0C95/FcNyXiCl39bCWwnK 8UXKl+PgxIVIxyegCL3KIU1CNOPuPRX6Ii0mx7e3+9h8Cj93I/Yxzl6p+OwXObru7BY= X-Gm-Gg: AYBFou0nJJ7FUHvnsEANfQuX68+QifSU6/zZVnwItsQMl0NRj5t5oGVphlGgYoENfjT FN8SxVeylbraI22DV2BmUT0ufAkzlkLVwFt6imNWsohn5DkupzRajhqNIe/qkKRTB86UwGpIhGX lrBYvk0fY+OgVarJDDcFoNguN0P4pBppCgDGuplOxLMy7d7Cl77ZEkAB8Bx1Akoq+wINpUnMaoK gygktWUV9cIUpp0dtpb4fThRDHPpsXhzx2Ypze5yKKCdAkXiUqmqg+koFeY9ea7LIaYoMsrfwZH BAgvdRS9hyGoKHc8JPkCqZRP9St5LYs/F3SQKhYRZxcZAUaH8hU9C17lu/B5OaZcG1VL8JRSANz y4uTlWFkjdDDfRol5QGGjMzNOVVIETVg1ulLMVAvoEeFfeXd1ystVuDiQgMRacE9UBB4GxqNK4Z DjA6gsFGc6CDDxmBB1JCZVkGPkcAut6Go1QRD0gbP85YK3XC7Pn6UPrW/T6UfuSpNzRAxXE70= X-Received: by 2002:a05:600d:8494:20b0:49d:1840:4fd2 with SMTP id 5b1f17b1804b1-49e619c461amr2105885e9.23.1789064108305; Thu, 10 Sep 2026 11:15:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 4/9] tests/tcg: use --add-current-user when building containers Date: Thu, 10 Sep 2026 19:14:59 +0100 Message-ID: <20260910181504.1010916-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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: 1789064205564158500 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 0604c4b90b9..814f2f8cd8c 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -255,7 +255,8 @@ foreach target, plan: tcg_tests image_name =3D 'image-' + cc_dockerfile has_docker =3D docker_host_arch_supported and docker_supported if cc_dockerfile not in image_targets and has_docker - cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile] + cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, + '--add-current-user'] t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064221; cv=none; d=zohomail.com; s=zohoarc; b=hZPN8PJmKgYAvE6jQLn1Gzz1l03rJJ3DoZG/ZEuEUoKVFLeW8nN9INqAqERfqItGA7Ty/yEaOPSNYtm7Eo6IoQ71VqQEme+2t7xGKeiYtp2DU1MCPImvtQU2g7Hg/RfiPyamhP8+oTTcyxiS2Wt48xoAwrRsgfNX32yHUavdhL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064221; 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=T5Xuw/KQ0j+V1bZw5QEINYzzMk8dJ72+D9GtgNKZY48=; b=bJLVnZcCZT3O1Nrig8d//oTgU8VEllijvOwcuVGSu+yajdIZkc8UNl/oZqEyNcnOlawYm2tZqS7o7BbGFfH/nxCBVubPoTsZIfvvp6D7Sn12krkxTiOrCkKHO+i+XfolptNV/vl3KQsufOX9IkQgeLNERdl4PjtSTpqEHU35y6E= 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 1789064221076742.8773712025763; Thu, 10 Sep 2026 11:17:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIq-00040t-Ny; Thu, 10 Sep 2026 14:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIp-0003x4-9N for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:15 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIm-000748-Rj for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:14 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-49d036e0e99so838075e9.1 for ; Thu, 10 Sep 2026 11:15:12 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb33fd3bsm208083f8f.19.2026.09.10.11.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 84A0D5FCE5; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064111; x=1789668911; 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=T5Xuw/KQ0j+V1bZw5QEINYzzMk8dJ72+D9GtgNKZY48=; b=bmikMRSUJ/6y+omp15H94d/+ptfYN7CIcQaVSVb/V156JovA0sobhkTDBKfgdHQdjf F8HGz0CyG2O3+GZGH0gCFj/iKbWzVPtfEzPnFEEjufii6Cs4BlqkrwAgg5THNdHbc7YO gMMxGM4Rx6K93PDESxzci/8rIaCUmQAbR+kdd8wn7bmdd0ZbpueWFRP9fwgAW0uZ5FlC Y6J4fbhuIplYI0ChqyBaiRLXK/5NAVV9RtWSuJS/WFm0g0+BLVeqbGN71RCsOs5QIZrx rRHNMdpOjlqJXZ/vk/Al9lzHiRP+rpUKbYu1y561JNUNNvRbFRUfRr7SoQrUJF9ke/TL xq2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064111; x=1789668911; 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=T5Xuw/KQ0j+V1bZw5QEINYzzMk8dJ72+D9GtgNKZY48=; b=qctavkGqa0tKItAeQnXDUZ3L1dT7nfITKtbc8qG2boKr7SQBN9SKCeoqN48Xf8yz9S IDOB8O5hMXOyGaN5Ns5uP+ErP+5CegnT6czQ6BHyhTcWFOlGKTpdrAZUcPpWsXBp+XZS 0eZ4f0BqrYLdhebdYAbLq3p3iNSRc3ey4jc2RiizV3XDdgWG/n8ibjNerhkLlxvvaHX+ 7KdDfutuvS1U9H35L5B/awQlhfyNi05Z80rWPFZVr3m2YhFAIJjvCG7r6PLx6Qudzcho ly1fSInhe5rwRcRutSBgJDqyieKEukEyfQZzxJGUTxZtewD621WX6AYpyxkU6N2DMQV6 D6wA== X-Gm-Message-State: AFuF++lMFcj2eIdFfcGRUCX77KR4/WNOMaoFTg3ASOBy/8H8W9h/UQit RrrB6lfw0dNwVNNxE3gzFL89MRzN2+pB9maYgCsiYlMME6eQIPpuM6fEbRjPmpGX/jM= X-Gm-Gg: AYBFou2lrFKM/dop1oyOD693ZGRKbbfszoa0X+l0KzL+0WJ9nt/rjCiFZsXymhCAiKR Wc7nKwOCyr/OR0istA9OryVbcPs8/iyj3l+pysKnlwRZg0KhKhV6xdKpRF/STD+FdHEmjwIUTro S+o5yoi8gwVTM/hQmKqmpk7uRRx4k9LI0WlB+D1TqcgESKjT65fLffNGTTE+VxFbW0Gl5JAsbsk 2mHSIk4C+6c78mFH3goEXIpuQeN6/GWoICsKxYz3iAdPgOk/5wQjN17MqHhVY/n8Q/EFDfNFW+x bGC0QFfPYz5zYTEuTwSdPKs/O9gSFbdDutiKmlULH+oGfUurv3WwwslLoumyKR0/mzAApJJ0Iqq n8f31G+/3cD65rLttZVjD5o1WZjU4bGTFfZaD3DE5tWBFr9JfKy6IYvVx2E4ZUHY5BPmAibm+f+ 87T6vpztyj96QFhKrkEMR6WXqhkmYfO+AkxiXs7+NsKwCSX6dDITctkERA9ukBDLwoAiGt9GdnP Jq+8j6aoQ== X-Received: by 2002:a05:600c:8712:b0:49c:ee36:10fc with SMTP id 5b1f17b1804b1-49e619acbfemr3156425e9.8.1789064111449; Thu, 10 Sep 2026 11:15:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 5/9] tests/docker: add container registry to configure and use Date: Thu, 10 Sep 2026 19:15:00 +0100 Message-ID: <20260910181504.1010916-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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: 1789064223007158500 Previously we had the default baked into Makefile.include but as the meson container logic will also benefit from it we update the configure machinery. For now we allow direct make invocations to override but for the normal case it is in one place now. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- configure | 8 ++++++++ meson_options.txt | 3 +++ tests/docker/Makefile.include | 4 +--- tests/tcg/meson.build | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure b/configure index aaa41fe47aa..7d6b11ddd35 100755 --- a/configure +++ b/configure @@ -172,6 +172,7 @@ fi # some defaults, based on the host environment =20 # default parameters +container_registry=3D"registry.gitlab.com/qemu-project/qemu" cpu=3D"" cross_compile=3D"no" cross_prefix=3D"" @@ -728,6 +729,9 @@ for opt do ;; --container-command=3D*) meson_option_add -Dcontainer_command=3D"$optarg" ;; + --container-registry=3D*) container_registry=3D"$optarg" + meson_option_add -Dcontainer_registry=3D"$optarg" + ;; --rust-target-triple=3D*) rust_target_triple=3D"$optarg" ;; --gdb=3D*) meson_option_add -Dgdb=3D"$optarg" @@ -862,6 +866,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). @@ -1318,6 +1323,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 292625af08a..030231492e1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -391,6 +391,9 @@ option('containers', type: 'boolean', value: true, description: 'use containers to cross compile tcg tests') option('container_command', type: 'string', description: 'command to build/run containers') +option('container_registry', type: 'string', + value: 'registry.gitlab.com/qemu-project/qemu', + description: 'container registry to cache from') =20 option('tcg_tests_cross_cc_aarch64', type: 'string', description: 'cc for aarch64 tcg tests') diff --git a/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 814f2f8cd8c..22157a47c96 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -101,6 +101,9 @@ if get_option('containers') endif endif tcg_tests_summary +=3D {'container command': container_command} +if get_option('container_registry') !=3D '' + tcg_tests_summary +=3D {'container registry': get_option('container_regi= stry')} +endif =20 # plugins come first, as we need to build the list test_plugins =3D {} @@ -257,6 +260,9 @@ foreach target, plan: tcg_tests if cc_dockerfile not in image_targets and has_docker cmd =3D [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + = cc_dockerfile, '--add-current-user'] + if get_option('container_registry') !=3D '' + cmd +=3D ['--registry', get_option('container_registry')] + endif t =3D custom_target(image_name, command: cmd, build_by_default: false, output: 'no_output_' + image_name) --=20 2.47.3 From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064213; cv=none; d=zohomail.com; s=zohoarc; b=Lu9s3YD2n4iipGfrxUE5Xa6pqhSTbvvd+/OkkUstWqUQSaomOb0VBS3wxhIUN15XBJgvX5gm7zXWm2FO91MPn0VxpmAtk9xM8jEUEXwSQnCWZXUydsKLKILe8t3gfO9NM1u9fBR9DrobZ+z6PyGwM/gl/qP1S/0s73eq21eVVzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064213; 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=eBsj2XhCEL/NhykBF8J7KXxpFhqb3kG+EJ/KbNIHCIg=; b=i5A4FhZGAqjulnMPh6lv5aQRKRGC/ctcIw7fht1llGjiuISmicN0E3zLEsQLfX6ji+4cJDDHnxrxbR4KyljVXVlnt0blSkLyf48JOp3jGdawwAd+oC8JDOVPPVvdokOgRNex2Ua6dDW3ftDFNot4bYUYZ7Zz1YfNk/0dO5b5ZaE= 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 1789064213518884.3768419619474; Thu, 10 Sep 2026 11: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 1x4jIu-00047P-IB; Thu, 10 Sep 2026 14:15:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIp-0003xj-Ky for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:15 -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 1x4jIo-00074f-0i for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:15 -0400 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49cc9f581c4so524055e9.0 for ; Thu, 10 Sep 2026 11:15:13 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49d20fce7a7sm320089145e9.4.2026.09.10.11.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9EF605FCE6; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064112; x=1789668912; 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=eBsj2XhCEL/NhykBF8J7KXxpFhqb3kG+EJ/KbNIHCIg=; b=hPHZSi7cKxnas84gXIyF3THLjqpxUffNDNzQ5oLvn/8lLHPPkdaPtfIMhkkgG28/Lp DU9KX3XlzubcJIS8JtjToNeu+EDNgyFredASb4aSHwOr79GSShzx9aH6eBUPEgFqxU7S pia0m9kqRtA3ABji+kwoCVAonHlgzbfuJinLkjyQZ0wZRzkI9X/tTr3Yc9gmNQg8rSQw NJlj0eDQtiIuBkePU3nS6XcWvHpyVT8Xfgf75WpW6a33GFLudcD1Qb/7P7Z9+LMAq/M2 e3LfqtNUSd4aquPwQQRrWvD0vUKMxI2Ee2DrF0GwGklYFEJQ26aICn/qKFo/PTv5D2TO NB6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064112; x=1789668912; 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=eBsj2XhCEL/NhykBF8J7KXxpFhqb3kG+EJ/KbNIHCIg=; b=I6qLUzmpfz/fxHC0fayOxv1/xH34o4VH5CTEe1jlxf+/hxZxv2nyOWGdmeBwosC+Yr EYl7KtLrk6nh5xXgbswtY/ystVcz5gWf+Ekhu130yMZDkbGy5zf1Hu7OYG/iQkBPfx6s sO8+FPQEhOjnWBVvc/qFiO1OAnDFAUmMytn6wVbL4zKsFmRFGpn/m9J6fyOobjEjIRNB w1MFoEQAeS4z3K/w9O9ivxtHzVaZmCSKoUAWVq08y7Mt9Xhsu3zFL58QQspnlBrP5XuC rLy6yIReTISCxHdZwpApur1vAQIWNhfJy06p7WgBQ2/5QnleCPWLsYTUL4OsxZETkPGa HGxA== X-Gm-Message-State: AFuF++lKRrs5DXH5ZVvEvZqGgwQLZqgXzk610NNIx2ca13JlJzVieIlY VeZk88y50qbgu90dxVmfrp5t8LBacBpuEHUVRt3zzjb5EUcVKnk8buAjApxxHTM4tRs= X-Gm-Gg: AYBFou0Z911W4m50KyOjQPg/yQXQTIpYVOinHe+zF0fEEv0Q2n8/+HQqJYDsZWgCwBI TneXKFsmVLtv9xoqqhPGGtuPA/H+eRaATPc7TifsUPWniA8iIGnXPYKma3bWi9eyaFCJHYE1NN5 zYjREATFcwPlqslN1B2IWWOnpH9TUAYiCldmMrkTcMfcb8q4oLpIEjoh033sAXgF2a/0Okgk1gv EynwBvmcgU+1G8lpNbDbvk8U1XUlnNVSX6AZ6BBcl7cuQRXnWhGP7RV8UcwNHCYX3EpHFgFhhSp T0yHYMbYBtjneOPFKm96Dmx6HuJwmqiUymsqMoYbWFlFO4bIiy3J9FkDCOc04Xp+Lbq0g1yECEs 0qUiaDj4J/0Ae4R0Io3XYKC49/YdZvrClRfdwPPL/xlm9fAlO8Qw8VvgdbBQAy46F3iU9xRKOVN U+kf8nRjdry04GxhRpw2ghmLb7u1/2GWDLwsPE/7BznvRugSSL3AqCX/4JmM72GNlYH0iTktfN X-Received: by 2002:a05:600c:4683:b0:49d:1916:2133 with SMTP id 5b1f17b1804b1-49e6106d393mr8154265e9.8.1789064112349; Thu, 10 Sep 2026 11:15:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 6/9] tests/docker: remove used _read_qemu_dockerfile Date: Thu, 10 Sep 2026 19:15:01 +0100 Message-ID: <20260910181504.1010916-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-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: 1789064215287158500 This is no longer needed since the functionality using it was removed. Fixes: 07056db1b50 (tests/docker: remove FROM qemu/ support from docker.py) Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064180; cv=none; d=zohomail.com; s=zohoarc; b=j5h0zJRDoGj6/C8DdU7pa6yHxhL4X7J93qI0qSn2ePVfBo7E1wXFnwJfv9bLUtoeC+/E6SpP3zr8V9C1EO49XjmbQwnDI/UqBQPgm5JhT0rFZkecpddNn3krs+SL3e5PrhwGMyeH7zbTJCo2esaOI/5/tBqWp1MFwG/sGsplrTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064180; 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=ym8BIau/MjTomAUFJ1gLexl30aQ1Mplhoosuj8Tqg0M=; b=ewMQmCCZj6ljoa498cHSHnD0b1hlDtvw8fiDQr2gmu6UAWpgVAx8Q+4GNz+Odn52NMp4x8NxromNfKh3i4jWnpADgWBiei2e7uJZSWDKeMElg1NTNxGDBbgcJ3CVf8Pr5phpr+KuawcFvzrjqwPTiwlTo4ZQwb/Q2hM4WW7o4DE= 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 1789064180437568.0041190527853; Thu, 10 Sep 2026 11:16:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIx-00049i-PQ; Thu, 10 Sep 2026 14:15:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIq-00040c-Ix for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:16 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIo-00074q-F0 for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:16 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4998b5a63e2so1258445e9.1 for ; Thu, 10 Sep 2026 11:15:14 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e61a82317sm1309925e9.3.2026.09.10.11.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B68125FCF8; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064113; x=1789668913; 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=ym8BIau/MjTomAUFJ1gLexl30aQ1Mplhoosuj8Tqg0M=; b=q61DqRv8WWiynSjmyyRcCRPaYQnp4q/t+YFO/0fYuKqYiukF0ZKtw1dew7kvqgIJQw jHZS3kWaHykKdei4eCxvbXj/rqIOgZZKWthgskZgGQhHT8qWqzCX0AJz0yWyB3xnrM7z iBkou9un/MzCWdE1AmtbARsoy1Um257hz2US0XO0PEmu31Odbc4IKKBJocRvY1QArVGx 9E+ySdMJrGHSR9zgWVepPZpGRAeiFmXvFR0IxHqjJXn/yD6/5MYNZRtxe/4H8HZ3hp8j 2Mvgx2ibYUTGBsY95dMDikSZi/AnEJC9y6SgCNDjqdDiii222NgdznBH/nPjZB/2N+sJ LsNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064113; x=1789668913; 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=ym8BIau/MjTomAUFJ1gLexl30aQ1Mplhoosuj8Tqg0M=; b=rd0MuJj3d213T3ZAoVLck4mNatKz2X5z6rSoP6A3waH+trXBVqUNkWv/qlS9BKI1vw Pc6JLbm1112S1mJmayhb7ccJrAdn9al34XM/88VILKxfh1ugHFebp+4LMHizSMfuHqZM 9i2mYV0+c93Akmy1QUAcLv8tcadMpCteoujcmZ5g3Tpex11lOq2OHUIDbcHUGajt9C/d mSxiIp7CoybA6CaivRkl5hh6Nzwpnw4McqppXjkqyDRPEI0mFMR6oXrBg81aD+XXRe4r qOPhfOqSunNXmOglxA6ztdE694wWuDHGgwF2zeAbs6cZCfjF0rxnXmvH6tjUY0c1wf8Y mHqQ== X-Gm-Message-State: AFuF++mo3t8m/XP3UVXlLEQxAy1f56/I8xnuh+4KBIAgewonsq16sALx g08WlJxsywYVbR583qs99+6yiNOR42lnGXjmkW89iKRf+3WQVsPfNaL1JQ90WYh17Wk= X-Gm-Gg: AYBFou3/xPrqg3eUG6V1KlU7vzzS1Fit7QQfZsMFIUtsKvUonmJizU9Dg89H+ZrwDO1 EXtaC9uZeNX960r8DIjBBpxkasZ8uhHJr73XqxycUE8FLg63gatvsjm5dgz16ER6f+3XVjdDvT8 JD4Dj47oIoMKD83nq6aZZCFgttQN5IEsyuAjTPVL+7+y+fU0nhxiBBTKXL+vuFnLQEYPqe9ibxK mnjF82FbXeOu6/JTEMYzYUaIj8NkdNVmfug+MngmLkhxvzGlnFEibaTMQGTmI8yfbi0Qs+YtZaX JFIctKDkViY0hJnmiY1aQtu5MgiryDM8BHX+NapKkPwfQ/q5bWPkDnepCI8H1sppygGca/EEel6 8D9nPAWDMazH/ekSg1OpLKc4FU6DvbjnAzsfTV/esmvWJOr2MKKfsrfOccgXqG+cqjbKxxaSRS5 Lm5C+ltQaGVvSouJnRTMV9xlnnL2jS5WLA8lqz6H6jmeFrC0b3OhC9V6HFDXYoWAJ7x83NUvA= X-Received: by 2002:a05:600c:4714:b0:49c:c96a:d36b with SMTP id 5b1f17b1804b1-49e61988ce5mr3642095e9.12.1789064112993; Thu, 10 Sep 2026 11:15:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 7/9] tests/docker: strip remaining caching logic from docker.py Date: Thu, 10 Sep 2026 19:15:02 +0100 Message-ID: <20260910181504.1010916-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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: 1789064183801158500 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064213; cv=none; d=zohomail.com; s=zohoarc; b=nbbIF2PFhCrqvNjZfaZuzczqCByqiwXIWGzc5snN1dALSinhuoCIWBTie0Y019fsiNqyeoSsdIvu7x3beJkS/qWVH6ekBBx9w0iWilgwIRGSqiqzpr4ErORwZ8YaGrOGTszrp+6pbbzx4kTPq83n7Q2pznCMcLoKElOQkdRqDnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064213; 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=9MW90oGAbR9WHWcrlDpW8JaDJbwZUQc2gAp7qxtBJUA=; b=DP3V+Dd/B2t8A3gPxcPGJhlBqOTjaCVcQB+3NC9y4+SvPQSf3V49QujM7DoXYlPF4/lW9yS3DaMnommDExyVYFZ8N18E5e63tlwy2HmdRMsVnEHrhzq5tfLAstOt4Eu5S/Toe0RnlSmgxpaixi7fCVCb4VcLfyo+4Pzldk+gS9k= 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 1789064213065207.9328858745548; Thu, 10 Sep 2026 11: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 1x4jIq-000413-Qb; Thu, 10 Sep 2026 14:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIo-0003vj-8W for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:14 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIm-00073s-CW for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:13 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-485850cf499so19714f8f.3 for ; Thu, 10 Sep 2026 11:15:11 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb32d3c7sm220139f8f.10.2026.09.10.11.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D13D65FD00; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064111; x=1789668911; 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=9MW90oGAbR9WHWcrlDpW8JaDJbwZUQc2gAp7qxtBJUA=; b=mT4FqnXfIcQ6/d2bga0M4zweLVmrk2V/diA7FyvlpdiGNVXhOhGcjHEf14AT4oO6Hk hJhNeHnngK5bOtGKSRvwgkdkhiqi0HYdM9YT5DkCIJ0JUSpV/qWzEtN1gw0Bqfp9otq8 28pRgE7+YHWD7/bGt4V3sSjgn/trssIVzEIsGGnLLKnGZFaLz/cvjBtNX2NAybAl3QAj N/yjqKYcEftlSCFH4wzzodbvSSUo5dxUOnGmT0OrdMAxLh4rqjpK1Cs4a7yMvQfv5gEU +KuQxWJsfWGyxMvrcBSdYrqdR2qRW8YYe+3duhuRzrcu4upyjauDPMUh5SdzadYKyE84 s0Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064111; x=1789668911; 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=9MW90oGAbR9WHWcrlDpW8JaDJbwZUQc2gAp7qxtBJUA=; b=ot0Rzdd3k9r5kyPbe50Do5c+Lz5kjQ9WOc4kcOZnUkkazMxJFbjBElf0W8/3hAwNK0 lJj99k3/DslhkE4c0xr1Siunamndx7YNQQ1QbjvdaOQWkMT/tlySqsSt/73mNC3vvKQE r5KIDA2vYQ2pVPckaMGP+0xRuSuMj3Il9j7hT+VnwmzY9fR3qrfSOcseHpLvoqLnQY3o qqy0nGsumEb0u20msaB1TFTukpTZkm0qbobKrQFw1X4oJoD9UsscFam9dnSbVYw/2Jqk R2N1nFQFmuaZAkfDW/5NRmwJvSoys0MRHvro8DpwSbgnv9eenFF7qVNBtdglq8F0wGx3 D/qA== X-Gm-Message-State: AFuF++l2aucZpxotiuDvdjOH2loGahWwfI6WEha3PWrr4mum56F/DpWv mHU2pYQchsuqBU4qY7GtuZQlHDJXdh9NIqtcjdPHn6a1ZsF0vtwSLZvx4ldjRJUuXIU= X-Gm-Gg: AYBFou0NI0b5IjwfSG/qzBdq9KW3zaqK0zEaGHvHvoE5vqJHPXACAI6hlH9whLImr/X qJ0xrspqCnYxvZ3hDA2BX8bndyYipv9yKJbw4XwtDCjQ9vevpXuwYiLqMltbcQ49LeePj82Tt5n 6tH9z5DHmuHMgkfai1o4bL3AmvV6WVBpqX8nZ/B2WvU5THpePqW7h01hmfT+0ArZunO55pO5kaV YzILlJHJxpX/SqwBFsBYjQN9CNAqdIInjdu7zALGmIR3/04c3rFDI6d11/IRgUic5PouNlFWgey B8RIgnLdrPZuAYDPrDhUpdJ9zcD7kNNZZgaA1Vgz5W6AxnqZgYcp4l/0DkSSt/yeS8sfWxG68RC BRxS6yAK0I5IPRgK5Vo0exwmBKDXaem/qRQLbIgjo3wjAE876Bf3jCAYYg7G4kWL3cOlQru4ZAH bMBqzup9ZfUU3t5ow2vAncqCuzPAovgtzid6iWXsCvcBgVlgFCANGaIJkr6HzfV9Btb1W/nkQHA n/Gp3yRYG0= X-Received: by 2002:a05:600c:a016:b0:49c:ffe3:2b3f with SMTP id 5b1f17b1804b1-49e619a0458mr3963935e9.3.1789064110793; Thu, 10 Sep 2026 11:15:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 8/9] tests/docker: add specific command to parser Date: Thu, 10 Sep 2026 19:15:03 +0100 Message-ID: <20260910181504.1010916-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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: 1789064215352158500 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- 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 22157a47c96..57e3870ac8a 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -275,7 +275,7 @@ foreach target, plan: tcg_tests mount =3D meson.project_source_root() mount =3D mount + ':' + mount here =3D meson.project_build_root() - cc =3D [docker_wrapper, 'run', '--run-as-current-user', + cc =3D [docker_wrapper, 'run', '--run-as-current-user', '--', '-w', here, '-v', mount, 'qemu/' + cc_dockerfile, plan['cc']] has_cc =3D true --=20 2.47.3 From nobody Sat Sep 26 20:51:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1789064179; cv=none; d=zohomail.com; s=zohoarc; b=WvUw0R/sSis2DnVCBWQ1h7pbmlmSRKUrzrWyWJa+ke8GFdjS3CHZ5HczgXV0/6XlaVlrmhh//Q0SbUVZVf9mKRiBRynLu9o2o+Wk7oPNx+AssRxO3TNK6g8hZbYjtftwhohgDvzGL2Sq2ltIFqIeBZRaf70LmEfuOGB32VcJkPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789064179; 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=KXoPnddp5GjhA+oBaNG2IXge1L2oXHMPR0lPCPhJbISGOFrV+jFsqKymA6XB2lJkvrdCnZI6LF4MBlO8fa0JKaiEOiwyW+I6unjVYyMBXy/dVhs8igxD37KI24PdjI6njAYLq1RhTJd8T6xCdHCAIJDSuJg7WXVfF4GPd6muGiM= 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 1789064179578617.4671134680729; Thu, 10 Sep 2026 11:16:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4jIw-000492-0C; Thu, 10 Sep 2026 14:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4jIr-00043F-P8 for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:17 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x4jIp-00075S-QJ for qemu-devel@nongnu.org; Thu, 10 Sep 2026 14:15:17 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-48589798dbbso18584f8f.3 for ; Thu, 10 Sep 2026 11:15:15 -0700 (PDT) Received: from draig.lan ([185.124.0.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb33ee8bsm187611f8f.15.2026.09.10.11.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 11:15:10 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EC4215FD0D; Thu, 10 Sep 2026 19:15:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1789064114; x=1789668914; 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=QBs0XPu1yMp5RMKTtxDgqwqczQQFKxRFTXeZBDoXwXtfMuhLjYXA9kfjCVtMGMfrqV zNIW3Owpjr3hZ5+k3Ly4XMTXrKSvtPKJvaV36ipcQYo+j/eojmCIZB90UFwZJdOYiAJ3 BRlnM4INg+dzAMEWtzyvvUdjKT9tWONZwTIYnIReLslLEEe6a+yihatKEcmTBbFeJYgY 5JmQEcjEDg5ljm5QFdCXcWLdMX9FvVbxeUObENqBRtgPVGroFVjThze9aNvgxKjV1o0V 3M2g5kpgyq/oyXPQHwDs5gKJCJSkKToRh9pWc9q6/1EX3/lurVfD8+Jzjs7L5nyyLcHg ixqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789064114; x=1789668914; 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=HPUobW+uVaXE1mOh6/dn+Qcw/Jkm6JEw3/CJsgcByQDLnf0Kbo1gPBDPdqhPzIG3bY 9CaprmUjDKMKuMjxBaJxviadZtT+W+v2d4DFCgKp4OA3zLTzCT7gqBQdOBHagmjtGyg+ 9dES074UhokF3WHtaib2db9NzjOcvz9iFNrQ5/66m+bemq1Jqqs+9szec/MTcKMEt00l Uqq8INctP7v6NsRQVc68M+XTY5TcyfkX/OaTzYZmOr7gIlIStTMinTU8xncWqgSntpIV kbwIrWowgUAFHRCKvg2T2VdPUdKe9jlcmgpd3xYXjpGX6ySrwLk6RGu+2kpNR/eBhbEP PNKw== X-Gm-Message-State: AFuF++leGjtP4B/m1IA2fohwuU+ggRnlEY82dXQWSpL1xNI6UVBCqh+0 7lr4w6m/AyWRVpKVzw9z9REj0W3x/CAuG+9pKkpqQbzUTSPDR3gc05r0zA5YP0Q86ZA= X-Gm-Gg: AYBFou1IRhK4VT9VElE6xVla2HfshQP52PPPpn95fPo5a5RpnPaNDN82IXEly867UPR PTfhTFuTzTIO1JoT4JoNRFLNx19MfWYxI3Avzcy7mmMhWJY/+lzmMBm5beS2EXMA0MBKKRPuE12 +5uiFGLx6Ajmf8fi7UJNbJMA6uWHR48KakvdkNFVqPX5BFyNNUj8EUfCXaf+RMUm1+Zjz50RVt/ xAQxoKYegxjpjq8tnXMPhQlaPJMBeaAwrTRv/AA1dW7/7cFSh+3KCK0xGWxLxOM2ZhnP8ng5qIA bXMQUPCF8Nbp0eLB3/aDUkfcwVEPT0aqwvvmXwoRzZlkngPbyiPaQ6RgWkg7DeQAi2T9EO7xxD2 N1jGmesAONuwjDShw6Vwa7wySJujmSF8egxQFf98QTDxXcey2BRdsA7Ccx5Su78vAmlXzPnkFfa fK+VcLBtNpIGy6CbjDemBtsJY499AVKekzvehaD2HH9cp5/JmaFP4x0KBTpbV3JFPbiurvAQw= X-Received: by 2002:a05:6000:1889:b0:485:8be8:b2ba with SMTP id ffacd0b85a97d-486eb3538e3mr202290f8f.49.1789064114021; Thu, 10 Sep 2026 11:15:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Brad Smith , Jiaxun Yang , Song Gao , Warner Losh , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell , Cornelia Huck , Pierrick Bouvier , Fabiano Rosas , John Snow , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Brian Cain , qemu-arm@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kyle Evans , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Subject: [PATCH 9/9] tests/docker: swap --quiet for --verbose Date: Thu, 10 Sep 2026 19:15:04 +0100 Message-ID: <20260910181504.1010916-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910181504.1010916-1-alex.bennee@linaro.org> References: <20260910181504.1010916-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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: 1789064183716158500 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