From nobody Mon Mar 2 08:46:52 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=1772132082; cv=none; d=zohomail.com; s=zohoarc; b=CcHVUM8JVE+WINb6/I/9tPMQgvFxld3uW4OlrDDP7zKy8pfwL0F5Q7ZDcwOMbU5PKJTFH1M6fkE2VB1vyF7GwNnYFt0si0J+nCnVn1ZqmGjOhkzWLhU3VhmdqRajL1hosKueTbn0w3wq9WbVKSqDuTCt433E9wN3cLOIP/T8rAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132082; 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=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=DLBpbRbT3UxvCphx3obUoULo2I2qDSH46zG6JNPitEj9sWEDuOmIP2+rlIUp8pjtcQFTk7UZijpBfEc/Kp5JBGaky/QyNNnsapG0NkNT8ydg1tPButfQZyV5N7YCQz1oTuDC0M8AFt4P03cItTGwyyT/Apl19wfWJxBfm76Y4IA= 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 1772132082104771.6597072396843; Thu, 26 Feb 2026 10:54:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUW-0008Km-3d; Thu, 26 Feb 2026 13:53:40 -0500 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 1vvgU3-0008C8-BI for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgTz-0003WP-KZ for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b935cd1c6f3so163767966b.3 for ; Thu, 26 Feb 2026 10:53:06 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935ae60bf5sm86835266b.42.2026.02.26.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:04 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7CE045F8BA; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131985; x=1772736785; 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=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=GIm49HwOXve7E6ifuHuQyJDLGabkS4Avh/GTBf35SXwcbaHVXHE/8/fWSteBSbeYRF XtNY+I8Li2GV5tLt9tuzH0K7l4KFRhUmsOz1/TDTJyL8V+70UnneOulrFMs9mc55V7Tj BMhRXF4hSpVzOurjHdpdu5Ht1OmHDJwW7LLIMjPbJuSuZ8OBn9zGg5DphWCAB+gzzJD6 BTLXd0BUPIn2g8LNQAxFw8n8ZYaUjVM/I5tZ77JJnui0czNF0zyNDz0HcAr0FPJY4pZt pLIROl7Qp51id00kK9Y6kPwOV+hwE2VkmW2imQ8kNDQh9TeSwj6zfmhUUfZMFhJXhBA+ Lm/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131985; x=1772736785; 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=QkFfoTUTnHUyPobpDVFMIZRdkqj9H3jZxM/MRJrFhww=; b=XuSKhumb2yrjH8VVA9jklGCg17C0GgR3xuQL/67GKGavt+zQTdm58PIXzGRcVyG1DH zBI+iPgf4+y+lgbWnD7uYzLanIgBa6s1ZDqvEAhjnDFdsgkI1/QhJimFNag0lJTtL9KO 7D+AKWQlA7npWKwW7HgHYIw4J4g6aOZlofueM4kfbvhgQ0WuhqgBHhawz2U9pQJ4ybLr 4rLaHiVaYocfjlBp5dhiuL6G5VqsFfoMCNrLVp0uD0I7kjcmY92Dk3e06Zl7YUM7tSch FzpNkmY+pyzPnM2aFjNNGceCpehu/EMwZrnokTUTGrx3ozeXYUVSrInFX+PBkkU4AFcX 007A== X-Gm-Message-State: AOJu0YxVL5cDqKBbjlRE/p7g+mw8so5NbGs9xcKbyBliqPVBEBOyh3Zy SpKNNZe4tJJ1GVfVkFQXK95tdfJcO395eJkW3dMQyuZe2VdZ5dbyUf4ZiF6jmANH4aM= X-Gm-Gg: ATEYQzxo4TyTRRM3ybzDp8GPm28fNJX8g92TbfolMNmYfM8jVcC8v3LKjfKdFqcNMyU utFfIQr1w136Au4eaAJjGQgo1t3rOhJ4kZs44BwT2AESlcCjBA4XnhmkuJzCd4bz/VwjCi92JrY W8dssZq21UOZgMNrSfffug4B+QkkZNl0k3ziXyf27G+JYFtkQ8FF72zsZxJPjMkGj+qSrzUtmfU hMnXH2Kp0Rx9ZLmr7zLW8Pv9EZeO0omgLc6kVFQusPLWWexL+KrrtoxkWPYpW2WrEYoXfL6uUdS zyT9QI8DjvihOZUtW9HOAKCpexFKZ/Toe0SFmZi17tLseSAHGs+ctIv9ZCPPRHDlPNtMRNEink5 Jjc5ZXyhqqYIQnWJXfwAGhNf6fauXWI3c1DNVdb+MTInMAdhsxcm4EhFPUmpogTy9DNV1Y7x6mB Y7XIbovWhbirOVdM7C7G2Fa0Q= X-Received: by 2002:a17:907:84b:b0:b88:6542:86a0 with SMTP id a640c23a62f3a-b93517e2cb1mr324107566b.54.1772131985363; Thu, 26 Feb 2026 10:53:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , John Snow , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/7] tests/docker: upgrade most non-lcitool debian tests to debian 13 Date: Thu, 26 Feb 2026 18:52:56 +0000 Message-ID: <20260226185303.1920021-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.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: 1772132084062158500 From: John Snow Debian 11 was EOL in 2024, and Debian 12 will be EOL this June. This patch moves all but one of our tests, debian-legacy-test-cross, onto Debian 13. This patch does the bare minimum to upgrade these tests and doesn't make any attempt at optimization or cleanup that may or may not be possible with this upgrade. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 [AJB: tweak summary line] Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/debian-hexagon-cross.docker | 11 ++++++----- .../docker/dockerfiles/debian-loongarch-cross.docker | 10 +++++----- tests/docker/dockerfiles/debian-toolchain.docker | 8 +++++--- tests/docker/dockerfiles/debian-tricore-cross.docker | 5 ++--- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/d= ocker/dockerfiles/debian-hexagon-cross.docker index 23152b4918b..91d4b71ac95 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -5,10 +5,12 @@ # needs to be able to build QEMU itself in CI we include its # build-deps. # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim + +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ @@ -24,6 +26,7 @@ RUN apt-get update && \ ninja-build \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-venv \ python3-wheel && \ # Install QEMU build deps for use in CI @@ -36,8 +39,6 @@ RUN apt-get update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - ENV TOOLCHAIN_INSTALL /opt ENV TOOLCHAIN_RELEASE 12.Dec.2023 ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unkn= own-linux-musl" diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests= /docker/dockerfiles/debian-loongarch-cross.docker index 538ab534902..55b3dbe4510 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -4,10 +4,11 @@ # This docker target uses prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -31,12 +32,11 @@ RUN apt-get update && \ ninja-build \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-venv \ python3-wheel && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' = --show > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - RUN curl -#SL https://github.com/loongson/build-tools/releases/download/20= 23.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt =20 diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docke= r/dockerfiles/debian-toolchain.docker index ab4ce29533d..9a256209a78 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -4,13 +4,15 @@ # This dockerfile is used for building a cross-compiler toolchain. # The script for building the toolchain is supplied via extra-files. # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 # Install build utilities for building gcc and glibc. # ??? The build-dep isn't working, missing a number of # minimal build dependiencies, e.g. libmpc. =20 -RUN sed 's/^deb /deb-src /' /etc/apt/sources.list.= d/deb-src.list +# Add deb-src repository sources +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ + /etc/apt/sources.list.d/debian.sources =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ @@ -34,7 +36,7 @@ RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, # and the build trees by restoring the original image, # then copying the built toolchain from stage 0. -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 7e00e870ceb..fd797dc7ee4 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -9,7 +9,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ @@ -31,12 +31,11 @@ RUN apt update && \ pkgconf \ python3-pip \ python3-setuptools \ + python3-tomli \ python3-wheel \ python3-venv && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' -= -show > /packages.txt =20 -RUN /usr/bin/pip3 install tomli - RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download= /tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ | tar -xzC /usr/local/ =20 diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index d011eee2ad3..ef63e44e2ef 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -5,7 +5,7 @@ # using a prebuilt toolchains for Xtensa cores from: # https://github.com/foss-xtensa/toolchain/releases # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:13-slim =20 RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132052; cv=none; d=zohomail.com; s=zohoarc; b=dAvFICrnJrrMHTtmTbVq8eSpjLaGQd1z+I1KiG0RFxFAbYmKqVnSdamZrv55nXM2tnaB/s7NnvtSdeM4K0ppqc7djjVqVw5XHgFla9j58UPkJhrKl6gCd0vHTbXOnA4+Eu8kBvLgSpeuQZqVxGMUZjYEtWvWpqeFAwyAlnAi++E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132052; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=c6TYwJ9OuUX8gZHs4own8jvs5R2EsWUugkiP1babx0E4KsLNaimGGU+ZZRnsFTmEX4rb1obISHzx6KiI7y9nKRMld2EgniilbORi6RB32AIG3fXjiUXOykWjfbfn24C3s6ukfSUukl3+cc/8FnvV7Voucs90+ZXgql9Zc7KLkOM= 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 1772132052522549.418727982688; Thu, 26 Feb 2026 10:54:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgU5-0008Cd-7s; Thu, 26 Feb 2026 13:53:14 -0500 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 1vvgU1-0008BQ-Mw for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:09 -0500 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 1vvgTz-0003WT-FG for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:09 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b936505e7a0so104800766b.1 for ; Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935aede363sm79463466b.60.2026.02.26.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:04 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9AE8C5F8BC; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131986; x=1772736786; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=kMhQd0JSRsIpanAUugDWzLgG6KubzSD0SxWMwWleub7okqxb6lBDOSOrJMFm6SYPfA OkVN0UbrGWT6sX3v/21kxSxuEEVwbNTI3VSXeNxvdNVpClAA8Anrho3msyC/t1n/2Inm ZkbXaRqR7LLeGXQAFluMiqAE51zWsk33PWBKuUCeJT3AGRkc8RvpItRb2kuwkXN+Xjze mSq/hI9wMqnxj+PFjwDZpCnvSOBN6XL/Y3jL3iAmRmp5mhSM5Ue3LDUh+l2+jOWE4eKn oA+PPX/Ne//QNOblCR4VlIniHEVIk4m1aEsUjAMqpf3DM4mLqQ8PtMEKb3MbU+3HOP+W uVzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131986; x=1772736786; 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=MSs0etEZmmvImF5qEa73W/Q5BBnsscmwqVF4ojVJyjY=; b=qr5zZSbxet/+ZZestus3jCEXLCG+Ocyfy/DpzfDCdyUXZiWt8NJTB0g9I1bTpu20zj xsBYNkcGHRqgO50uynldaoAjBU31G5FES9BVVlHojX/5QB/wh35s4KAhyw59fAZ/iRz3 1Ha2hY/2VkPIWeHxBcW9jQ9llADFP9yfSQuMZzvsdXmPVgu7H+YLh+6EiifRALavzc02 4lFZIPcwOlzqsw2Su4zrh8BPYKeYnMDIpJcN1hffCeRwvloz/kpSHVncoC+LPLKcoiog UqRhdHDNV4H8MCDHQ3c3ImLKtuaft0PpVNqx2ZwnD+0piNrQ1qlmb8QvPdGb0CsevR+z /jUw== X-Gm-Message-State: AOJu0YyKaZNKic+3ngy/LIySbLaSghcc1xWEyz990tchMldQ5t5WkaTq PNK3RrpG5avh4NFEZDr1KeZp3MeLUE22fpXJNRdfg7+jrDupdfVUaW+370P3KJ422RI= X-Gm-Gg: ATEYQzwn7vFpaN069LIOtm8vZT3TPYbC87TR90kXorEHa8FJJ4H/MUjOw8HLyomgUc7 CgxqfoCm0bhLklwie0lHXdZ6Dtnt1XBMwOz9Xs6w/shPtRRidEbiG6Cy1M3TPxnQ3RfRO5fDBeO kwTD5RjuOI3wp711hOdvYB6kBzfPn4Tixu6w+kQnGosM7M8F/lfivcwZCOIVdsLE+1zDDdpyOSR m7q7k/Xed5jGnhL9pA8PcjTEUd/hNg5F0bSRvzAPTJqXt1wXCVSSMvAzcz2+8aBMwvqSu/pNJib hVMWlUx5dTQbM41S9UUZNvFYpz4aEkjf5HTHtcaAFuPt8OGpfEs3/pL3DfglpuscWrMaTtEmb+Q jmczbJzA7/9LA5y6BX3iCDE8Fr60OOV+0MUNMOAlmE9tmPk1cT+BGXhZF9GyKvIEK3zZfIn0qvP oA6at0KbO2006YsGDlp2vBZug= X-Received: by 2002:a17:907:7205:b0:b93:6360:9071 with SMTP id a640c23a62f3a-b937580caaemr6506566b.2.1772131985716; Thu, 26 Feb 2026 10:53:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , John Snow Subject: [PATCH v2 2/7] tests/docker: migrate legacy-test-cross compilers to trixie Date: Thu, 26 Feb 2026 18:52:57 +0000 Message-ID: <20260226185303.1920021-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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: 1772132054250158500 The bugs have evidently been fixed in the latest release so we can migrate the laggards into how all-test-cross container and remove the legacy hacks. They are also packaged for the main architectures so we don't need to jump through the amd64 hoops. Suggested-by: John Snow Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- configure | 10 +--- .gitlab-ci.d/buildtest.yml | 12 ----- .gitlab-ci.d/container-cross.yml | 6 --- .gitlab-ci.d/containers.yml | 1 - .../dockerfiles/debian-all-test-cross.docker | 8 ++- .../debian-legacy-test-cross.docker | 51 ------------------- tests/lcitool/refresh | 8 ++- 7 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-legacy-test-cross.docker diff --git a/configure b/configure index c4837eba2b1..683813473e9 100755 --- a/configure +++ b/configure @@ -1450,7 +1450,7 @@ probe_target_compiler() { container_image=3Ddebian-all-test-cross container_cross_prefix=3Daarch64-linux-gnu- ;; - hppa|m68k|mips|riscv64|sparc64) + alpha|hppa|m68k|mips|riscv64|sh4|sparc64) container_image=3Ddebian-all-test-cross ;; mips64) @@ -1462,14 +1462,6 @@ probe_target_compiler() { container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- ;; =20 - # debian-legacy-test-cross architectures (need Debian 11) - # - libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugrepo= rt.cgi?bug=3D1054412 - # - sh4-linux-user: binaries don't run with bookworm compiler - - alpha|sh4) - container_image=3Ddebian-legacy-test-cross - ;; - # architectures with individual containers =20 aarch64) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 1b656b9eb08..fef19c2d5da 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -376,18 +376,6 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static - --target-list-exclude=3Dalpha-linux-user,sh4-linux-user - MAKE_CHECK_ARGS: check-tcg - -# targets stuck on older compilers -build-legacy: - extends: .native_build_job_template - needs: - - job: amd64-debian-legacy-cross-container - variables: - IMAGE: debian-legacy-test-cross - TARGETS: alpha-linux-user alpha-softmmu sh4-linux-user - CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg =20 build-user-hexagon: diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 2a0cea6ce1a..92a7f1c1b47 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -10,12 +10,6 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross =20 -amd64-debian-legacy-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-legacy-test-cross - arm64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 6aeccf8be0c..c8b8e44ad86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -45,7 +45,6 @@ weekly-container-builds: # cross - amd64-debian-cross-container - amd64-debian-user-cross-container - - amd64-debian-legacy-cross-container - arm64-debian-cross-container - hexagon-cross-container - loongarch-debian-cross-container diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index 1823233438a..b73776d95b5 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -64,6 +64,8 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ gcc-mips-linux-gnu \ libc6-dev-mips-cross \ gcc-mips64-linux-gnuabi64 \ @@ -77,7 +79,9 @@ ENV AVAILABLE_COMPILERS gcc-aarch64-linux-gnu \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross \ gcc-s390x-linux-gnu \ - libc6-dev-s390x-cross + libc6-dev-s390x-cross\ + gcc-sh4-linux-gnu \ + libc6-dev-sh4-cross RUN if dpkg-architecture -e amd64; then \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-hppa-linux-gnu = libc6-dev-hppa-cross"; \ export AVAILABLE_COMPILERS=3D"${AVAILABLE_COMPILERS} gcc-m68k-linux-gnu = libc6-dev-m68k-cross"; \ @@ -90,7 +94,7 @@ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /= packages.txt ENV QEMU_CONFIGURE_OPTS --disable-docs -ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386= -linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linu= x-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user= ,riscv64-linux-user,s390x-linux-user,sparc64-linux-user +ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hpp= a-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-u= ser,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,p= pc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc6= 4-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tes= ts/docker/dockerfiles/debian-legacy-test-cross.docker deleted file mode 100644 index 5a6616b7d39..00000000000 --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker +++ /dev/null @@ -1,51 +0,0 @@ -# Docker legacy cross-compiler target (tests and minimal qemu) -# -# Compilers for some of our older targets which we cant currently -# upgrade. Currently: -# -# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi= ?bug=3D1054412 -# sh4-linux-user: binaries don't run with bookworm compiler -# -# As we are targeting check-tcg here we only need minimal qemu -# dependencies and the relevant cross compilers. - -FROM docker.io/library/debian:11-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - apt build-dep -yy qemu - -# Add extra build tools and as many cross compilers as we can for testing -RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ - ccache \ - clang \ - flex \ - git \ - ninja-build \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross \ - gcc-sh4-linux-gnu \ - libc6-dev-sh4-cross \ - python3-pip \ - python3-setuptools \ - python3-venv \ - python3-wheel && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' = --show > /packages.txt - -RUN /usr/bin/pip3 install tomli - -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user -ENV MAKE /usr/bin/make -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 8f0aa3fa343..c74345e03d0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -172,6 +172,8 @@ debian_all_test_cross_compilers =3D [ " libc6-dev-arm64-cross \\\n", " gcc-arm-linux-gnueabihf \\\n", " libc6-dev-armhf-cross \\\n", + " gcc-alpha-linux-gnu \\\n" + " libc6.1-dev-alpha-cross \\\n" " gcc-mips-linux-gnu \\\n", " libc6-dev-mips-cross \\\n", " gcc-mips64-linux-gnuabi64 \\\n", @@ -185,7 +187,9 @@ debian_all_test_cross_compilers =3D [ " gcc-riscv64-linux-gnu \\\n", " libc6-dev-riscv64-cross \\\n", " gcc-s390x-linux-gnu \\\n", - " libc6-dev-s390x-cross\n", + " libc6-dev-s390x-cross\\\n", + " gcc-sh4-linux-gnu \\\n", + " libc6-dev-sh4-cross\n", "RUN if dpkg-architecture -e amd64; then \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-hppa-linu= x-gnu libc6-dev-hppa-cross\"; \\\n", " export AVAILABLE_COMPILERS=3D\"${AVAILABLE_COMPILERS} gcc-m68k-linu= x-gnu libc6-dev-m68k-cross\"; \\\n", @@ -198,7 +202,7 @@ debian_all_test_cross_compilers =3D [ "${AVAILABLE_COMPILERS} && \\\n", "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --sho= w > /packages.txt\n", "ENV QEMU_CONFIGURE_OPTS --disable-docs\n", - "ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user= ,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el= -linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux= -user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user\n", + "ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-use= r,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-li= nux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-u= ser,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,s= parc64-linux-user\n", ] =20 def cross_build(prefix, targets): --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132052; cv=none; d=zohomail.com; s=zohoarc; b=ZeQqfEjlUj5HPPZXXSKVV5uxJ7eddC0w0L+cYGjxpGreulRI9zYhwfug45zJtfpi7FpnqHEkIJRA0F/+ycZYLSBYoQ3vSRe+bf3hRydMTlYTEkpYxh0vRiFL1i5awNDevjuqYqIPH68cKRsXgIK2lcBx/ZBZNdPnrzepxqUFWo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132052; 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=jlX56k1c6mmvWbzJgq1CjfW4SEALo5lTPBBeHcqvL7w=; b=Q2bAxqXWZ9Otlz84JYIsMuajVTJJ+ivwVG9AxtW051SKxLoXOPSj13822MprP6qJJcgzp4A8JApZXPIIkpVRBaWzPzcfsRj3kkcNVuu0QckOXqujAt4lyJNVXVEsCALYs1n9Xl+1TN8Sk0o6A02kvM0L0fVpwDZfXtAul46ssnQ= 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 177213205260325.98325852137907; Thu, 26 Feb 2026 10:54:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUE-0008Ei-Sx; Thu, 26 Feb 2026 13:53:22 -0500 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 1vvgU3-0008C4-8f for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgTz-0003Wa-U6 for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:10 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b936505e7a0so104802366b.1 for ; Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65fac06e48asm749782a12.29.2026.02.26.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:04 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B53BC5F8C1; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131986; x=1772736786; 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=jlX56k1c6mmvWbzJgq1CjfW4SEALo5lTPBBeHcqvL7w=; b=lmYMhj+dIr+OxfkfwFAneMf4gIkjkeMRf79QVCz+ewRXUX3Qmt6qpC/ze02SpKDl/A 2TTnSXeTgylsWOoedY0A78sAx2iNAgoDIKBMjqiflL4CofPgjcuj1Zbn+rWX0QK9T9T6 grdcYFOOx9X4zC+QFQvIKDwWXUKCzb0Hil/E6oIAeRG8fBJbyVnIZtOCFHCVqpM0H6U0 xj1eBvVPHDHgUYhKijXVpKdjO80KsfMi4bJRyqN3UJPWCgf6/NbJX9JADQ2FmvYwksl1 p89Xc9iWyxujsJSsp1H8jwr4aTAzHIuLw6ZoL3bqqmBlojqkVhOptXr/jbO+KtTtuv8B YMjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131986; x=1772736786; 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=jlX56k1c6mmvWbzJgq1CjfW4SEALo5lTPBBeHcqvL7w=; b=PXrGL+P/jsOSe3pvOnruDEt9o8ggKNKSbovtNBPIrgiX3ejzXBqs47DCR5h1EzWmXU i9UZxrN4CWHvH1SGKOT3YXVhW3K6i8E3Ds4bVeCxLLnoUFER7BOWXduoEqBJKMMEewKu tprg+w0I5WVgTSaLYsobg9khYNk2IJhVEOaHFw5WuuCuw2lKefuKCWITob4asvqhJKQf lV1dTsV3gL5hGSHqKv2ryliUt2Cp9jwcLC0z4CNrORXO45pPM6u9MlvufH6bmjVwv5c5 aGuwhsSHW+94fBkIZbrvh8rDFv9LWIwGi7oeYEexfSbeVt+UL/NZePZ8Vw8vkCYuJuh+ lKdw== X-Gm-Message-State: AOJu0Yy+eqbCesCqqA2X58fxpzTYLMb2MmQJPxeK1dZl7v0BPANb7TRp 2usMER7UhWmslH934ioFLvSkjAGq+j2HbOW/4OzlPmE2DmUpCgYiaoiLs3PyQZPyCos= X-Gm-Gg: ATEYQzypsnP4iPfCjpoZh8VeZg+wru0EExoFWRjt0Smr/h8oE0YClVZIzkH3MEKvfD3 TOohBfYqTDOWVGoxNMSvqCxJLYmCrAJKsju7oa3KAzx71I5QqGWo3ZslMD/q5947PFZ9B9ms0GD BzorT+3bAAkVeYH7ITYryNun0vr7OoIWpKTACLeF3lq0CaBpn1fwtOuAFuRVvc8kwhG7fBE308/ E63TvOi8zWiiZjtnXyHyLQ6NtxLrUOHoVI5P++yDOs+eABptijy46TpK4lQQk5Ol13jqkpY9HDj 7CXzlxFo6WSTDXn3jprzRKqT+LPTwBK8x9IdfvbCZQvcBYklYSz6x+Zm9xU+vtdK9SwrfAV31i4 Fa26e89CKc6xMilCoHJuy6XvIp2kvSx0nd+NEGxkD17NOrVtkt38xQ3lKkd/MKUxsPuAfJCgF4r rP87ZajghBip4xsC0gXNOvGB8= X-Received: by 2002:a17:907:1b1f:b0:b8f:c0c1:2504 with SMTP id a640c23a62f3a-b9356ee40b5mr255038766b.4.1772131986184; Thu, 26 Feb 2026 10:53:06 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier Subject: [PATCH v2 3/7] tests/vm: bump OpenBSD to the current 7.8 release Date: Thu, 26 Feb 2026 18:52:58 +0000 Message-ID: <20260226185303.1920021-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.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: 1772132054243158500 Reviewed-by: Pierrick Bouvier Message-ID: <20260213154859.1551283-3-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/openbsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 5222041b855..d1289d78d24 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM): name =3D "openbsd" arch =3D "x86_64" =20 - link =3D "https://cdn.openbsd.org/pub/OpenBSD/7.7/amd64/install77.iso" - csum =3D "da0106e39463f015524dca806f407c37a9bdd17e6dfffe533b06a2dd2edd= 8a27" + link =3D "https://cdn.openbsd.org/pub/OpenBSD/7.8/amd64/install78.iso" + csum =3D "a228d0a1ef558b4d9ec84c698f0d3ffd13cd38c64149487cba0f1ad873be= 07b2" size =3D "20G" pkgs =3D [ # tools --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132076; cv=none; d=zohomail.com; s=zohoarc; b=QihXBqJZHb9mSr9WqjQi2UlFrctOcgviT25YAAzC9A4kzSNR427ek/CE6ktjJwqSZQiNb9RhiIpshmN0v7oxI2TySCZ/zAR723jsTYe7tWTO7V6CHeBkSLYlG+pml6Av5D2ro7LKiTu8Mk9JZgTHiBhxve/Blzx9AaNKRYwQybc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132076; 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=gVtMJo46t96oZ1ya/vn5y1AlDQXHYekuQeJieX1c/BY=; b=QPAXToH8VTISLv5KWoyU89WF/wDlgaZI9lz2M0GSGetVkdtzlKUcNY5EA/VT1Ng+CnrgWfHSl6oGbEov21AKu0xk5C3A2plz/8lvqQh35ChAcpS/5XTIEGPz+0TVgjm/zqMwDnopz8z0mPrTWNYeCpH+iXrW5avCOtXduLIm7r0= 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 1772132076249382.7904596607219; Thu, 26 Feb 2026 10:54:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUk-00006f-0Y; Thu, 26 Feb 2026 13:53:54 -0500 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 1vvgU5-0008Cx-Fc for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:14 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgU1-0003Wr-7s for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:11 -0500 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-65f980cea07so1849816a12.0 for ; Thu, 26 Feb 2026 10:53:08 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b935a597d02sm82378566b.0.2026.02.26.10.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CAA8C5F8D0; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131988; x=1772736788; 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=gVtMJo46t96oZ1ya/vn5y1AlDQXHYekuQeJieX1c/BY=; b=UJLmzAui3/3zs+2OVP94JVaSfdHa0xvcRhbmDg+NgDd13SCAV84Oxb9Uym1FpPXK2p ILstSwjCD9DwxPfVu1ptpMa0euFgeJyX8GoxIdRH+aG7RnDxNZ7OyAf/v8SylVZyQNmG omvt4mTvE/NeQpb9DmWNImQNOYhkseGrFR8lAC7JW7hGb2Z3aFG/4pPVjb//EhDY9i3H BpxeEOKEdO6FMPkYMABOGvkaU/o/OfeaucTOhbtZSsxdqwZddO22cY5jcyyiJcObwgrz nM2hz+K//9DF+bptiSyyBbkgvHhK6nw3y0leri22YEAKkWTTaoL7iuf30f1qPSgPWC+r 2cYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131988; x=1772736788; 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=gVtMJo46t96oZ1ya/vn5y1AlDQXHYekuQeJieX1c/BY=; b=mDK4BssVAcUKRLwyrpBGbh4XzZwJ7oYnt2bT88GvjDKx5yT89Lwgy7sDrBYRbFCisd UXANmMx9350dx4zy0VvVZY3atG1DrpfFawGKN472p0tbfq1A71od6a5nv9Bsi1M1Sa3U 758MhvsviJ9JXFGz4nZz3Vuu0b0fhwfq6lX3hwxSWpIlB3F9NUWHPPyilRM1IsFtygTr XP0b5ofjvGK6SIKOb6rSLxqOVw6qVRtsN3gWdmtp3kXjRftpxVbpj/CEEqABIFLOKiFT qP+nmNpo6Dh8RCzMOiX/FdAMUFYWm/sshfrNxiigxdPhkMmfRbCL0B/EUCIQwiEhh9Ha TRDg== X-Gm-Message-State: AOJu0YzSaSCXDdYVCMJTbuaKA7zBLUOgYZ/zwnA0CSBHsUZRMRWM98V7 dCZ4JlUlbiEMeEt6dV4C3qbMYr3UU4XVeaFMreZR0TjYx1/dqW+fVwNFqHKMMSt3zlw= X-Gm-Gg: ATEYQzytepFOGbp+zvTgi/jf27dOgL70rfDqTFktcgyTcOewmfqTiuyvoE6EyPLfYlT s1qZm366hZR/2w1Pxq8sOlHGsPJGJBfBPulNdPyYJJ20J/rpOiW6w2VS3qOD9kIiKbXakQn4NNc w4Ps/HuLp42vRuXrwVpQEZhwWo2hUVqsaZVMG8zNt8E1oOIao1yY3yP9C+7cjV9XW+5vp9KIQ+h oeLpOMNvY1ZEcdI8hqwGBv2o5EF/2B9hMAockDDks0GOitN6PL1di+LwzNGXVANc5ss30xJCZPG Oh7ebw+JyYB1yn6TqA38iuOP7gWY9T6pd0dELQF06IuqkIduldAzmxQs3U+mzc+VfcJFLR/Is/F Sk8lg2HVvd3c1o/mKUSEWS2FtCfbVeon79kQ76L5o/eI/HMeJbc3KWVAGdh5kZtusBCM9IlgZbW 4SGQ+vxH79GAxR9w16qARS/As= X-Received: by 2002:a17:907:86ab:b0:b88:5e4c:f842 with SMTP id a640c23a62f3a-b935b931214mr231810566b.47.1772131987515; Thu, 26 Feb 2026 10:53:07 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier Subject: [PATCH v2 4/7] tests/vm: remove unused import Date: Thu, 26 Feb 2026 18:52:59 +0000 Message-ID: <20260226185303.1920021-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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: 1772132078034158500 Reviewed-by: Pierrick Bouvier Message-ID: <20260213154859.1551283-4-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/openbsd | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index d1289d78d24..9aabfeec963 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -14,7 +14,6 @@ =20 import os import sys -import socket import subprocess import basevm =20 --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132070; cv=none; d=zohomail.com; s=zohoarc; b=P9cZw5rwov3G27aZzy00EwYrQT+Khdb5GBBodkUK6bK2H63bdbYmFVV49tYTQ/ygivKA0Wn/elOmfBGSBL3+pejEGbPfl4FoheNS5F9mTh58grop20Pp8VnrftYhIEHN6qRbRcKEQn7T2nujxF+m999DQ52u0lHFs3gPovz9z9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132070; 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=Oi5+N/x5xAvSZ7dTjPMAxsIhN66/aeUbNGSs4qe4/hc=; b=fQ9GLCGzULcWAUbMYTcVdOEavd6zsATDTXLZUnNqUY/ukLDIVClHUbK3uObmoDv+Ol6i2h83Il1sN6LMz8xDzbI+qL8C4MlPE2pAugzA4IB5dMMEQ1hQy91DBzrecJgtzZ2BKDbG6pRQYAcAT2/Z+e20dITcyiPHRLUdcPoIULs= 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 177213207051988.38432985361908; Thu, 26 Feb 2026 10:54:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUa-0008Ru-EG; Thu, 26 Feb 2026 13:53:46 -0500 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 1vvgU5-0008Cr-Cd for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:14 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgU2-0003XK-Bm for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:12 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-65a43a512b0so1528965a12.3 for ; Thu, 26 Feb 2026 10:53:09 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65fac07c09fsm718547a12.32.2026.02.26.10.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DFF1F5F8D3; Thu, 26 Feb 2026 18:53:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131989; x=1772736789; 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=Oi5+N/x5xAvSZ7dTjPMAxsIhN66/aeUbNGSs4qe4/hc=; b=O3XqqpUN+dOjwCvwqQALRIEoQhVi4hkAEBLWEgDL6oBbLGQByAyvc6JyNhjgFUG5NO AKNNRH/jm+ju5GSdammqFji9B1OAynd878C2uNIaJnw2W1z0N0uZuTvymDPlJOr1TKA9 LmTCitNJgXIrgA8i5iz6PNoVyFiWH3hnygx82sb70H8NR03FAA4d8GPL0oJpuML6PP/q hscwJHPE5R22Dr9d1mDNBYnjxtwgdgYIPAWKlubcKVAHBSL/05O0YqRtHny5RrEmWmJa MObf2DfLZEkxtqqPyoqdzaJuD3aINK7b1BIiPUjxeYujqSl+PNRo7dpaa8XAmEWTlvXG OEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131989; x=1772736789; 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=Oi5+N/x5xAvSZ7dTjPMAxsIhN66/aeUbNGSs4qe4/hc=; b=vMLs7iM3ecCdTlW4HUY3Uqz03Xlcx6GX850re1/pEccTsgRziLws9Uf/lOfKE3jNAJ nZtxKbgPQOTAOGYoRZyTwkra+x3jVFV8r30QPgdJ8Tcgk59msClwFPTd8lJTLsoBa2XY c11UnY3tiRZBoTrP2KaiSYM7OOeXo2yWONBfpNY0oJWyResdQvX46tfV4h0x+Byd4lf0 t5Khw66VgJpoLJ/PuCdTIVWA4x/8/aTxBP1xkSq1ZftXP7aeCPO6oNjFnBuM7xoHV5Pb zCwGgEayYuZPFz62hhtK/EW6gbf/eGBc+8SUn1wPvGYqQp44V//V4OPHwmCUlLe38K1D 1QHQ== X-Gm-Message-State: AOJu0YxRkvfZqxidPIAAtfqziT/n3v++4Z1K1REh8MZO/ZKjfixeykrF KtOjt3hw1F6NnQd62vaC0sfMi+tPdQ0m+McmO/ALWKcjudvE3hnOpnqoqPiSU8xI6xQ= X-Gm-Gg: ATEYQzyl05vK856bs+OSk1Ln/T+ObG5h7n14MmfWN8DlWa9O7Ul1k221xaXyRTov7QX 18hubw/hnKGBSW5DzpHoLj8Vj2aJmzozVwGQzqqtzDyMq/co6/vCwV7tsgf29jA7uxYIAThuQru yq0SVcXFM+IlShMIv+ltbKikPywOoOnbw5ljPVyDDLJIomQrb5lr6sRrcLueoLFAUoGe/gKOu2L E83PuxJjPkINQX+BiEt1uT945GDwFuVsfFbyEoSSTuD+gmh0ngfB8oKwHPLKlFHisDcPdi0SBT/ lUXpLY/cTKPleCWAh/Z2tx392PwFL6/l1mVfZv4fQc7K3qZ9j/GnBGAlij+qc1z7ZtFzeODzAPE +arCW+RcGGaI+TJtkxLaQkKT9+N2q3LvJdFPXCyzQ8PurKE2C3EIsuXEt4tTz7Pm2UFoz9ZKRva 18bRl63wvODVdsgODXQNH4a2o= X-Received: by 2002:a05:6402:42c4:b0:65c:2170:67d2 with SMTP id 4fb4d7f45d1cf-65fddcebdcamr232929a12.16.1772131988829; Thu, 26 Feb 2026 10:53:08 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier Subject: [PATCH v2 5/7] tests/vm: fix interactive boot Date: Thu, 26 Feb 2026 18:53:00 +0000 Message-ID: <20260226185303.1920021-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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: 1772132071941158500 For reasons still not clear to me passing the single dashed -interactive would confuse the argument parsing enough we tried to pass "nterative" as a string to the launch command causing failure and head scratching. Reviewed-by: Pierrick Bouvier Message-ID: <20260213154859.1551283-5-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 8a5aaedce7a..0a53dc9fdd6 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -154,6 +154,6 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(VM_VENV) $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ $(if $(LOG_CONSOLE),--log-console) \ --image "$<" \ - $(if $(ROOT_USER),--interactive-root,-interactive) \ + $(if $(ROOT_USER),--interactive-root,--interactive) \ false, \ " VM-BOOT-SSH $*") || true --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132094; cv=none; d=zohomail.com; s=zohoarc; b=DPfXoGb8+kpKNcP09Cf7V9w71cd7xLKbAEcfngtxtLrFtt4IAnAwKFQ6ZfjhkRZfdSfna1EWaNugzr0e6Y6hf7y4y602rgn4QbIpv2MQdV+SlJoBfkl81IwEQdzVcNPOB2+lgTOsXOxxaiSACmhdztd6Ip9G4IKMmx2YPKduwIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132094; 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=yboa4Ib5iNaVNTq21S5NaeZDhTNkVA/TIAAajIB1sXY=; b=eeJ7Z9YAsFK248iI9/MzVLap20yLb/JxPsW7dRM3PIum8xbIA5bqYbXL94FXzETuKoyvFs+JiDsOyaWjKbeYVgKIqqR+Y737pTENe9OqUvRn30LtGegK18oLmwouLyJV44+FY3IMQAKeZSI/2n75GVbQnfmvU5cuxvTjmSFYRwk= 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 1772132094574869.4000661920031; Thu, 26 Feb 2026 10:54:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUO-0008H9-8A; Thu, 26 Feb 2026 13:53:32 -0500 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 1vvgU9-0008EN-0a for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:20 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgU5-0003Xo-3d for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:16 -0500 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-b8d7f22d405so185637966b.0 for ; Thu, 26 Feb 2026 10:53:11 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65fabf6d26dsm739784a12.16.2026.02.26.10.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 050265F8D5; Thu, 26 Feb 2026 18:53:04 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131990; x=1772736790; 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=yboa4Ib5iNaVNTq21S5NaeZDhTNkVA/TIAAajIB1sXY=; b=kx+6xSlmw7fRFboHpfiJbJq9RZ1XOf48X+XXr1s2Q/aPUcVY7CdHiWoP6mNd16+x+W a8XHj2BoN54KhRNNaPG3jb125Bm5/3zbgYXq1ObPTYJT3saO4kTuZ6s+uzSTFACrAIBC rb0jghTyB+QfAoZTLLI67kqjP/dZn/PEzKXhVdJGkxNhuyrPL3WhJKfbXUjU0j/hQp7q OP8C6i5IddDSm/31wAsWhzrGIUJ5vffHJK//MSoe32ta2GUQZ1hkDtOiLQgr6185/vA6 Vy/ury0xtc/313/CDLlECrBdeWuTDInq/EI3yvU5DAJgxLEXcChlLx5UrkGdJWle4/Jj 8N4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131990; x=1772736790; 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=yboa4Ib5iNaVNTq21S5NaeZDhTNkVA/TIAAajIB1sXY=; b=b4TlLyBOzeAY23A4Z38ztR5aRO6NR6Gl66K2/C3XEl9weLcn31HKbki4YCqZIhGlYV XAV2hU0DhQrsdTlFDJu0gIz+saOUU7lVgtngqY+QIuHFfka95kVDTaAuaOul8fpdyQRN 8nDbnVha5f1Zw93u/DF4XeH84sDWTccSc4KEfy6rMTatEWGvZw+F76lv01LYnJGeiY8b 1iDj8v8sKgYfXOkISHDQh12Xb6mEFXVc3M/nz5IVxpnOdWsyhYvnSd/qJFWg/L30eKMO bloYvvKHdYzZIPU1QOUpwpVtDpFM75gU+mYINEVYu5D8JfJ49P6VsV7ipuhuI0IrMuV9 nAVA== X-Gm-Message-State: AOJu0Yzx3yo5mc+5qpOjgtnsAVkSKdGzgCLBr0CUVsuuBgmxS3RrrlBn 8cxKIi5R9cn/oeNl8Oi8XFe7MGVqQQfhQdzAW8laF+9KTN1HUY4rzrrRcuG9PBmSpm0= X-Gm-Gg: ATEYQzwQ9PpZJXGurBj5HRACT4S2X4rocOTgkM1erHy/98OpHGvGjSi/4ZkFGi+oz8o sJLPn1SdwVRcDVRVxV5jgamPGgLcC+2uBDa0iJ5lcC7HcjPbzsuD0tMeavIroJ+/ouz7fWw3AAn +qSDFCrC4VR3hBsq5563UsurDQiSMJE26t67m2ro6g9e2jghGHyiefis3ia9+jBB2vWZ5KNw7bS ociUVG1r2tybODim3RMU7DfzMLjEfngZd5wTX+lcWBFsEvME54Phtgw0CZC9n7DUM+zc7yBFZCm FPuL2eEadZae5RV+N9G9S5U95Wuh/+m4TDlVfMxFkKfCNe7eb7RIHv7Sewsb5EoV3JAp6uze0Cw VfGViiV2TYo9YYHCgUoJIOldQyihVapfqsLNp1813W37g1TZML1y4CGB4uWc4lA7UJKhnFgsg3i PptxWF4Tpl7jvWuQhs2wTnZCQ= X-Received: by 2002:a17:907:da17:b0:b87:6b9c:6386 with SMTP id a640c23a62f3a-b935bb25ae5mr260933866b.56.1772131989452; Thu, 26 Feb 2026 10:53:09 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier Subject: [PATCH v2 6/7] tests/vm: build openbsd from lcitool data (!567) Date: Thu, 26 Feb 2026 18:53:01 +0000 Message-ID: <20260226185303.1920021-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.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: 1772132096034158501 For now only use the minimal decadency set until all the OpenBSD mappings can be divined. Currently depends on: https://gitlab.com/libvirt/libvirt-ci/-/merge_request= s/567 Reviewed-by: Pierrick Bouvier Message-ID: <20260213154859.1551283-6-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- tests/lcitool/refresh | 5 ++-- tests/vm/generated/openbsd.json | 27 +++++++++++++++++++++ tests/vm/openbsd | 42 ++------------------------------- 3 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 tests/vm/generated/openbsd.json diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c74345e03d0..3e4b026035b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -87,9 +87,9 @@ def generate_cirrus(target, trailer=3DNone): generate(filename, cmd, trailer) =20 =20 -def generate_pkglist(vm, target): +def generate_pkglist(vm, target, project=3D"qemu"): filename =3D Path(src_dir, "tests", "vm", "generated", vm + ".json") - cmd =3D lcitool_cmd + ["variables", "--format", "json", target, "qemu"] + cmd =3D lcitool_cmd + ["variables", "--format", "json", target, projec= t] generate(filename, cmd, None) =20 =20 @@ -316,6 +316,7 @@ try: # VM packages lists # generate_pkglist("freebsd", "freebsd-14") + generate_pkglist("openbsd", "openbsd-78", project=3D"qemu-minimal") =20 # # Ansible package lists diff --git a/tests/vm/generated/openbsd.json b/tests/vm/generated/openbsd.j= son new file mode 100644 index 00000000000..0886afd0d3d --- /dev/null +++ b/tests/vm/generated/openbsd.json @@ -0,0 +1,27 @@ +{ + "ccache": "/usr/local/bin/ccache", + "cpan_pkgs": [], + "cross_pkgs": [], + "make": "/usr/local/bin/gmake", + "ninja": "/usr/local/bin/ninja", + "packaging_command": "pkg_add", + "pip3": "/usr/local/bin/pip3", + "pkgs": [ + "bash", + "bison", + "bzip2", + "ccache", + "dtc", + "git", + "glib2", + "gmake", + "gsed", + "libffi", + "meson", + "ninja", + "pkgconf", + "python3" + ], + "pypi_pkgs": [], + "python": "/usr/local/bin/python3" +} diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 9aabfeec963..4f8eeb28e24 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -24,45 +24,6 @@ class OpenBSDVM(basevm.BaseVM): link =3D "https://cdn.openbsd.org/pub/OpenBSD/7.8/amd64/install78.iso" csum =3D "a228d0a1ef558b4d9ec84c698f0d3ffd13cd38c64149487cba0f1ad873be= 07b2" size =3D "20G" - pkgs =3D [ - # tools - "dtc", - "git", - "pkgconf", - "bzip2", "xz", - "ninja", - - # gnu tools - "bash", - "gmake", - "gsed", - "gettext-tools", - - # libs: usb - "libusb1--", - - # libs: crypto - "gnutls", - - # libs: images - "jpeg", - "png", - - # libs: ui - "capstone", - "sdl2", - "gtk+3", - "libxkbcommon", - - # libs: migration - "zstd", - - # libs: networking - "libslirp", - - # Python stuff - "py3-setuptools", - ] =20 BUILD_SCRIPT =3D """ set -e; @@ -198,8 +159,9 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait("login:") self.wait_ssh() =20 + pkgs =3D self.get_qemu_packages_from_lcitool_json() self.print_step("Installing packages") - self.ssh_root_check("pkg_add %s\n" % " ".join(self.pkgs)) + self.ssh_root_check("pkg_add %s\n" % " ".join(pkgs)) =20 # shutdown self.ssh_root(self.poweroff) --=20 2.47.3 From nobody Mon Mar 2 08:46:52 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=1772132100; cv=none; d=zohomail.com; s=zohoarc; b=SozmurJyknT2YMmSjQOoyDzP7FAyuNyl4yYPzH1UQv1Z9p10zTIsfbAswJhNhExZ4xUhM60zpdtPJeawEVi6zgi2I7LVCpNacZitaBO5ymlvjgLXqIPH4cE7WZmJd7CtsSN6k+RUlWw3VD1N3Gdeatwh4vp5/sLNAQboXScCck8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772132100; 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=ndupL3oUN02SVuVkMK/kSxRCtIhg07JpVkz01Y9bmaU=; b=P420unM9IW9MxuiT6PzyXX3SYuAYCAbPCd4yDMZK0daMfPQrnTH91gcS4Lau9hq+5sjj9f1gamAZ0QUreVxLGX3ql2ySs0vXi+tVuFAetetP9UXItvJHDuZXQ5G4vq/xQUoZ5VSc40/CR0aioEPTNoeKVJRT2Dks/wHdgOn9/PQ= 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 1772132100720988.5767371494364; Thu, 26 Feb 2026 10:55:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvgUk-00009y-Uw; Thu, 26 Feb 2026 13:53:54 -0500 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 1vvgUC-0008En-WE for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:22 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvgU5-0003Xx-4G for qemu-devel@nongnu.org; Thu, 26 Feb 2026 13:53:18 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-65f9a875eabso2392555a12.0 for ; Thu, 26 Feb 2026 10:53:11 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65fac06dc16sm713945a12.23.2026.02.26.10.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 10:53:07 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1BB3C5F8D7; Thu, 26 Feb 2026 18:53:04 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772131990; x=1772736790; 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=ndupL3oUN02SVuVkMK/kSxRCtIhg07JpVkz01Y9bmaU=; b=XGvDE4fH5q4C1zk4LGWdI4yrG+dFACKYIx0510HaTu1PrHimp0DaUx4kInMrTW+pBS s8PZwNAN+StD8lQTHlsm5AddRdJno4O+4Gg6IuFLMnQ2IbRzLCAP9AqiY6gizLcgXzaK OAUeziAnfzypGz4vSDuF4JOlfgEAabA7DTOiy/O2nRBARB7/vPOzqbYWsiFdxY4GNMEb WfBR7FdsiTrc46JLAB/9DyYpRzmwW/0UHzYk4HebfUpW7+e5moH/v53GKGuBHuU46FMJ PBPK2X9s99rjdXAa1UzTLgAsLJ+jJ3ygnoRjPF2SXfsyOjP6FpDZ0jgGZRwYZA9+kkOj gzYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772131990; x=1772736790; 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=ndupL3oUN02SVuVkMK/kSxRCtIhg07JpVkz01Y9bmaU=; b=YuQsFnvhYxDDdx8PPbSYJbrNiY8zQn9ek5i6ylkE0S/Q9l2SCWPezBOuI7wN4PwfsE OHzDOhQSyq1bobXF9hkN2Oe+l1dWA4Iwg5KNjFr5k/VFk3006r2yJrKkxYWYjkescfRj TS0h5ubP1xB84DL7YnTAa5yRAeCv9/SHIySR9e4XhnDum8zwWYyEZ39XM8m4+YirmsV4 DfwMQ/LvX7AJfF3sOiKxbLKJnNF+wuzq34nM/lcEVzg+JBPjRoh1+BYbWK70tBQGdCGg YTVwb449ER0kJm7RyHgOKTylXSDbeQU7IJ6vbpyWoBUAWYUZ22y+ZQdreZfky2fNQXxW KwqQ== X-Gm-Message-State: AOJu0YyS3WnY3/jMgStuiq9IkRVadRZWs3SJ4NdtHSo38Z/fJULrzV5P ZshsBPIXGP3Sr40dxUe8GX+sELFbx4WjOHfQtGTziAPenvxHoKDzMLlz+luVk998IUw= X-Gm-Gg: ATEYQzyW+HS3J37GL0QqCluipi6GLyAT1/55IPGCX/L1iF/u6qudeNE+XMNakgaAGcS sFYE40laDQj6m7cXGsBBO3PUMhhK/OfiqUzU0SN/MhxCZtLzUZAYRZjvvESIFw6kHfktnlMv/G6 MezjZD+SxRONMjk+3k5ohuNPqX8fBjc+OBkVoPxgx5ZhIgIfi/pszk57D2uTPKIFNDd5T7Ot2VU kWK25S010Bp/zC5pMqcMBQJVJ4XY/opPdv9ppb9HJQ7V25kkfC2urNRP9HSyNC+FFrVK8H7sOgx kIKRaGZnkVJvb7Klp9iiMl50gHHNIuucXeeuufaKLnnYjIxoegrCAn1POp28aXTk0S0w/e0PsYU CB/Py7n7R4fQ4f8+NUHMs5i3OWh2X1/uQIEcrYwcpcXFIwF4TW5MCPlprIZFmeEU/CZisJPIkEz ihCxKgmnUf6+VVqfpsyp6afF258ox0q5mHYQ== X-Received: by 2002:a05:6402:26c9:b0:65f:a9e1:4a4e with SMTP id 4fb4d7f45d1cf-65fdd6c02a8mr217403a12.4.1772131990286; Thu, 26 Feb 2026 10:53:10 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Paolo Bonzini , qemu-arm@nongnu.org, Thomas Huth , Kyle Evans , Brad Smith , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Warner Losh Subject: [PATCH v2 7/7] tests/functional: add Arm VBSA uefi conformance test Date: Thu, 26 Feb 2026 18:53:02 +0000 Message-ID: <20260226185303.1920021-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226185303.1920021-1-alex.bennee@linaro.org> References: <20260226185303.1920021-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::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.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: 1772132102003158500 The VBSA test is a subset of the wider Arm architecture compliance suites (ACS) which validate machines meet particular minimum set of requirements. The VBSA is for virtual machines so it makes sense we should check the -M virt machine is compliant. Fortunately there are prebuilt binaries published via github so all we need to do is build an EFI partition and place things in the right place. There are some additional Linux based tests which are left for later. Message-ID: <20260213154859.1551283-7-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- v2 - use the VBSA prebuilt shell - fail the test if we see FAILED in the console stream --- tests/functional/aarch64/meson.build | 1 + tests/functional/aarch64/test_virt_vbsa.py | 99 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100755 tests/functional/aarch64/test_virt_vbsa.py diff --git a/tests/functional/aarch64/meson.build b/tests/functional/aarch6= 4/meson.build index 49eca120589..7ea8c22b048 100644 --- a/tests/functional/aarch64/meson.build +++ b/tests/functional/aarch64/meson.build @@ -46,6 +46,7 @@ tests_aarch64_system_thorough =3D [ 'tuxrun', 'virt', 'virt_gpu', + 'virt_vbsa', 'xen', 'xlnx_versal', ] diff --git a/tests/functional/aarch64/test_virt_vbsa.py b/tests/functional/= aarch64/test_virt_vbsa.py new file mode 100755 index 00000000000..3da06904ea9 --- /dev/null +++ b/tests/functional/aarch64/test_virt_vbsa.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 +# +# Functional test that runs the Arm VBSA conformance tests. +# +# Copyright (c) 2026 Linaro Ltd. +# +# Author: +# Alex Benn=C3=A9e +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import shutil +from subprocess import check_call, DEVNULL + +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern, get_qemu_img, skipIfMissin= gCommands +from qemu_test import exec_command_and_wait_for_pattern as ec_and_wait + + +@skipIfMissingCommands("mformat", "mcopy", "mmd") +class Aarch64VirtMachine(QemuSystemTest): + KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' + timeout =3D 360 + + def wait_for_console_pattern(self, success_message, vm=3DNone): + wait_for_console_pattern(self, success_message, + failure_message=3D'FAILED', + vm=3Dvm) + + 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.e= fi', + '80f37d2fb86d152d95dec4d05ff099c9e47ee8a8931426= 8e08056b0e1359e1fa') + + ASSET_BSA_SHELL =3D Asset('https://github.com/ARM-software/sysarch-acs= /raw/refs/heads/main' + '/prebuilt_images/VBSA/v25.12_VBSA_0.7.0/Shell= .efi', + 'e526604f0d329b481c6a1f62f7a0db8ea24ce8178b2c6= abda8e247425f38775c') + + def test_aarch64_vbsa_uefi_tests(self): + """ + Launch the UEFI based VBSA test from an EFI file-system + """ + + self.vm.set_console() + + # virt machine wi + self.set_machine('virt') + self.vm.add_args('-M', 'virt,gic-version=3Dmax,virtualization=3Don= ') + self.vm.add_args('-cpu', 'max','-m', '1024') + + # 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=3Do= n,file=3D{code_path}') + self.vm.add_args('-drive', f'if=3Dpflash,format=3Draw,file=3D{vars= _path}') + + # Build an EFI FAT32 file-system for the UEFI tests + vbsa_efi =3D self.ASSET_VBSA_EFI.fetch() + bsa_shell =3D self.ASSET_BSA_SHELL.fetch() + + img_path =3D self.scratch_file('vbsa.img') + qemu_img =3D get_qemu_img(self) + check_call([qemu_img, 'create', '-f', 'raw', img_path, '64M'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + check_call(['mformat', '-i', img_path, '-v', 'VBSA', '::'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + check_call(['mmd', '-i', img_path, '::/EFI'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + check_call(['mmd', '-i', img_path, '::/EFI/BOOT'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + check_call(['mcopy', '-i', img_path, bsa_shell, '::/EFI/BOOT/BOOTA= A64.EFI'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + check_call(['mcopy', '-i', img_path, vbsa_efi, '::/Vbsa.efi'], + stdout=3DDEVNULL, stderr=3DDEVNULL) + + self.vm.add_args('-drive', f'file=3D{img_path},format=3Draw,if=3Dn= one,id=3Ddrive0') + self.vm.add_args('-device', 'virtio-blk-pci,drive=3Ddrive0') + + self.vm.launch() + + # wait for EFI prompt + self.wait_for_console_pattern('Shell>') + + # Start the VBSA tests + ec_and_wait(self, "FS0:Vbsa.efi", 'VBSA Architecture Compliance Su= ite') + + # could we parse the summary somehow? + + self.wait_for_console_pattern('VBSA tests complete. Reset the syst= em.') + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.47.3