From nobody Sun Mar 22 14:11:08 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=1774021947; cv=none; d=zohomail.com; s=zohoarc; b=TaVTJYYUQUKc5svWC5/HR0oyBy1fKarHiTsi0GAMz+C7VYkOylL6jpniPFklLCEDVABMFaw8KMvye0FtAEGaaOFwDiNJXNXAEHbVsMgvmJyM3tZLa1XSyIXEVzEIOK3RzKPDMYA/plgySHrNPcJ7CxxFd5wAFqYDIql/wHHVzvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021947; 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=1gpxMBpssTBiyClKYiW1/NzisCMEhju5aJAH+eV1EPU=; b=Zc/pVGCZ7230i4bjtq4dfjRdy6tj9UNz+S55F3NkUI4likFH/MUVhksPCdNZaEhSOKpBzcs53BDu7uD0vZ9WKlXPTPusRbOEyZ+dCbZEEsZ9UAHajM7FrtexEI4IRUizDenOxTOrhVQnsGxxkbzMU2tnU6rGr2U08RwA6RhTA4M= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774021947299915.1960062636296; Fri, 20 Mar 2026 08:52:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c85-0007Xo-2M; Fri, 20 Mar 2026 11:51:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c82-0007WW-FV for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:14 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c7z-0005VL-UW for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:14 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-b886fc047d5so358424266b.3 for ; Fri, 20 Mar 2026 08:51:11 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f42f0dsm172731966b.12.2026.03.20.08.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D1A7D5F909; Fri, 20 Mar 2026 15:51:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021870; x=1774626670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1gpxMBpssTBiyClKYiW1/NzisCMEhju5aJAH+eV1EPU=; b=boBEDiipWOUGU6wT0er29xAj2wRNeX0Re5TCmnKhWt4LNsp7QBt0en6n+SKyXmPrQU 9LycfEuiOjNCJrNkFhmYF8gLHlRGYQYPBR1igl2ZklNw3TbIe5N1hrEyiau2KCNUstcg OwSNLMc97jWzPuYLFbkDg76jHThQaJYe9MUWReA/sYY92v6oQvFWgOulkhxlspRK7uYg 0wwQjvM7L2JQPgqVPbsOAxklqJ7lA3/MIKO89YGy7j2bjD9T3/LIFSzbuFJPMXS0Dqm+ xM9HO9ZLcbDNgwlW3RrdqVm+SNaX2Ymnv9DnGzgVHZumzG/FsQi7DtYXNZU+XqL97sKI zKJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021870; x=1774626670; h=content-transfer-encoding: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; bh=1gpxMBpssTBiyClKYiW1/NzisCMEhju5aJAH+eV1EPU=; b=e5Egscz0xIy28pcdQSlhX51nx2FB9YxqRFlm3lFNkL3IAStyZyWKAG/B39JQBfLuyP lmwGQhl4Ve1r0axWihJhk8X0PUSW2hqsAwm3Fg/i7pRrqSE1xutlioeFTk0e9FqEcTKG 9VabTaaC531mqdOuj0xoAEqLb2bi3w1lAGXYW2IPDN/xqcid84f1JiDiS36n5/LD0+eB uyuHyap8hTtKiZcT3zgJSW2sM1i8WV+AQYbgp1v7GrLab4kZwzjfqrLm0pQBvbUiK0wi sSo55bGWGL9XxywjsBgqGy3GjtV1Y//bkAdg8bflOEk+EQXPZxnED1B98C+Iyimh2sUq 1Wfg== X-Gm-Message-State: AOJu0Yz2GetBIh+39E2uULrPEMo4yGLykK1Ytfon7z+390fbfM/UjiQs lAY9AwGpwx/p1zLfyYf9M6dOr4i6HpQUJ1K20jp5K3JL2nNedbWNRQK2qBzFuccoyk4= X-Gm-Gg: ATEYQzz5LpYWgzSm6GBhXfH7W+jdGM1r3O+prDG/YLH6CMFZ6ictxTQvUrgGyZPPMKe t9Doqk6haFVthLZA6gIw1gzw6jIAqT1Ffc9DqWUbQNBFtEiDfm3nENkHESxIXyxIUi/0pMgMUzR U1mkI+sn0ZstAGptSxTZc53EIhc+na/RKTXLYghz3ECrmHB7fml1ujEt9Cks10fp8hNvLfudIOV qQmKuks8tgwlIYBDlUfe1/SzYLuRj6cnbUsmgFK8tPQ8UJv9obxd+ZVsXT4BiLKSevckt4PrGYp f9MKPDNq7Ya+PC+QjJHH9fLTAyPYloJwKwbeODzM5tDvSMxggietQSY1zNjFZHs4ZxZp46BV94c oRmFN92yf+aXgjli2akAUcbLjChE/2RNj9PhNo1B7mIYnFU4mrP9Kmnwh9IpnWiKWekd/7sRU1J RjyewBn6Y+AiySlvh2jSjPzig= X-Received: by 2002:a17:907:a807:b0:b96:e3db:9e04 with SMTP id a640c23a62f3a-b982f4faea3mr248933266b.53.1774021869964; Fri, 20 Mar 2026 08:51:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 1/8] tests/tcg: allow filtering of TCG tests Date: Fri, 20 Mar 2026 15:51:00 +0000 Message-ID: <20260320155107.2143191-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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: 1774021949482158500 We have a lot of TCG tests now which can be fiddly if we just want to check one particular test type across the targets. Introduce TCG_TEST_FILTER to allow this: make check-tcg TCG_TEST_FILTER=3Dgdb to run all the gdb tests across the suites. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- tests/Makefile.include | 8 +++++--- tests/tcg/Makefile.target | 12 +++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 59b9a4b9220..f257288194d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -16,9 +16,11 @@ check-help: @echo " $(MAKE) check-tracetool Run tracetool generator tes= ts" @echo " $(MAKE) check-block Run block tests" ifneq ($(filter $(all-check-targets), check-softfloat),) - @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" - @echo " $(MAKE) run-tcg-tests-TARGET-softmmu Run TCG tests for a given t= arget" + @echo " $(MAKE) check-tcg Run TCG tests" + @echo " $(MAKE) run-tcg-tests-TARGET Run TCG tests for a given t= arget" + @echo + @echo "The variable TCG_TEST_FILTER will select the subset of matching te= sts." endif @echo @echo " $(MAKE) check-report.junit.xml Generates an aggregated XML= test report" @@ -64,7 +66,7 @@ $(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%): build-tcg-tes= ts-%: $(BUILD_DIR)/tests/ .PHONY: $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%) $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=3D$(SPEED) ru= n, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=3D$(SPEED) TC= G_TEST_FILTER=3D$(TCG_TEST_FILTER) run, \ "RUN", "$* guest-tests") =20 .PHONY: $(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index af72903f898..1b83824ff4e 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -254,8 +254,15 @@ endif gdb-%: % gdb --args $(QEMU) $(QEMU_OPTS) $< =20 +# Filter tests based on TCG_TEST_FILTER if set +ifdef TCG_TEST_FILTER +FILTERED_RUN_TESTS=3D$(foreach test,$(RUN_TESTS),$(if $(findstring $(TCG_T= EST_FILTER),$(test)),$(test))) +else +FILTERED_RUN_TESTS=3D$(RUN_TESTS) +endif + .PHONY: run -run: $(RUN_TESTS) +run: $(FILTERED_RUN_TESTS) =20 clean: rm -f $(TESTS) *.o $(CLEANFILES) @@ -269,3 +276,6 @@ help: @echo "Built with $(CC)" @echo "Available tests:" @$(foreach t,$(RUN_TESTS),echo " $t";) + @echo "" + @echo "Environment variables:" + @echo " TCG_TEST_FILTER=3D Filter tests matching pattern" --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021951; cv=none; d=zohomail.com; s=zohoarc; b=jNTjPB2+C/jN4p59ZuTutUUC+QCKzH9ndbkRn2ksLhbtjylxp3MTxwRQfvz0arHaxajx0mp+/JS5WxwQ8aTPl/3d9Ha86MUeJh8HkUsbyLtMCbPnkmmvU+YGYb2XBSCBUldmo5I9FJlxM/Wn0hwQ7GyIsBUIXGjMO2Q2Ozv1dNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021951; 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=YhvJ30u4SjKjKGIAS0IRtyTM16wsKwTzLGcYfkxCVc0=; b=IMMaO05PS4l9SXpuhBrzvdoNjVS0cqsCux3xseVgq8eDhpN+Qh4StY9DWwAe3RHmAV+SisRmJ79OT3MuO6nry5R+6HNQcimmzaBhexpFrBYCXEI/KsPk5LLuH7TH0EWArJQ+g4MkM4kJXdVmXTyAudplc4q72OIPX1ERh49HP0o= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177402195172572.87145735639297; Fri, 20 Mar 2026 08:52:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c83-0007Wx-5S; Fri, 20 Mar 2026 11:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c81-0007Vz-3S for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:13 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c7z-0005VB-5M for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:12 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b97f9587e6eso260075266b.3 for ; Fri, 20 Mar 2026 08:51:10 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832fd7147sm172006866b.27.2026.03.20.08.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E79F65F910; Fri, 20 Mar 2026 15:51:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021870; x=1774626670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YhvJ30u4SjKjKGIAS0IRtyTM16wsKwTzLGcYfkxCVc0=; b=tjJRdRWMsDXLUItS0XY4kFlktsP+z85kwp8DDbXpdk3J1qXXHvIaCy9PtYu4pz0fZM 3PmDm1DCPQhNUnNEoPlMlDRDxCN4zOmPt9hMkz+MPdnZFsfSFGhHTI4wOQ74FKgmfWVX FeoCxshp7zMU4yY/O2l6AOTyTAYmX56kLAkbt7psChu+A3VxpMk4JBZr0MYENghAtHEC TZmtmPX0BHSRDxQsH0jiKO+/vJR3ARZHNrpDB/go1/QxpXgRS6eWiMInA3NMup95qzSC 4BENJ4NF02+CODexkfzYX8M4r9TSAs4Nrk6XtAVH/FDUzfB7YcMd6pI4xmukU08T/xz6 l0dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021870; x=1774626670; h=content-transfer-encoding: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; bh=YhvJ30u4SjKjKGIAS0IRtyTM16wsKwTzLGcYfkxCVc0=; b=JJl3lN5m+4+nLHZfnlMSACudN+lgaYbiWY/jvp1MxWWsyDyWnnoK/vA2Wt7UTwxV1A Stywn5llRBG5570rpaOJkFJzjksubpcE8YOjOMAh5HwmStnp9BsZ9T+0XGqsYS5pzPoU iIafJjBE9uQuXybNGBqc7XcJ8X53fAS/Hv3T1j78hBmTd8HhLpNfaKPyuIaKWeA1Kp5q fZUsRtuWhxe3AaCWvlFd3U4HtGD/tiEFPwxFw2tchu2rOWOWKi32WOppDOfakCUoX+1q lfKwlfk7rJAQbJeV5/MPyyfC/cOrKHw2pnNNVqZoD6knAcTcRdP3Hj1XR/GgGCG7RyV8 /ozg== X-Gm-Message-State: AOJu0YxWD5oL8GGN/uJX2FYXluliZCjvaL+/zViHJ6O5d1D0I/pK9m4j j82op1xRNPsg96Z3Z89hoH3lgQTU1ZxkaVLtFz0ynH63Xes7uCbytRfjyhPJtB0MRKg= X-Gm-Gg: ATEYQzyT0cu55w/1Je7kSDFgXyJzsQ1KyQwgsCRv6TaUoLmGgYrdrg+3BBGpktBf2bN 3vD8kYVL/qD3c8gOJ2NaAW5HjPBCrueF6X9Pnqyhdtl7JYsJ3X3V4twXSGq36Mx6m+fBIdSrNXB Iz+uyzpZoWVb+ZWF+2XXdQFD74fcKs8M/mo+cq+Ppy2mrozewZiaLpSNB1AX5Ifi7VAx9QI83uP lD0NLW5rnLOGVvfmrVtKGK6DzATnwkYogrROY9b5gyK993wZHaS5/NxyKbrewiC31+KKvsQadGl bpxkKZDDZmGG1kUpPiy69eUnj/aVV0HEHIBh0VTj6PgOyHu928DzJs4+FZdtFvyoCZfW96ZtNje YbSpDrMU/X8sHab7ZwXG3jOIUJoneBxX4vij0ibc3jFXbj1gblHr9PgOszdY6PChpWG22KeikMr VdfI8W6oD/6sLYBL99eFI8M1I= X-Received: by 2002:a17:907:c50a:b0:b94:858:5807 with SMTP id a640c23a62f3a-b982f235fabmr226643666b.25.1774021869554; Fri, 20 Mar 2026 08:51:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Matheus Tavares Bernardino , Brian Cain Subject: [PATCH v3 2/8] tests/tcg/multiarch/linux-test: use portable alternative for dirent64 Date: Fri, 20 Mar 2026 15:51:01 +0000 Message-ID: <20260320155107.2143191-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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: 1774021954163154100 From: Matheus Tavares Bernardino dirent64 and readdir64 are glibc-specific and not portable to other C libraries such as musl. Define _FILE_OFFSET_BITS=3D64 instead, which portably instructs all libc implementations to use 64-bit file offsets, making readdir() and struct dirent equivalent to their 64-bit variants. Signed-off-by: Matheus Tavares Bernardino Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier Message-ID: Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/multiarch/linux/linux-test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/tcg/multiarch/linux/linux-test.c b/tests/tcg/multiarch/l= inux/linux-test.c index bf6e0fda262..0fa3165602f 100644 --- a/tests/tcg/multiarch/linux/linux-test.c +++ b/tests/tcg/multiarch/linux/linux-test.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE #include #include @@ -83,7 +84,7 @@ static void test_file(void) struct utimbuf tbuf; struct iovec vecs[2]; DIR *dir; - struct dirent64 *de; + struct dirent *de; /* TODO: make common tempdir creation for tcg tests */ char template[] =3D "/tmp/linux-test-XXXXXX"; char *tmpdir =3D mkdtemp(template); @@ -191,7 +192,7 @@ static void test_file(void) error("opendir"); len =3D 0; for(;;) { - de =3D readdir64(dir); + de =3D readdir(dir); if (!de) break; if (strcmp(de->d_name, ".") !=3D 0 && --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021969; cv=none; d=zohomail.com; s=zohoarc; b=ZbhE00xr/IFTUexamfv3P+Hw2s9PzHE6wtheTDefhK8hfHSK++0pVAWnmgO2JtrI1yXgtZhtzKf9qZqGpfJ/Q8TxtJqXSWXAFl10dEfl86qAwePJI/qujzescinWoLGJBsY0glezqqYcz8/9089Z8+MPQdampeHr1+fcIxdtOb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021969; 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=Re1Z7KTF6pGt06r2qKUhhUG6rRUM2+jHUzT54RyU8Vo=; b=iJbEUZpmThQTsQmi5K8+7Did2I+cvGuGrzPZ/J/vnzJoHjLPBmTFiN7tbKw4+aF0IzBPSTEQAmvxXMGLa3D6BhlI9RxJr8NeHdoxCnQXek7JBA3IEmvlUAITGUbbnyn9PyOWOSN/iDpLfpawfunIXrFBO9nCyhDCsp7iSlsNqxQ= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774021969641869.1260289828726; Fri, 20 Mar 2026 08:52:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8C-0007aY-PM; Fri, 20 Mar 2026 11:51:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c83-0007XO-Mm for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:15 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c80-0005Vw-Oo for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:15 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b97ed4ad579so133170166b.3 for ; Fri, 20 Mar 2026 08:51:12 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f8dc51sm169939766b.22.2026.03.20.08.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0C8535F911; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021871; x=1774626671; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Re1Z7KTF6pGt06r2qKUhhUG6rRUM2+jHUzT54RyU8Vo=; b=ONLR23h2OB3+66OF7Xx3ksY71yKh1fkffBSlRn0WYzlcGGVv6S301KIgJa3TZ/AnEB WdQyMjPNP+QVbbQfhnVVdKVBEcA4IN7+sH3BKVhtks/F2ymr/iihnhdO5+ZR8dY26H0+ ZtdMvmnWmVe6bYwP0z2N+OeagcGNTkLu1XZL2k77lqOFgPAJir0piEwMfZCdETBchXaP bGFgv6TVWIcjqOytNvTYFizRJ4VGOAiE2BW7y0j4qlpfIcHkKUDtNW8YDPi3OaTYrljh CMt33nYSsePhh1zTdvbYZzUJ93yZG1RMYS3W4WI3/J9kn6MA+dSgozzmvvUbgWgfMxOO V/aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021871; x=1774626671; h=content-transfer-encoding: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; bh=Re1Z7KTF6pGt06r2qKUhhUG6rRUM2+jHUzT54RyU8Vo=; b=fiydjGRN1xV42ozbTN5jL+asVxtN9TxYhiJDEvNoLLzRpewZNK4QXhomt2veFK/FuU 0wrW7afzea6xrpOOHfSVl5HfHMddAP7icOHRC1j7ofH0WpMcYWI3GgEOfvu90uahKM5d rvqhIsQaweb/T9jAn4YvVxqOw+uKqZylKaOkhYCEOZCwLOXiWINjZ8NorxOrnObBfTWH O0/dhyfQbwp+x3I9yG7PJrNw3hA+pFcvLj/tys8pjcPz7IGvyG6AcB4NMpLFMoR/ImsN 4dblcZIMz4plazzX24BnQzRUJdWpyROzu7H/GZmtGL8t54iYPAM+jZjJnRebI7Q+IMgu nCww== X-Gm-Message-State: AOJu0Yx1eBZKWMslgwBQqsG8nI6AJIQRQG2KYIaRal9yYt1Paa09ZZto Pv76nMaaeS5C33AJ0StjrHr7vC/PZJbyUNWROPqnerxgd9FcL949c06ZN5CypLTuJ8w= X-Gm-Gg: ATEYQzyN36WIBPrDAKoHGmzN5bhbdITA7FUp+v9DU4g+TYl10r5+AUSrHX/zVcGbgh9 rUahMs8n7sueMFJShjeHxj88fs722A9a0FnJ4qCE0WE0clwo44NTgByqX4QVohq9cs0KhMA+gXM Z5jJfIy6DxE4RpvXcaljhmQjBl3xRJOwKZNY1ddkG2vRWcW7u3xVrifEYOMQlSpxxtIINRzQ6Y2 4C7RvsqCwu1sjHI/liTmIoIc8bbnNuLiFpqISxgWtQrGOvJEPhzWak8OMWscgrXiPqu7HEv8PTD I9/nMoIn8me1vK29izYlxuxRo5/Ly8xgPjdTieyHSbypwe2mf6R6QDNETL1EUiIe4ZhjW1xqbWo j7ehXE9KKb2m/vcu9eiv+e9K0fM5VwzUXHFdOzBcKmc2XomSMEGS2SwqK9LdBrbBH112iT0YRil FUQqFS/JSP9xR9xvPJJ4gIBPI= X-Received: by 2002:a17:907:1604:b0:b97:edc1:f9c4 with SMTP id a640c23a62f3a-b982f1ed7b2mr288505466b.1.1774021871186; Fri, 20 Mar 2026 08:51:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 3/8] tests/functional: allow tests to define decompression target Date: Fri, 20 Mar 2026 15:51:02 +0000 Message-ID: <20260320155107.2143191-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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: 1774021971617158500 When dealing with multi-stage decompression we want to specify the target file name lest we just overload the cache name. It also allows for something is little more friendly than the cache hash. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- tests/functional/qemu_test/testcase.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index c2c916f6077..eaec1bea138 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -35,7 +35,7 @@ =20 class QemuBaseTest(unittest.TestCase): =20 - def uncompress(self, compressed, format=3DNone): + def uncompress(self, compressed, target=3DNone, format=3DNone): ''' @params compressed: filename, Asset, or file-like object to uncomp= ress @params format: optional compression format (gzip, lzma) @@ -52,8 +52,11 @@ def uncompress(self, compressed, format=3DNone): if isinstance(compressed, Asset): compressed.fetch() =20 - (name, _ext) =3D os.path.splitext(str(compressed)) - uncompressed =3D self.scratch_file(os.path.basename(name)) + if target is not None: + uncompressed =3D self.scratch_file(target) + else: + (name, _ext) =3D os.path.splitext(str(compressed)) + uncompressed =3D self.scratch_file(os.path.basename(name)) =20 uncompress(compressed, uncompressed, format) =20 --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021917; cv=none; d=zohomail.com; s=zohoarc; b=Wbx3yaEuOjZmqhO0xOgIc2MZJuPxyqaaw0Xc71iqBXVjiCKPK3/banSVocu46x4G+P1O7T9wRksL18jfAmo8s01KioB8QJZh+YK4WoYgd7SYXpqkAOKIb4yOd2IrrYEH/f88ha4cV3+6v+bHx8n+YHSjXF0U49LrBg/sDG6gg5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021917; 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=S0fhuaBJdOuUGUkX7QYGpAS75ZDvg8jajU+pZxhAjHw=; b=cHN/zVPTL6bv0RisWVQ9k1wnfVrJxcrjKLkfIJ8Rwi1YfkdH13D/rSl8CYfTmDa642GFxt+oL0cSPdG/EZa+fvCKsPHfLPrX1pmArfrhO/ktnGGll9Xd82rr2/8dZl9JSYWMPRzRFo+ePmjwFaz2WCBkmpaRcLSZfC+op//X/Hs= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774021917791796.9139298623086; Fri, 20 Mar 2026 08:51:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8G-0007c2-Ly; Fri, 20 Mar 2026 11:51:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c84-0007Xq-N3 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:16 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c81-0005WA-RS for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:16 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-661b16ac011so1226881a12.2 for ; Fri, 20 Mar 2026 08:51:13 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-668d1cc5f1dsm1453278a12.14.2026.03.20.08.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:09 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 252745F91F; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021872; x=1774626672; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S0fhuaBJdOuUGUkX7QYGpAS75ZDvg8jajU+pZxhAjHw=; b=Xae5ASASezCM2JtqVkX0Ug3c81SijJraeivF3nFZfN51mSNV5x+agS2nY6adjtAKY9 14/tgekZ/tg0YBBYGcett/nIOLWp6gKM8QeNI6YZQQuiT3cqFg3wRFZNZ8Ya6wBIlt5o 7Oq9SKaqAStwlo05CMlOhZiHIkpwWzdF3Oyej3QtawUc8CH2LtBgD+dmlplVv7wQbkwS qubgUrT+0qct1fukkYfUPYRaUylBfqv81HqWcFz76BFcDHmZOgZmnEtFrk3w1ws0J8MX l/Bq241SRIdlzH6Nn0XNkspJjXu3nA35/kdGyvq6GNb3nzxM+b9F11tFenH3HNQCVNhC UxpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021872; x=1774626672; h=content-transfer-encoding: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; bh=S0fhuaBJdOuUGUkX7QYGpAS75ZDvg8jajU+pZxhAjHw=; b=E2+HdTMz0jP+xKz0pXByfJARlhWIlilNYT1tizp8E8OBoNSmpq2G1CrYqqrH9o2uwS /d1LPc/5kf8BbkX/TQpnih4o5w9U3bfHq6Xx4n6dvGxuZwfNUb1SxShl1rXGNTqXfnot MtJWwd4XkDcPqPnViM4Ly9AprSjloTsTUQesL6yOQdfP+1RrbuRADP2Roht5/2xNXRLh Y5iNJyRiAK7bXNixqKTU1lX1qAJY6mA8MX99YJcacHZy8Xl9zDHK/G2Z8dQzC7ThFzJY Fi51pRcgc5IOuRM31xnrJJOrUQ+QUd9qgO3RjUUpZWyxNhWKn3MXq2WYeBJgW+bvKJXu fvCg== X-Gm-Message-State: AOJu0YxoOxaIZygFbhRO74zcSWhLc3nMan1aCTs/V6W7Q8PfxEPU+AuR RVmA7Ew8rn7SEL31QIqfVVHxkER2273a8NzfFchb2X62sf6T3wZxRMQ5w+a++SjYIec= X-Gm-Gg: ATEYQzx1w3RZIm63gEyXHLNDCJG1lHKiuKXSCWrZK0gZ6Fj5hGN2lIWVXR/dv8mnnjx /17pIqTez7eb46Nk4avm7ombWfagzgmmoihDtmusJzr2Ek4UkA5KkWot+fHsrLyqkCAqgwJ9l9Y mW+RyGO48xX7+eDbaLN2NyUyfjLg6kLawIpwsFMTrY1VJqyHbkgm1UIBW/ewUAO1arfs2eooAk/ SBocQ4TPEHDX99n/dmXO8BwCvLEta65Nzf+C+b+MAuKAtBXznrS/DWSRuqGJDz7T2WgjqDv1Dyd rs5oetvp7TUduAwV6/EziGkSUUK2iVhWs7V/oZiRlRGSeI4HNxNawDxd59OEL6rdy4Lj9og1sKu bIT0CYJWr4IugRv5a4jfjI3I74sUCtOY4gfeYtpY4yP7ZdLZTsafmqFE3rqu9DER25w7FZrgkwL j3VLX97jlqNRYtBsDVlwRHNvU= X-Received: by 2002:a05:6402:5287:b0:65f:81be:e7a5 with SMTP id 4fb4d7f45d1cf-668c9c3f203mr2833499a12.23.1774021871872; Fri, 20 Mar 2026 08:51:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 4/8] tests/functional: add VBSA linux tests Date: Fri, 20 Mar 2026 15:51:03 +0000 Message-ID: <20260320155107.2143191-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.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: 1774021919767158500 This extends the VBSA test to run the linux tests. The sysarch-acs test suite does provide some pre-built images which is good because the tests require a patched kernel. However due to the structure of the image we need to jump one or two hoops to get something useful: - download and double decompress (zip then xz) the image - navigate grub to launch the Linux Execution Environment - shutdown the system once tests are done - extract the logs from the MSDOS file system and parse them It does make the code a bit ugly but it works for me at least. So far the subset of tests run is limited but that might be solved by adding some more devices to the PCIe bus to exercise the SMMU behaviour. Reviewed-by: Pierrick Bouvier Signed-off-by: Alex Benn=C3=A9e --- v2 - dropped unused imports - use archive_extract for the zip step - drop virtuilization=3Don and smmu=3Dmax lines from config - use utf8 encodings for file access - don't use f"" strings when not needed - hack grub.cfg rather than using key presses --- tests/functional/aarch64/test_virt_vbsa.py | 122 +++++++++++++++++++-- 1 file changed, 111 insertions(+), 11 deletions(-) diff --git a/tests/functional/aarch64/test_virt_vbsa.py b/tests/functional/= aarch64/test_virt_vbsa.py index 1dd4cecde1e..57bfe5d7af2 100755 --- a/tests/functional/aarch64/test_virt_vbsa.py +++ b/tests/functional/aarch64/test_virt_vbsa.py @@ -10,7 +10,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 import shutil -from subprocess import check_call, DEVNULL +import re +from subprocess import check_call, check_output, DEVNULL =20 from qemu_test import QemuSystemTest, Asset from qemu_test import get_qemu_img, skipIfMissingCommands @@ -28,6 +29,20 @@ def wait_for_console_pattern(self, success_message, vm= =3DNone): failure_message=3D'FAILED', vm=3Dvm) =20 + def append_firmware_blobs(self): + """ + Setup QEMU firmware blobs for boot. + """ + code_path =3D self.build_file('pc-bios', 'edk2-aarch64-code.fd') + vars_source =3D self.build_file('pc-bios', 'edk2-arm-vars.fd') + vars_path =3D self.scratch_file('vars.fd') + shutil.copy(vars_source, vars_path) + + self.vm.add_args('-drive', + f'if=3Dpflash,format=3Draw,readonly=3Don,file=3D{= code_path}') + self.vm.add_args('-drive', f'if=3Dpflash,format=3Draw,file=3D{vars= _path}') + + ASSET_VBSA_EFI =3D Asset( 'https://github.com/ARM-software/sysarch-acs/raw/refs/heads/main' '/prebuilt_images/VBSA/v25.12_VBSA_0.7.0/Vbsa.efi', @@ -45,20 +60,12 @@ def test_aarch64_vbsa_uefi_tests(self): =20 self.vm.set_console() =20 - # virt machine wi + # virt machine self.set_machine('virt') self.vm.add_args('-M', 'virt,gic-version=3Dmax,virtualization=3Don= ') self.vm.add_args('-cpu', 'max', '-m', '1024') =20 - # We will use the QEMU firmware blobs to boot - code_path =3D self.build_file('pc-bios', 'edk2-aarch64-code.fd') - vars_source =3D self.build_file('pc-bios', 'edk2-arm-vars.fd') - vars_path =3D self.scratch_file('vars.fd') - shutil.copy(vars_source, vars_path) - - self.vm.add_args('-drive', - f'if=3Dpflash,format=3Draw,readonly=3Don,file=3D{= code_path}') - self.vm.add_args('-drive', f'if=3Dpflash,format=3Draw,file=3D{vars= _path}') + self.append_firmware_blobs() =20 # Build an EFI FAT32 file-system for the UEFI tests vbsa_efi =3D self.ASSET_VBSA_EFI.fetch() @@ -102,5 +109,98 @@ def test_aarch64_vbsa_uefi_tests(self): self.wait_for_console_pattern('VBSA tests complete. Reset the syst= em.') =20 =20 + ASSET_SYSREADY_IMAGE =3D Asset( + 'https://github.com/ARM-software/arm-systemready/' + 'releases/download/v25.10_SR_3.1.0/systemready_acs_live_image.img.= xz.zip', + 'df2c359de15784b1da6a8e6f3c98a053ee38ac0b3f241ccea62e17db092eb03a') + + ROOT_PROMPT =3D '/ # ' + + @skipIfMissingCommands("sfdisk", "jq", "sed") + def test_aarch64_vbsa_linux_tests(self): + """ + Launch the Linux based VBSA test from the ACS prebuilt images. + + We can use the pre-built images and then trigger the Linux + build and run the tests. We then need to slurp the results + from the partition. + """ + + self.vm.set_console() + + # Plain virt machine + self.set_machine('virt') + self.vm.add_args('-M', 'virt,gic-version=3Dmax') + self.vm.add_args('-cpu', 'max', '-m', '1024', '-smp', '4') + + self.append_firmware_blobs() + + # First fetch, decompress (twice) and prepare the disk image + # on an NVME device (the kernel only has drivers for that). + self.archive_extract(self.ASSET_SYSREADY_IMAGE, format=3D"zip") + disk_image_xz =3D self.scratch_file("systemready_acs_live_image.im= g.xz") + disk_image =3D self.uncompress(disk_image_xz) + + self.vm.add_args('-device', + 'nvme,drive=3Dhd,serial=3DQEMU_ROOT_SSD') + self.vm.add_args('-blockdev', + f'driver=3Draw,node-name=3Dhd,file.driver=3Dfile,= file.filename=3D{disk_image}') + + # Tweak grub.cfg default to avoid manually navigating grub + grub_cfg =3D self.scratch_file("grub.cfg") + offset =3D int(check_output(f"sfdisk --json {disk_image} |" + "jq '.partitiontable.partitions[0].start= * 512'", + shell=3DTrue)) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::/EFI/BOOT/grub.cfg", grub_cfg]) + + with open(grub_cfg, 'a', encoding=3D"utf8") as f: + f.write("set default=3D'Linux Execution Enviroment'") + + check_call(["mcopy", "-D", "o", "-i", f"{disk_image}@@{offset}", + grub_cfg, "::/EFI/BOOT/grub.cfg"]) + + # Launch QEMU and wait for grub and select the "Linux + # Execution Environment" so we can launch the test. + + self.vm.launch() + self.wait_for_console_pattern(self.ROOT_PROMPT) + ec_and_wait(self, "/usr/bin/bsa.sh --skip " + "B_REP_1,B_IEP_1,B_PCIe_11,B_MEM_06", + self.ROOT_PROMPT) + + # Now we can shutdown + ec_and_wait(self, "halt -f", "reboot: System halted") + self.vm.shutdown() + + # and extract the test logs + bsa_app_res =3D self.scratch_file("BsaResultsApp.log") + bsa_kern_res =3D self.scratch_file("BsaResultsKernel.log") + + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsApp.log", bsa_app_res]) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsKernel.log", bsa_kern_r= es]) + + # for now just check the kernel log for the result summary + test_result_re =3D re.compile(r"\[.*\]\s+(.+): Result:\s+(\w+)") + summary_re =3D re.compile(r"Total Tests Run =3D\s*(\d+), Tests Pas= sed =3D\s*(\d+), Tests Failed =3D\s*(\d+)") + + with open(bsa_kern_res, 'r', encoding=3D"utf8") as f: + for line in f: + test_match =3D test_result_re.search(line) + if test_match: + desc =3D test_match.group(1) + status =3D test_match.group(2) + self.log.info(f"Test: {desc} status: {status}") + + match =3D summary_re.search(line) + if match: + total, passed, failed =3D match.groups() + + if int(failed) > 0: + self.fail(f"{failed} tests failed ({total})") + + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021972; cv=none; d=zohomail.com; s=zohoarc; b=W+5K9JqIn/+IVHGMOeqWrB0RSODmqmd8mWEuQ0frCycV4C6DdsIjBF0yGpqlizDSivde3gUZ+mzwXPaUubdORuzrzkNAH9xF/5wDcTHxSJIPA22NKQN2K0cTTbV9A8sab8q2yjY0Q3N8gEn/UKXRRZXftFVutJP/5fh1b1cty28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021972; 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=2Fv5imt9etkCyxA426f2RtHofD804x2pDCK4rcq9hJc=; b=nzhuKJ/iMNW2hdhHbfr1H8fv9Y7feRR4zdUsnBEvj9RiXsYrY3PRCfjMRf6TQ976LdM15SvpKswUFSaxhY+LM/8lewP6smoELrNbfTigrWJ3yUMv2g/2SByfV7GEbb6uS2fcKDdr4hxcOWFTaBpRHEJK1O4B6CD52CrAumjE6rc= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774021972779327.5972662957955; Fri, 20 Mar 2026 08:52:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8I-0007d2-Lk; Fri, 20 Mar 2026 11:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c85-0007YZ-TR for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:20 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c83-0005XJ-TZ for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:17 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-b97bca3797dso270674066b.0 for ; Fri, 20 Mar 2026 08:51:15 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-668cd050c4esm1426956a12.0.2026.03.20.08.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:11 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3D4AD5F932; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021874; x=1774626674; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Fv5imt9etkCyxA426f2RtHofD804x2pDCK4rcq9hJc=; b=OGFzzahRIFAGKF2Ig8pxRZP5J0w0CyfDVYSQ9HOJOhmqn39BinzHaFw0HUShdVMwZc K9bYMqAt8CX3jg4Fe6NQgi0fUzCvpZ8JrkMQjNhHePJZh1qbB2SNx2IplqH2Z0w3f12q A7JAHY7VD5LZhHjL4wDvO3HhWCw0lGh8QTohc0Isjvo0WffhCwLvU63agzpk/yiO4ehI 5GIC2UheaEdNX0OQdawFiloVMQwbPs1eKadkvDKgwO3/PWzWPJkdRYS7kRJTIJchKwYV 2U+QPdbRjTNN225UaGuv+rgDZHv1Pfvrx6+FO2YbuS3w2tE2gXtldAW8/R0PkXaXtLvw EyJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021874; x=1774626674; h=content-transfer-encoding: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; bh=2Fv5imt9etkCyxA426f2RtHofD804x2pDCK4rcq9hJc=; b=b6yHe2dKT163wzRBIszrddrF3dWb3lED183ksZ4C/Iq7c0YS6Oo7cbIOGvp5eNfyfJ 4FU+OKEk57De2srSuI78ubMlPXg37MExQCEWQSa0HMp7nhJgFeXQtqaIQYLs8QLphRkv 9KvXAuzWp2CQ477myRM439Y5RWnMZam9fooCXJjDnVI+W3v99qae+hYmGfH1pRZm2T3x BOvbRBm0oeWIHo0NQigrGKSfZ/tRL/XpxA7NWuyNe3V5HXa0zzsCib2XKvU4EzTanBBW ex5FhIIbtgHnAdIoh/Nnl3jOEtif94zVAlq+u2kKAXBwUXz+4JV+jcoltXYnqZQmj8x5 UjNQ== X-Gm-Message-State: AOJu0Yx5Uo/V0jJzlLMswv22ogQdSfZ4Kd/ADAJ5Gohzc3Fa5kmTPLsl IrUqiOP0VKB+reK260HfbPho8Hv7i5bIpYFLVihVj3Ak2BYmJxfPdhvA2/83elzUrT0= X-Gm-Gg: ATEYQzyLi2O8yNChWBJdMZDk77UuH4OT5Eftl88klidNM0W9mD4AFsOESFlnyBdM0ni kpW6SCBY1sUrA5HpM3xzpq0/kIZfD/7EsdRg4M7fs4XzPOZAbZGN5dP3baF4+4PXtFJqxCZxJER kZROtw8DXXvEHnyIB7Bc8qg49VEpsnTuetjnq1sbM/SJGhqPIt6aJjo7y6qSIW6IFJ4depuhTwE TtdeLv8l5kOkVZHKQSmFE+Ixb+0wf3RhGHXBCNg6jrJQ6VwbBc4lSlQyeF4Nl7K3RY5p+zKYElQ ry0Q2t4Tj+zBUS0wktVb6GrD4kidVojspzIe6uv+Dx4k5ZBtXpWvcK7017ZZPosIfsduYU8VaEe 4wdOgq+iflxlU9mSNcnBHvuL6Nmd6igWLlsS1Hrqa8tIfEx8V/adBiZZFcoJ3wA10Z/CSwCOk/g i8TAy7W72hnF4+40SIHz8GA9A= X-Received: by 2002:a17:907:3fa8:b0:b98:33c5:1bb2 with SMTP id a640c23a62f3a-b9833c56788mr190108466b.25.1774021874174; Fri, 20 Mar 2026 08:51:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 5/8] tests/lcitool: Remove python3-sqlite3 from the list of needed packages Date: Fri, 20 Mar 2026 15:51:04 +0000 Message-ID: <20260320155107.2143191-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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: 1774021976544154100 From: Thomas Huth According to commit 7485508341f4 ("tests/docker: Add sqlite3 module to openSUSE Leap container") that introduced this line, the sqlite3 package was only required for Avocado. We don't use Avocado in QEMU anymore since a while, so we can drop this package now from our list again. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-2-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/lcitool/projects/qemu.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 5e34e953514..b78a1d7f2e0 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -101,7 +101,6 @@ packages: - python3-setuptools - python3-sphinx - python3-sphinx-rtd-theme - - python3-sqlite3 - python3-tomli - python3-venv - python3-wheel --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021919; cv=none; d=zohomail.com; s=zohoarc; b=UNjG6FcXrvyFSCOxeKl8u9FmZMh2OEA4LgDdl26YP0UZa2yxwXnpKgW/xs7BwMhnZW62U+rJeu9Ts77kH5kbGw7XnsXIgBotdcEDq7/Qs3W7hNQMFXTg/9MsEguXwkX31SbQwiInMfl0uKgbB1eRLrj58JPfHyd4VAF3QkdLw40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021919; 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=OtLMyhKZH4sz8kIt9TlWF7CjiscfCuFlHPtCM7GrpFU=; b=KsFAZ+AlbMklb85L+G+A6CiF5LatQmQV20C+OlFe+thWrhHWYJMAd3fDypHsecqMSC2PsyafQFiMFFF4gYozKO2aqAgEbjKFOR6Minbs+GiW99VeUCHyGK+dRqIDMSDFRIHDNCq+z/uxSww0UTy3DPqxN0/6UUPZ4KwV6vok12w= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774021919083322.73256286668266; Fri, 20 Mar 2026 08:51:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8G-0007bZ-2H; Fri, 20 Mar 2026 11:51:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c84-0007Y2-ST for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:16 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c82-0005Wb-Kn for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:16 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-b9825ba7e8dso233966466b.3 for ; Fri, 20 Mar 2026 08:51:14 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f43ca4sm174703166b.11.2026.03.20.08.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:11 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 58BE25F93F; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021873; x=1774626673; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OtLMyhKZH4sz8kIt9TlWF7CjiscfCuFlHPtCM7GrpFU=; b=uH5tJ9eNJ1WflTfCVokMdrqvd2AV2q1ofChTaLLeKAjjFCIV5zZY20tA3+S8Zp4oNS JkonkQzSk+s7+88WieQL+lfS4OILjg1iLyXOU+eVU/nnMypS7JlKI3nnHWtXPOu3A1BK 7N7TWjhu6yQ1IxlcPUKhVnkPWSWUTX+4uLn855Hj5oDatTeGAhksgyXYqon19RTYbfO0 3Cal55ri7IrrFgHBQwub5Q2KhhjjDnrTIuTVwX70XL1eb4BCjvJAGTgTqOfJSVL4vE6m iVQP+RYGC92E6zf18ysY9lyeQuIBgCBNPZfZOPS+UMKV/FzxLAylM+J29OD3FwsP2nVV keSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021873; x=1774626673; h=content-transfer-encoding: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; bh=OtLMyhKZH4sz8kIt9TlWF7CjiscfCuFlHPtCM7GrpFU=; b=oHHzny+GBHwSGaqk37Zu3rQM1OHLrkEPwoPzvn5Cq8vTzMosAZfo+aOIO4IDDoGXjL Tg0tlXbPonuJwwLLp5bz9CZX98dnUkvvjTCRhSzb0r8yoyAlYf6sUM3lbWpNOmUdbsU+ 8I6aBw5JfxRq9m1+1ERxgzmSmzlZuOJvTzdt/iTytocDB1jbDZfmMCuAEQ4mOMYvP7Qu cLXgabhjBgDKesoH0eYF9PJ23qVROzgV5nBI2lBqgKozzpnp9ZVSYl069dE7l/NiCfkJ HqxoelbsmxkzXXsTa8v51Ap6fHXWKrLl4SdjvrpuUBOQimnFHxH8ZNG6s/anVxS7Cnha 57bw== X-Gm-Message-State: AOJu0Yx0ZNbRuerOJgHBAYjL7cNLFpsP7ls0YnflT4Lpu+048IzqlSm4 +Hlqnqk353BTI/XgS1dpnuGDSgOnsWkqBOMaeemhVb4WTMT3E0iHvfgDcVF8mLmDImI= X-Gm-Gg: ATEYQzzXRvAtYMZGHNJD0DvY8mgO1Zz1qV0KrtHAPutNJBQmvyQNupYD2psUOxULz+m C9fuhGsNKKDqa7R2MyWYrxKWXZxFt+etFssrl7UwBuXvn9AC18Vxze0RB4YYDESnVnkkbnZUTL9 vz1JcsloOYjfIyNblcl8Q6zuVlT196upMLr2ssaIT+jyRrAC2vBSfofxaI+KQew+FnRCpaBiAWY HS6Zli0rwpauP9T2hrG8xiIITZMSkW0I/NXIF+7C6YQm7DPUWNt42IWpQwMJrW9fCc/K2Mb2RPf 0GABtzEPQDU0Pcugc+NZ20uHGxfkKnf2t+zLhXvQhAKDQv0J97SxtqFjnsi/m2u8N9nt+JsiJVU 3WgeKKcSfwzn2b7LAN4aSqtGg+6aoliqBq+FkhWVC04f9HPwwe7DNiVLtd+hw8Kri2+7NrYzoXu uKfYD/QYKeauNe/RfP6L1fujDFBaT0O1PozA== X-Received: by 2002:a17:906:e94a:b0:b98:2493:4770 with SMTP id a640c23a62f3a-b982f28b4bbmr210614866b.21.1774021872746; Fri, 20 Mar 2026 08:51:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 6/8] tests/lcitool: Update openSUSE to version 16 Date: Fri, 20 Mar 2026 15:51:05 +0000 Message-ID: <20260320155107.2143191-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.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: 1774021921669154100 From: Thomas Huth The first version of openSUSE 15 has been released in 2018, and according to our support policy, we "support the most recent major version at all times for up to five years after its initial release." Since openSUSE 16 has been released a while ago, and openSUSE is clearly older than 5 years already, it's time to update to version 16 now. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-3-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- configure | 1 - tests/lcitool/mappings.yml | 58 -------------------------------------- tests/lcitool/refresh | 2 +- 3 files changed, 1 insertion(+), 60 deletions(-) diff --git a/configure b/configure index cd1dadd8bb2..f3603fd9160 100755 --- a/configure +++ b/configure @@ -929,7 +929,6 @@ if ! check_py_version "$python"; then error_exit "Cannot use '$python', Python >=3D 3.9 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ "Maybe try:" \ - " openSUSE Leap 15.3+: zypper install python39" \ " CentOS: dnf install python3.12" fi =20 diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 60618971584..62fe60d047f 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -3,70 +3,17 @@ mappings: bindgen: Ubuntu2204: =20 - flake8: - OpenSUSELeap15: - meson: - OpenSUSELeap15: # Use Meson from PyPI wherever Rust is enabled Debian: Fedora: Ubuntu: =20 - python3: - OpenSUSELeap15: python311-base - - python3-PyYAML: - OpenSUSELeap15: - - python3-devel: - OpenSUSELeap15: python311-devel - - python3-docutils: - OpenSUSELeap15: - - python3-numpy: - OpenSUSELeap15: - - python3-opencv: - OpenSUSELeap15: - - python3-pillow: - OpenSUSELeap15: - - python3-pip: - OpenSUSELeap15: python311-pip - - python3-pillow: - OpenSUSELeap15: - - python3-selinux: - OpenSUSELeap15: - - python3-setuptools: - OpenSUSELeap15: python311-setuptools - - python3-sphinx: - OpenSUSELeap15: - - python3-sphinx-rtd-theme: - OpenSUSELeap15: - - python3-sqlite3: - OpenSUSELeap15: python311 - python3-tomli: # test using tomllib apk: Fedora: Debian12: - OpenSUSELeap15: - - python3-venv: - OpenSUSELeap15: python311-base - - python3-wheel: - OpenSUSELeap15: python311-wheel =20 rust: Debian12: rustc-web @@ -79,12 +26,7 @@ pypi_mappings: default: meson=3D=3D1.8.1 =20 # Drop packages that need devel headers - python3-numpy: - OpenSUSELeap15: - - # see above python3-tomli: apk: Fedora: Debian12: - OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 79a280feab4..e4d01d792b7 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -226,7 +226,7 @@ try: generate_dockerfile("debian", "debian-13", trailer=3D"".join(debian13_extras)) generate_dockerfile("fedora", "fedora-43") - generate_dockerfile("opensuse-leap", "opensuse-leap-15") + generate_dockerfile("opensuse-leap", "opensuse-leap-16") generate_dockerfile("ubuntu2204", "ubuntu-2204", trailer=3D"".join(ubuntu2204_rust_extras), # https://bugs.launchpad.net/ubuntu/+source/rustc-= 1.83/+bug/2120318 --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021956; cv=none; d=zohomail.com; s=zohoarc; b=E/cM2X+fAuSA/5WdLmvI//av+m6eaeXwoJzPoJZ9xZWis0kUjWN9maX3TMAly+b2ni0g0mTK8PnDwhnORZ/EgKrA21WGZs2OIF6Q7lSSgRrCMOGGiAQezDF7sPlIij1xMILLfl5Txt5nDJ57avHdIDSM2GlyoOLk14OgHVD7Wpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021956; 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=Vtp616pn0VVl4bYnzt5PwIs8bsU7tc9ZvPQ6p1AmMyI=; b=P0922a6++xbeL3vZbxW0VTcbOam2ANaElvCG6Q4aERr2dXxq26KVCuTx1sTbTApCxxc8veYs4uJGXCaurpfp4DHea/WVh3pyTY+tr+OLfnQ1Mq7DvQYe7+jg+tpW0FHipHT9IamSvNr3p4OTsKSej69fnsfKgJ4otMZt8DOTpm8= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177402195603312.380890873954172; Fri, 20 Mar 2026 08:52:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8D-0007b5-2o; Fri, 20 Mar 2026 11:51:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c85-0007YY-K7 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:20 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c83-0005Wm-57 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:17 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-b9358dd7f79so128675466b.1 for ; Fri, 20 Mar 2026 08:51:14 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b983387084asm169057066b.53.2026.03.20.08.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:11 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6F9175F943; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021873; x=1774626673; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vtp616pn0VVl4bYnzt5PwIs8bsU7tc9ZvPQ6p1AmMyI=; b=B+kOAUQQs53AajIgcTyUamIoE7nxbEWFarGskZSgxS8I6YT7++yw4OZRSVzrsl+IEK eamx3q9PzfKbuqlfBUWrOXA4FWEiY7fSllYPfZMXcKoFL3Npr79WI9gZyzr7kLCb/P/T v0PPcBnuemnozTnSkdwfjtXqiFDYDeGvN3kET9pnkRYmFV2rXakqOcM5m16vKaPMXeHL vIhCOvMAoCq2jVXK6Z5za5MZCG09WfXtyjaTxMKbwJ6aHL3upl2z5om2q4JvdFbjQwTr 6dZPNLaOc4FXvPTwKS1zuV0OQv80BloLA4gx4rxU8eyuHZx7coaqKiMk2yCGsBaMHXAy U7Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021873; x=1774626673; h=content-transfer-encoding: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; bh=Vtp616pn0VVl4bYnzt5PwIs8bsU7tc9ZvPQ6p1AmMyI=; b=NfbF8bjByM/55ODnCCrkyYwFwXcdb4W/086GTOZt0zH+g5FL60KTyu5DhbZhVqyD56 tz+xRBgdRQZUM3dADsxbqPuR5nheRf9aEw/LhyXmpjTxCV+PT0PlM2lkika8r2f/KzlX z7BOi0Fz7I8opUg/i++PJVc7FOE2uweVLCnJEykb3pmrGqrfr5AZfizsbArbcpHHGZuH 0CZx5pIkx1tU/8o+v420LH9/YHqpUuvJbdmBKsuB2UHyQ5BG4zzAzbxU4ar5MZu6emOY y9dEiAuQa67Bn5sX5atzK35QFnTk1DHdLJ8lNEUtwm3KoTVX+Gdwst4wm9ENmMOiYZnL hdaA== X-Gm-Message-State: AOJu0Yy6qBB4BVI36ZmBSRBqSGC8NEwT4Atpy162VMKSIDRNwuWdUa/k Ho2+KxtCpqCLqBwZIPrjV719XrHctfVtHaCXjiWmFvIbpaez2YvR0X5jt9uo3KqQFtM= X-Gm-Gg: ATEYQzw5iP/xZRg/pu6J0tFGba+01VOSWLeC2kCUSENfVUfuEuRvYnm3el8qX5cgzWZ qYfgBTUJSQNiCExDmomZLfN8fy7JYXpnfRxvarKCa+4YVTrYUl4EZhVZXPSMV4kdPiO21axdUL8 ivlq31y5+q4JCa+TPTsLK5GImKXccmV/PpcE0GmeiJBXRYm2Ll1CGHBGYcbTAyFs9UB6On/6GYD kDyYAZYqnzNNFyJRaF08PZJtKfLgHVVfPsmr/VWA0vpOjuN4EDRVbZDU3acJaluIgK4OPl7dPqh mAir5ks0xSypyt5i8hZHgwhcH4APacMHhXa3DW75b76xSOCVSY1O4mT3r7HrMrAZ2IS0zHdtc4n Pi/28WpE6kxwKEUWhFSW2k7vuaaBbUS7gzBExEpEA42mH5Rl8bT5whfaOe89aGQd3J7GRDGfRfc zATMW0VyscLfPteJ1xaQWoumA= X-Received: by 2002:a17:906:cc8d:b0:b97:a422:b435 with SMTP id a640c23a62f3a-b982f3a5e4fmr185042066b.40.1774021873425; Fri, 20 Mar 2026 08:51:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 7/8] tests/docker: Update the opensuse-leap container file to version 16 Date: Fri, 20 Mar 2026 15:51:06 +0000 Message-ID: <20260320155107.2143191-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.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: 1774021958264154100 From: Thomas Huth Run "make lcitool-refresh" to update the container file to the latest version of openSUSE. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-4-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/opensuse-leap.docker | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index d693f2c6f85..66e90fa3634 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,13 +1,12 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-15 qemu +# $ lcitool dockerfile --layers all opensuse-leap-16 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.6 +FROM registry.opensuse.org/opensuse/leap:16.0 =20 RUN zypper update -y && \ - zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/back= ports/openSUSE:Backports:SLE-15-SP6:Update.repo && \ zypper install -y \ Mesa-devel \ alsa-lib-devel \ @@ -80,13 +79,14 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ + libxdp-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ lzo-devel \ make \ + meson \ mtools \ - ncat \ ncurses-devel \ ninja \ openssh \ @@ -94,11 +94,17 @@ RUN zypper update -y && \ pcre2-devel-static \ pipewire-devel \ pkgconfig \ - python311 \ - python311-base \ - python311-pip \ - python311-setuptools \ - python311-wheel \ + python3-Pillow \ + python3-PyYAML \ + python3-Sphinx \ + python3-base \ + python3-numpy \ + python3-opencv \ + python3-pip \ + python3-setuptools \ + python3-sphinx_rtd_theme \ + python3-tomli \ + python3-wheel \ rdma-core-devel \ rust \ rust-bindgen \ @@ -110,7 +116,7 @@ RUN zypper update -y && \ spice-protocol-devel \ swtpm \ systemd-devel \ - systemtap-sdt-devel \ + systemtap-dtrace \ tar \ tesseract-ocr \ tesseract-ocr-traineddata-english \ @@ -133,18 +139,11 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3.11 install \ - PyYAML \ - meson=3D=3D1.8.1 \ - pillow \ - sphinx \ - sphinx-rtd-theme - ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" ENV LANG=3D"en_US.UTF-8" ENV MAKE=3D"/usr/bin/make" ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3.11" +ENV PYTHON=3D"/usr/bin/python3" # As a final step configure the user (if env is defined) ARG USER ARG UID --=20 2.47.3 From nobody Sun Mar 22 14:11:08 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=1774021916; cv=none; d=zohomail.com; s=zohoarc; b=TThWSHIlSxD3w/xGlhXqgE4zMvvG9/bm8dViuzgwIvoBxk/RFhl29cL4wR2EIXsbje4+XWD7Om7bIXd9X5Ds2Lt6sRRcUDQ/dD5mGqeLOTuaHKuIEohRKEE8PySgZyOotl7Jci7oK2icSu7jbb+zSO1ku8tXohkTsZk6wfA0Re8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774021916; 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=FlhWqsULp6KJ73cY3Vo3UNgwju5e7z4CYT++su60MZw=; b=RPC5Vw/gK1Gyj9l2sa1wrcvA0UVMLDaezA02q1Orugfo+WorMD2qPkAydDdiSeNxmnnUrRtW9JJqGKi9ati3jCbEn63Nrkbx3HgVuL94aGF3V3Z05aNVOwqikcEg3vqbesH38GKYM75gehI5XU4QK5gXSDtKmYyYNFM+gNeIdxc= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17740219163061012.5635931667628; Fri, 20 Mar 2026 08:51:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3c8I-0007cY-F5; Fri, 20 Mar 2026 11:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3c87-0007Yd-04 for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:20 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3c84-0005Xj-Kq for qemu-devel@nongnu.org; Fri, 20 Mar 2026 11:51:18 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-664f8bef4e7so2978890a12.3 for ; Fri, 20 Mar 2026 08:51:16 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-668cd050c4esm1426961a12.0.2026.03.20.08.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:51:11 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A13BE5F946; Fri, 20 Mar 2026 15:51:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774021875; x=1774626675; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FlhWqsULp6KJ73cY3Vo3UNgwju5e7z4CYT++su60MZw=; b=u/G8xh9+uQAhT/DFtah4Wk4S9xBwzu3KDNd+XT9fvNt6SLKNzX+hAa0ZqndNrFu+Dt iHPtl7hMiacf6ZyovL9owtilcyjEpHBCL5PwMPhDVXMK0IsM+lhLyHtVjsDqraR0tQjY HvEr3q1BRC8kfG/RWbocWbh5rDVpk/w7QaUMJylFZeoDAm1AS7nFVppIYmjQkhm3IBMD l3EEtXkx167ezchOcOO+vHreMMfZ0bpTFd29b/rkCKnOsI7pnAs4Y0qSHbwKjAj5leDI 4YLJRwcj8lFx20rhoaWb0Nlpp7OlhdPVMm+6Wm6jY1/CQiEj0ZI9hlzpvQl+/NwkrU60 jnvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021875; x=1774626675; h=content-transfer-encoding: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; bh=FlhWqsULp6KJ73cY3Vo3UNgwju5e7z4CYT++su60MZw=; b=EuwivvpTcKXJeBroBaLvedwPyfPr4MNjnwgQRy78Aa+JZbNV4loP69f+2Wjm3GE2WG 5K2PtLH4S1pqY5ZNHX3t87yLsKmWm1S1iRoXj0Ga3RmW5Am2OSCdW794eFMoeo0ebtgr +mqPL33K7q17TIDTTvzQuRbWgXAUr0aLcamth5a7Un3FEsV2SKa3cdopPwDRvU6OGcNp FNd+qLUcEwGrlpGozRXlV2PQXAMqjwMOaeHj60TczT3augLBSwzfzzQrc1KHaVy9XfZr EBvweM3D4JRCavd24gNU7LqQI8VpvrLoR0MJM6mtAsJmwc0pP1n9OsC9rWcVOwz5+G84 c5Vg== X-Gm-Message-State: AOJu0YxOvZEgIDNvNYPNYcXw6Yq2OO7oQn7UmveNni0Yk2x7NCIdcBJA tcBSKf6iZav63KzM3sCbcyiG2pMWdIubpHocWUqAKfVf7M8Klxzqad3oRByy9iWm02I= X-Gm-Gg: ATEYQzzdzzBxV/Kzel1FF3c1aX+bC5acaOLQ1IyViJ17peeJ/+BaoyGwlsVMI6o4wj0 OWXn8mwtOpLaqdqTTUvzRZuaYBOyx7hp89y/KyfJq2u/gUc7K+lBxMUBShQvHVfeQxTS5CNWrUv FS494GXzAv5475iM5249SimFH0owYW2SH1wXfM/UvuglF7w19JhqtzQG25cl1tfqZkO2OJxF8+E mQB9wJnjZIS3Li1LxSoHeOQjh3+1ffFYX7NDG0SKDEY2+FF/iyvLhFqadvB63XprRqPtqH2EP5e vBet+vaYCHo0mvUbvO8quiERkPCNKWo6SpDZ8rqf+XLH6ZTq8WwL4O2r5Vksck9F+Ro1ujlfPve fyYMgyEZXQJqKomjwubSe0AUvQOu3NQpyCu+JCWJSYdwJM0zcuVaQJGeOWmtLGb9p4m3gVvDjpq HWEZQwsXQMpoVJndt+ysdy2Rg= X-Received: by 2002:a05:6402:35c7:b0:667:447d:cbb1 with SMTP id 4fb4d7f45d1cf-668c8ffd1bdmr2644115a12.1.1774021874928; Fri, 20 Mar 2026 08:51:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Kyle Evans , Peter Maydell , Pierrick Bouvier , Warner Losh , qemu-arm@nongnu.org, Thomas Huth , Peter Xu , Fabiano Rosas , Brad Smith , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v3 8/8] tests: Replace ncat with socat in migration test and drop ncat from containers Date: Fri, 20 Mar 2026 15:51:07 +0000 Message-ID: <20260320155107.2143191-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320155107.2143191-1-alex.bennee@linaro.org> References: <20260320155107.2143191-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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.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: 1774021917459158500 From: Thomas Huth nmap / ncat has a somewhat problematic license (e.g. saying claiming that derived work is also considered for software that "is designed specifically to execute Covered Software and parse the results", e.g. by executing ncat from your own program, you might already fall into this category) - so for example in openSUSE 16, you can only find it in the "non-OSS" repository. We are currently only using it in the migration functional test, and that likely does not fall into this "derived work" category yet (since it is also doing some other stuff), but still, to be safe, we should move away from using it now. Unfortunately, switching to one of the other flavors of netcat is also not a real option (see commit f700abbbeb6ab68a3446d1fb168a934d), but socat should be a solid replacement here instead. To avoid that someone else easily uses ncat again, let's also remove it from our container files now. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth Acked-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260316183016.239526-1-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- scripts/ci/setup/debian/debian-13-ppc64le.yaml | 1 - scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 1 - scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 1 - tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos9.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 1 - tests/docker/dockerfiles/debian-armhf-cross.docker | 1 - tests/docker/dockerfiles/debian-i686-cross.docker | 1 - tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 - tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 - tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 - tests/docker/dockerfiles/debian-riscv64-cross.docker | 1 - tests/docker/dockerfiles/debian-s390x-cross.docker | 1 - tests/docker/dockerfiles/debian.docker | 1 - tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu2204.docker | 1 - tests/functional/migration.py | 4 ++-- tests/lcitool/projects/qemu.yml | 1 - 21 files changed, 2 insertions(+), 22 deletions(-) diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/se= tup/debian/debian-13-ppc64le.yaml index 25d96cea460..b16d6d58f8e 100644 --- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml +++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml @@ -101,7 +101,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2404-aarch64.yaml index 6a72eabca9e..b58fcda0fa3 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -102,7 +102,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-s390x.yaml index 6001da12504..fa439db4ca1 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -100,7 +100,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index c0303feb48a..a7ee85fcda7 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -76,7 +76,6 @@ RUN apk update && \ ndctl-dev \ net-tools \ nettle-dev \ - nmap-ncat \ numactl-dev \ openssh-client \ pcre2-dev \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 6b1aa6dc0de..41a1225856e 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -87,7 +87,6 @@ RUN dnf --quiet distro-sync -y && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index c386b658b04..6fad808e1b6 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 9d83ab7a32e..889d8a1a755 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index c2077ec7a2c..988c87075f6 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index db9f04ee93d..d720ebb0bca 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 7758afd80aa..90a2ef15574 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index cba7f43870f..b7e36b3d974 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 24f946d1441..a70fbee0c1d 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index f476cf65eaa..9ada5ecce0d 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index a60b4ab01d1..a1de94ff9aa 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 6c6ab0256ea..c34923b253d 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -109,7 +109,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 38381ef8f59..8766f952ac8 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 818485c4ba2..751789e849b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -42,7 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \ make \ mtools \ ninja-build \ - nmap-ncat \ openssh-clients \ python3 \ python3-PyYAML \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 32aaf01aff4..ec787aa7027 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index 44e763f571a..fb5b03e7a1b 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/functional/migration.py b/tests/functional/migration.py index e995328e833..2395119d6c6 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -84,6 +84,6 @@ def migration_with_exec(self): self.skipTest('ncat is not available') with Ports() as ports: free_port =3D self._get_free_port(ports) - dst_uri =3D 'exec:ncat -l localhost %u' % free_port - src_uri =3D 'exec:ncat localhost %u' % free_port + dst_uri =3D 'exec:socat TCP-LISTEN:%u -' % free_port + src_uri =3D 'exec:socat - TCP:localhost:%u' % free_port self.migrate(dst_uri, src_uri) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index b78a1d7f2e0..131d9c4ec81 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -83,7 +83,6 @@ packages: - meson - mtools - ncursesw - - netcat - nettle - ninja - nsis --=20 2.47.3