From nobody Wed Nov 27 04:58:53 2024 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=1700493070; cv=none; d=zohomail.com; s=zohoarc; b=h7t03xhpPNWvKg4sWn8D1wTzOXU9R0alTQTtcitFvzJ6fHjhP3d+F8ivWkkQ8JQ3FuGUoDCeRO1DQAuaRpkSYN4l9FGi8A+3k3NR5NWl4arjb8bc4wZufIgAawvfIRpIpYQlrrhtVAn9fXtQSb0ge8izuFYJK9YylPEgIkDpxdU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493070; 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=oRRKGm1XmPAhrBUDZ4d8uM66KnS7l3S7TsBcy2mkL7c=; b=V0oiHnL/h98lyRqULr1o0HEnXiH/pWl8yC2ANZbLBgFo2kzZCE2TajPZQdbiJ+XKVkfcJgV2L29/COdkyFN2svlNnYOvNjH7tLzjFu8ntgu8qJEI298IxtA45f7eDD+xLu2qQrOXEXp7Dnj74x2p3qOn6yzaB/XCJS30y7FkEHQ= 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 170049307040319.0435362300492; Mon, 20 Nov 2023 07:11:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55ta-00069O-FE; Mon, 20 Nov 2023 10:09:06 -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 1r55tI-0005pk-MU for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:55 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tA-0001CU-14 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:48 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-332ca7f95e1so441740f8f.0 for ; Mon, 20 Nov 2023 07:08:39 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t11-20020a05600001cb00b0032de6f95fb3sm11504612wrx.40.2023.11.20.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 171B06572D; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492918; x=1701097718; 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=oRRKGm1XmPAhrBUDZ4d8uM66KnS7l3S7TsBcy2mkL7c=; b=k/FoPZcptUB8N/RrosJh6acVG2UVdS2z9CfrU25+Guo3jdbCmKAiR2jby0JgOrstES JLIB2mjGLNgFDxiFMkJaYrPD99stQygaal3q4mvEYprTt4QcvwhNoUIa5yWCVtSIhXLz d9r2X6LhUzfbxl+HaUW+zT4H2PPMgGGHv3xA4aYuGpka95/fbPosIzNjGkhm5JomV3zq /JUDL0CKF7QhLeZDDNeK7eP4GUFOpkRIPEW+yS6vMJArs1u23+mU0iswY3Y/FHT3U0A7 JEdMddQLqvbDA899B7BMujvN0Gm/ePXDyTbcHIT6TTX03/YUAp3zjGjkLoNk67wetpTx Q/1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492918; x=1701097718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oRRKGm1XmPAhrBUDZ4d8uM66KnS7l3S7TsBcy2mkL7c=; b=KVFYtfGDKNCbx7OktSHDNm88n0U93SGQWKmtUeMuhSshq9DDbo/yt46mtejoqObxia 8zSiuZ/1+H5QL8lrcax4pTqki1bFdhuKAKM+L7toeL6CjY2hjvqiKEuvQYLCQ2gH3yaJ MQnV0kSdAkz0gscWwfqKfOmkRIl/wePrTnfOYfRcIL7KOO99E3sJw408rQuKg8Fp/6cO +eeL0ZT8TsatccPjaa0dQUXUQoiMvWUhHya96tpzYav9jqwLQS6IoHamuuRI32rJ06zW DtolJ56fKC6/4ul37SIGr9v0u4YJ4osLCAa3+n5tx7sz0JmbMwvrRPEoZEhp2ROasvoZ kYeg== X-Gm-Message-State: AOJu0YzHgBrxKXHXoYybT/4eNQ7469z7mPoC0RbucNBnpbxKVYU4wCZ8 t0sfTWdfvqE8YF7Bv5MU98dOMA== X-Google-Smtp-Source: AGHT+IE9rY4AFhyb5YqmV2EIggccNx4h58Rf8INygYUDQBBOh3BvKDrrHQWPA6HRLgKXP0v+y6v/FA== X-Received: by 2002:a5d:47a1:0:b0:332:c514:640e with SMTP id 1-20020a5d47a1000000b00332c514640emr3230317wrb.69.1700492917789; Mon, 20 Nov 2023 07:08:37 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 01/14] tests/docker: replace fedora-i386 with debian-i686 Date: Mon, 20 Nov 2023 15:08:20 +0000 Message-Id: <20231120150833.2552739-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493071661100005 From: Daniel P. Berrang=C3=A9 Fedora is gradually killing off i386 packages in its repos, via a death-by-1000-cuts process. Thus Debian looks like a better long term bet for i686 build testing. It has the added advantage that we can generate it via lcitool too. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20231107164109.1449014-1-berrange@redhat.com> [AJB: tweak commit msg, set correct prefix] Signed-off-by: Alex Benn=C3=A9e --- v2 - also set correct prefix --- configure | 4 +- .gitlab-ci.d/container-cross.yml | 11 +- .gitlab-ci.d/crossbuilds.yml | 12 +- .../dockerfiles/debian-i686-cross.docker | 182 ++++++++++++++++++ .../dockerfiles/fedora-i386-cross.docker | 40 ---- tests/lcitool/refresh | 7 + 6 files changed, 203 insertions(+), 53 deletions(-) create mode 100644 tests/docker/dockerfiles/debian-i686-cross.docker delete mode 100644 tests/docker/dockerfiles/fedora-i386-cross.docker diff --git a/configure b/configure index abcb199aa8..9ea0bf5698 100755 --- a/configure +++ b/configure @@ -1307,8 +1307,8 @@ probe_target_compiler() { container_cross_cc=3D${container_cross_prefix}gcc ;; i386) - container_image=3Dfedora-i386-cross - container_cross_prefix=3D + container_image=3Ddebian-i686-cross + container_cross_prefix=3Di686-linux-gnu- ;; loongarch64) container_image=3Ddebian-loongarch-cross diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 463ac493ad..8d235cbea0 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -46,6 +46,12 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-cross =20 +i686-debian-cross-container: + extends: .container_job_template + stage: containers + variables: + NAME: debian-i686-cross + mips64el-debian-cross-container: extends: .container_job_template stage: containers @@ -95,11 +101,6 @@ cris-fedora-cross-container: variables: NAME: fedora-cris-cross =20 -i386-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-i386-cross - win32-fedora-cross-container: extends: .container_job_template variables: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index ac71a2abd3..c2af6c7f44 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -37,25 +37,25 @@ cross-arm64-kvm-only: IMAGE: debian-arm64-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features =20 -cross-i386-user: +cross-i686-user: extends: - .cross_user_build_job - .cross_test_artifacts needs: - job: i386-fedora-cross-container + job: i686-debian-cross-container variables: - IMAGE: fedora-i386-cross + IMAGE: debian-i686-cross MAKE_CHECK_ARGS: check =20 -cross-i386-tci: +cross-i686-tci: extends: - .cross_accel_build_job - .cross_test_artifacts timeout: 60m needs: - job: i386-fedora-cross-container + job: i686-debian-cross-container variables: - IMAGE: fedora-i386-cross + IMAGE: debian-i686-cross ACCEL: tcg-interpreter EXTRA_CONFIGURE_OPTS: --target-list=3Di386-softmmu,i386-linux-user,aar= ch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins MAKE_CHECK_ARGS: check check-tcg diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker new file mode 100644 index 0000000000..3fc4e15acd --- /dev/null +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -0,0 +1,182 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all --cross-arch i686 debian-11 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcc \ + gcovr \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libsndio-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + mtools \ + ncat \ + ninja-build \ + openssh-client \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-setuptools \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-wheel \ + python3-yaml \ + rpm2cpio \ + sed \ + socat \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + xorriso \ + zstd && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales + +RUN /usr/bin/pip3 install tomli + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + dpkg --add-architecture i386 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-i686-linux-gnu \ + gcc-i686-linux-gnu \ + libaio-dev:i386 \ + libasan6:i386 \ + libasound2-dev:i386 \ + libattr1-dev:i386 \ + libbpf-dev:i386 \ + libbrlapi-dev:i386 \ + libbz2-dev:i386 \ + libc6-dev:i386 \ + libcacard-dev:i386 \ + libcap-ng-dev:i386 \ + libcapstone-dev:i386 \ + libcmocka-dev:i386 \ + libcurl4-gnutls-dev:i386 \ + libdaxctl-dev:i386 \ + libdrm-dev:i386 \ + libepoxy-dev:i386 \ + libfdt-dev:i386 \ + libffi-dev:i386 \ + libfuse3-dev:i386 \ + libgbm-dev:i386 \ + libgcrypt20-dev:i386 \ + libglib2.0-dev:i386 \ + libglusterfs-dev:i386 \ + libgnutls28-dev:i386 \ + libgtk-3-dev:i386 \ + libibumad-dev:i386 \ + libibverbs-dev:i386 \ + libiscsi-dev:i386 \ + libjemalloc-dev:i386 \ + libjpeg62-turbo-dev:i386 \ + libjson-c-dev:i386 \ + liblttng-ust-dev:i386 \ + liblzo2-dev:i386 \ + libncursesw5-dev:i386 \ + libnfs-dev:i386 \ + libnuma-dev:i386 \ + libpam0g-dev:i386 \ + libpipewire-0.3-dev:i386 \ + libpixman-1-dev:i386 \ + libpng-dev:i386 \ + libpulse-dev:i386 \ + librbd-dev:i386 \ + librdmacm-dev:i386 \ + libsasl2-dev:i386 \ + libsdl2-dev:i386 \ + libsdl2-image-dev:i386 \ + libseccomp-dev:i386 \ + libselinux1-dev:i386 \ + libslirp-dev:i386 \ + libsnappy-dev:i386 \ + libspice-server-dev:i386 \ + libssh-gcrypt-dev:i386 \ + libsystemd-dev:i386 \ + libtasn1-6-dev:i386 \ + libubsan1:i386 \ + libudev-dev:i386 \ + liburing-dev:i386 \ + libusb-1.0-0-dev:i386 \ + libusbredirhost-dev:i386 \ + libvdeplug-dev:i386 \ + libvirglrenderer-dev:i386 \ + libvte-2.91-dev:i386 \ + libzstd-dev:i386 \ + nettle-dev:i386 \ + systemtap-sdt-dev:i386 \ + xfslibs-dev:i386 \ + zlib1g-dev:i386 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c =3D '/usr/bin/i686-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/i686-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/i686-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/i686-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'x86'\n\ +cpu =3D 'i686'\n\ +endian =3D 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ = && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc &= & \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ = && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + +ENV ABI "i686-linux-gnu" +ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-linux-gnu- +ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-lin= ux-user +# 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/docker/dockerfiles/fedora-i386-cross.docker b/tests/dock= er/dockerfiles/fedora-i386-cross.docker deleted file mode 100644 index b59a9115c4..0000000000 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ /dev/null @@ -1,40 +0,0 @@ -FROM registry.fedoraproject.org/fedora:34 - -ENV PACKAGES \ - bison \ - bzip2 \ - ccache \ - diffutils \ - flex \ - findutils \ - gcc \ - git \ - libfdt-devel.i686 \ - libffi-devel.i686 \ - libselinux-devel.i686 \ - libtasn1-devel.i686 \ - libzstd-devel.i686 \ - make \ - meson \ - ninja-build \ - glib2-devel.i686 \ - glibc-devel.i686 \ - glibc-static.i686 \ - gnutls-devel.i686 \ - nettle-devel.i686 \ - pcre-devel.i686 \ - pixman-devel.i686 \ - python3-tomli \ - sysprof-capture-devel.i686 \ - zlib-devel.i686 - -ENV QEMU_CONFIGURE_OPTS --cpu=3Di386 --disable-vhost-user -ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig - -RUN dnf update -y && dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt -# 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 92e7d30982..10c54a377c 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -156,6 +156,13 @@ try: trailer=3Dcross_build("arm-linux-gnueabihf-", "arm-softmmu,arm-linux-user")) =20 + generate_dockerfile("debian-i686-cross", "debian-11", + cross=3D"i686", + trailer=3Dcross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user"= )) + generate_dockerfile("debian-mips64el-cross", "debian-11", cross=3D"mips64el", trailer=3Dcross_build("mips64el-linux-gnuabi64-", --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1700493060830952.6689040292516; Mon, 20 Nov 2023 07:11:00 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 85A33188F; Mon, 20 Nov 2023 10:10:59 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E983E17CC; Mon, 20 Nov 2023 10:08:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9DE7217CC; Mon, 20 Nov 2023 10:08:38 -0500 (EST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 121F517C9 for ; Mon, 20 Nov 2023 10:08:37 -0500 (EST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-32f737deedfso2918091f8f.3 for ; Mon, 20 Nov 2023 07:08:37 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f3-20020a056000036300b003316ddedb6esm9699177wrf.22.2023.11.20.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2EFE565752; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492915; x=1701097715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; b=Q46C2u4Exqo/YTFgOleadG2hsV2daNunYjaRj7aN+ezAE3BcBtcNimzsDfrNve462V H70CGShrGN1OWMvg+SmeoiKI6lOcc+DnKKziFwilzvRJVHz046BW4p+smLEQlk3tgp+0 XP+cS+LEni9DZxb1EF870Yz1ZcijMXwfi+GjMWx71Vfn1Hkt73sYEhwWWxR0fL3bwe5g Q6TZ0KiHa5DDZzG/EphmYGNiGiI3a4RV7HexNWsFyahvNP+IQZTKvYhOvPlP/2qw/QD+ 01mJFxrNalexoZa1Gv7ssnxsH9mVJN3D4yVxjtEqqFkI4Zm7dCI9UeEzJFW/KgYJdpAG eOiw== X-Gm-Message-State: AOJu0Yw8HtGV1nfvRjqod9JJyuEEKIhj+swB4HIPV98bIr4dxK5PW7c9 5QkC7s4uPWEebxhvSb/wbkUHSw== X-Google-Smtp-Source: AGHT+IFLQr75NfFO9Sc81yES5PFhgTMfQo65fgZQhT5bo6ze2BaCw53TtNa9W/9Eddr7MJYhJ4LovA== X-Received: by 2002:a5d:5cd1:0:b0:32d:9df1:6f68 with SMTP id cg17-20020a5d5cd1000000b0032d9df16f68mr4667230wrb.22.1700492915183; Mon, 20 Nov 2023 07:08:35 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/14] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Date: Mon, 20 Nov 2023 15:08:21 +0000 Message-Id: <20231120150833.2552739-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-1-alex.bennee@linaro.org> MIME-Version: 1.0 Message-ID-Hash: RKN5567I4FIWNPITY2656EDDOSCATTDB X-Message-ID-Hash: RKN5567I4FIWNPITY2656EDDOSCATTDB X-MailFrom: alex.bennee@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1700493061596100001 From: Philippe Mathieu-Daud=C3=A9 macOS 14 "Sonoma" was released on September 2023 [1]. According to QEMU's support policy, we stop supporting the previous major release two years after the the new major release has been published. Replace the macOS 12 (Monterey) testing by macOS 13 (Ventura, released on October 2022, [2]). Refresh the generated files by running: $ make lcitool-refresh [1] https://www.apple.com/newsroom/2023/09/macos-sonoma-is-available-today/ [2] https://www.apple.com/newsroom/2022/10/macos-ventura-is-now-available/ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20231108162022.76189-1-philmd@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/cirrus.yml | 6 +++--- .gitlab-ci.d/cirrus/{macos-12.vars =3D> macos-13.vars} | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .gitlab-ci.d/cirrus/{macos-12.vars =3D> macos-13.vars} (95%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index e7f1f83c2c..07dc6edae1 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -59,13 +59,13 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check =20 -aarch64-macos-12-base-build: +aarch64-macos-13-base-build: extends: .cirrus_build_job variables: - NAME: macos-12 + NAME: macos-13 CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-= 13.vars similarity index 95% rename from .gitlab-ci.d/cirrus/macos-12.vars rename to .gitlab-ci.d/cirrus/macos-13.vars index 5f3fb346d1..534f029956 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-13.vars @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-12 qemu +# $ lcitool variables macos-13 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 10c54a377c..7c211eba2e 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -203,7 +203,7 @@ try: # Cirrus packages lists for GitLab # generate_cirrus("freebsd-13") - generate_cirrus("macos-12") + generate_cirrus("macos-13") =20 # # VM packages lists --=20 2.39.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Wed Nov 27 04:58:53 2024 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=1700493068; cv=none; d=zohomail.com; s=zohoarc; b=X1ZgHwA4+OGcb/NugDTuNIQEdCNdGVONe+zNClxerpoFSk0JA5KjBqbqFKzpyq4opzPS67lGHtlpsgQsGF2rFopsUUxtTM3BY7wdWpiDkDBisejOeJnYIdYJsR+XmshNk0KdEO6yB3cbeEkiJaZthQOdWdmJVhlYiRWrpROqA2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493068; 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=NCRqk6YT3bsj71ZXwzX8pG0SOXxV0ZtG0Z5l0HsDHlo=; b=fg2exASJJQdAj2W1eNwQLaOXp+53EhZbsf+/4Nl8EFCebGQE3ISscQvHIMhWGB/lxQYKCOmjI5rDufigeYnuTCajfBxjEF13g/0Ss3jOT7q0S0bv3jvjb/W6H6qAq5fjViXCzHmauuU1hPOfh3Rrfo02QQsBirebf2QyKp3sfyQ= 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 1700493068298641.4378830216565; Mon, 20 Nov 2023 07:11:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tg-0006Nd-Gq; Mon, 20 Nov 2023 10:09:12 -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 1r55tQ-0005rz-Uq for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:59 -0500 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tB-0001Cf-A7 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:51 -0500 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c6b30aca06so55029131fa.3 for ; Mon, 20 Nov 2023 07:08:39 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r14-20020a05600c35ce00b004094d4292aesm13683058wmq.18.2023.11.20.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4951065755; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492918; x=1701097718; 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=NCRqk6YT3bsj71ZXwzX8pG0SOXxV0ZtG0Z5l0HsDHlo=; b=F6b+lNVN5EY7oRWbCZlg0ds00XuFgj0g0YvZQjRD34hfjRJHKAIYvgOHbSy+ennXqM afnIizMnUH1i+kh0UU0mlS6nPbNwgymqsEJY6Pt/dVdK+KouG5BFb0AbndqdkvfDFioX 17XQYx1MeTOIt0QlV0+TMYpu/i4DoB28I+OTJQUx/1T25Zwus4kLYdwkM9FjTW16zky1 3/jNBmO2B1YJ+UfmINSGbCmTZLj4GrEar3r7oxfMpMEmVI0tQ0+X25R6TEySblPikFC7 gWQVcGYNStQCjg5pwsQ67tiU0SnHeQ2eBNhmTHGtz+TYPvzNLmpJmqP8EneWyugqQkmb P0aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492918; x=1701097718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NCRqk6YT3bsj71ZXwzX8pG0SOXxV0ZtG0Z5l0HsDHlo=; b=MLQmQuUnAm1bfhSfe4Y+gVs4KKhYld0mZbkYrCusxXsBKkOpj55tPCXQMtPfsilkRe sI7ZddlESxt5pYoqU7Kgith5GD2A+2Ar7x2NB40wmyb9zG33gtFWla0tMZOUlhLKe1Xp 11/ptyoWjmf62bPXEBHptMXk7jSAg/2fNWdyRxKhNb1qUmwquAw5mrSPrpURwQ8SsTYe UFHo9uTP6NEkWvNB7g9NoAd0lUrY3d3bFCL8nXm/1wSSPcFd7FHjAlKt2RH15BgBnpv8 4bD+Mx1Dg+1qIeahRbqlxTg/djQG+bcbNYn0L9yOCUl0FCdIRhd60tm2Ps5Kxvk2KhK5 E88g== X-Gm-Message-State: AOJu0YwjCo4NWCvNjBl7HEn/TXAzfNZtSftVV1u3uOJzzcKOojaWnXvr 0K1/96/SyHbhpXsxC632ndnYtg== X-Google-Smtp-Source: AGHT+IFFTFT2xVXHJjqWvOWRwCM6+7ymXoqgGD9Tp5MS/WTaMGY68gI4TXwyKt+7dAQb9KsG80Mhdw== X-Received: by 2002:a2e:150e:0:b0:2c8:3410:2be with SMTP id s14-20020a2e150e000000b002c8341002bemr4070977ljd.22.1700492918023; Mon, 20 Nov 2023 07:08:38 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , Anders Roxell Subject: [PATCH v2 03/14] tests/docker: merge debian-native with debian-amd64 Date: Mon, 20 Nov 2023 15:08:22 +0000 Message-Id: <20231120150833.2552739-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::22f; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493069696100001 debian-native isn't really needed and suffers from the problem of tracking a distros dependencies rather than the projects. With a little surgery we can make the debian-amd64 container architecture neutral and allow people to use it to build a native QEMU. Rename it so it follows the same non-arch pattern of the other distro containers. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Anders Roxell --- .gitlab-ci.d/buildtest.yml | 12 ++--- .gitlab-ci.d/containers.yml | 2 +- tests/docker/Makefile.include | 3 -- tests/docker/dockerfiles/debian-native.docker | 54 ------------------- .../{debian-amd64.docker =3D> debian.docker} | 7 ++- tests/lcitool/refresh | 9 ++-- 6 files changed, 18 insertions(+), 69 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-native.docker rename tests/docker/dockerfiles/{debian-amd64.docker =3D> debian.docker} (= 96%) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index da72f7c690..7f9af83b10 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -70,7 +70,7 @@ build-system-debian: needs: job: amd64-debian-container variables: - IMAGE: debian-amd64 + IMAGE: debian CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensa-softmmu @@ -82,7 +82,7 @@ check-system-debian: - job: build-system-debian artifacts: true variables: - IMAGE: debian-amd64 + IMAGE: debian MAKE_CHECK_ARGS: check =20 avocado-system-debian: @@ -91,7 +91,7 @@ avocado-system-debian: - job: build-system-debian artifacts: true variables: - IMAGE: debian-amd64 + IMAGE: debian MAKE_CHECK_ARGS: check-avocado AVOCADO_TAGS: arch:arm arch:i386 arch:riscv64 arch:sh4 arch:sparc arch= :xtensa =20 @@ -101,7 +101,7 @@ crash-test-debian: - job: build-system-debian artifacts: true variables: - IMAGE: debian-amd64 + IMAGE: debian script: - cd build - make NINJA=3D":" check-venv @@ -589,7 +589,7 @@ build-tools-and-docs-debian: # when running on 'master' we use pre-existing container optional: true variables: - IMAGE: debian-amd64 + IMAGE: debian MAKE_CHECK_ARGS: check-unit ctags TAGS cscope CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools QEMU_JOB_PUBLISH: 1 @@ -609,7 +609,7 @@ build-tools-and-docs-debian: # of what topic branch they're currently using pages: extends: .base_job_template - image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:$QEMU_CI_CONTAINER_TAG + image: $CI_REGISTRY_IMAGE/qemu/debian:$QEMU_CI_CONTAINER_TAG stage: test needs: - job: build-tools-and-docs-debian diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 8637a13d86..ae79d4c58b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -11,7 +11,7 @@ amd64-debian-container: extends: .container_job_template stage: containers variables: - NAME: debian-amd64 + NAME: debian =20 amd64-ubuntu2204-container: extends: .container_job_template diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index cd4688bf07..5ba5b50ab9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,9 +88,6 @@ DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 -# The native build should never use the registry -docker-image-debian-native: DOCKER_REGISTRY=3D - # alpine has no adduser docker-image-alpine: NOUSER=3D1 =20 diff --git a/tests/docker/dockerfiles/debian-native.docker b/tests/docker/d= ockerfiles/debian-native.docker deleted file mode 100644 index abac7d7cd7..0000000000 --- a/tests/docker/dockerfiles/debian-native.docker +++ /dev/null @@ -1,54 +0,0 @@ -# -# Docker Debian Native -# -# This is intended to build QEMU on native host systems. Debian is -# chosen due to the broadest range on supported host systems for QEMU. -# -# This docker target is based on the docker.io Debian Bullseye base -# image rather than QEMU's base because we would otherwise confuse the -# build grabbing stuff from the registry built for other -# architectures. -# -FROM docker.io/library/debian:bullseye-slim -MAINTAINER Alex Benn=C3=A9e - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata - -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt build-dep -yy --arch-only qemu - -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - cscope \ - genisoimage \ - exuberant-ctags \ - global \ - libbz2-dev \ - liblzo2-dev \ - libgcrypt20-dev \ - libfdt-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsnappy-dev \ - libvte-dev \ - netcat-openbsd \ - ninja-build \ - openssh-client \ - python3-numpy \ - python3-opencv \ - python3-venv - -ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS -ENV DEF_TARGET_LIST "none" -# 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/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian.docker similarity index 96% rename from tests/docker/dockerfiles/debian-amd64.docker rename to tests/docker/dockerfiles/debian.docker index 9b50fb2f63..b5e642d5b6 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -155,10 +155,13 @@ RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ cscope\ global\ - linux-headers-amd64 + linux-headers-generic RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap && git checkout v11.3 -RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kerne= l-dir=3D$(ls -d /usr/src/linux-headers-*-amd64) && make install +RUN cd /usr/src/netmap/LINUX && \ + ./configure --no-drivers --no-apps \ + --kernel-dir=3D$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architect= ure)) \ + && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap # As a final step configure the user (if env is defined) ARG USER diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 7c211eba2e..993683cf48 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -99,10 +99,13 @@ debian12_extras =3D [ " apt install -y --no-install-recommends \\\n", " cscope\\\n", " global\\\n", - " linux-headers-amd64\n", + " linux-headers-generic\n", "RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netma= p\n", "RUN cd /usr/src/netmap && git checkout v11.3\n", - "RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --= kernel-dir=3D$(ls -d /usr/src/linux-headers-*-amd64) && make install\n", + "RUN cd /usr/src/netmap/LINUX && \\\n", + " ./configure --no-drivers --no-apps \\\n", + " --kernel-dir=3D$(ls -d /usr/src/linux-headers-*-$(dpkg --print-arch= itecture)) \\\n", + " && make install\n", "ENV QEMU_CONFIGURE_OPTS --enable-netmap\n" ] =20 @@ -123,7 +126,7 @@ try: # generate_dockerfile("alpine", "alpine-318") generate_dockerfile("centos8", "centos-stream-8") - generate_dockerfile("debian-amd64", "debian-12", + generate_dockerfile("debian", "debian-12", trailer=3D"".join(debian12_extras)) generate_dockerfile("fedora", "fedora-38") generate_dockerfile("opensuse-leap", "opensuse-leap-15") --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700492996; cv=none; d=zohomail.com; s=zohoarc; b=MIOYw5YCLjtQXYMwdKVJ+HehIIEalrDQ0bTp1U20LYbEqfo7R4yCnXdte1f+/EK4uXEO1rF4f2jL8nAOC37HPO7cxo7qva8h7i3uQwxBsLsJ+roTi6HzI4klYxa17aj6IxBL9h7CqDTgU6kCLKZCfcq3ZzzcNc0pJkF2E98bxm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700492996; 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=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; b=nnpgI2s3//XZBs7jMCW/z/hJg0OCPp0823jd7V7VafyL5fPtbxjt2jNr0GaN11gqwJZM0XQ67nIhGXkqz+osVE9u92Ei+3/VxCSEiBOYO4y85/WmoLau9rtgo2iynLpqwoH0tbczrjcd5gOS9Pplf/ogH2HuxCK0i3vZr3x83/Q= 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 1700492996369305.43140909450415; Mon, 20 Nov 2023 07:09:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55ta-0006AD-OS; Mon, 20 Nov 2023 10:09:06 -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 1r55tA-0005jw-Kj for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:41 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55t7-0001Bf-16 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:40 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4079ed65471so18230205e9.1 for ; Mon, 20 Nov 2023 07:08:36 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c230100b003fefb94ccc9sm13477072wmo.11.2023.11.20.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6132B65758; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492915; x=1701097715; 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=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; b=OPtCdTTKWyWfsRvlja6HGNwngJ4ZBUYjHSWwixKZ25VYwPMTp8PA+jINIjg0eISMvj kwdsQikTN2gkV/YLikYmmd5oq88idkg98kSRaM/qWCQMkOnAbrpNQLUAuCWeQHlZ0F09 YtF7pmO6H5Ri1K0+1pNPqAGakEsVCITdBRtyECyRRy9mMzzxaS1HWnGCwNxROK79cOHo 72La/K+o+CzTJ3E4a9bx7qTZv439hDHzrdXKz0wgORLHMvY+dGpPFZeyRTM+5zumNWxz kDaWcOfVxgrj7IqK9sqmmG+iRTz+f2mkNgjFSmb6OnCFeuAOjZaM/GOLtonoTjBjRnc3 V81A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492915; x=1701097715; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r13y4mFZjL5YxuFf8Jb2e5kHdn8MHdL63WduZWtvH6Q=; b=sMcpp3bUh+D9plOT6hTYLW8r2cB3ddOUQU9e5O766zqhNUSxvcRzZCjNi7w4HmNjBb nlsKLz4rWqT0PWbDddrAxX5Q87zrJTZaayZu7vkLlkLaRRoxa7yxuc2rOX3aGmgC1W4G JVm3n9T3uEC0HODgtkubdfb5XouoMbpKg9cI/op/zdxCqtf2s7ucg99h+1AegfKeY+7z /vOU3qzRKOaZt+ZZ7OezSAarZ2F935cQdKQ0FLLfzQiCArRrCT63IgOVzHycZLfG9awb vzScqZw/6S8/EClNtBeMf8JYLrPNZFunoaz7gnfKAVlZhd79gA43c2ZWXp6XISyfCK70 ueLg== X-Gm-Message-State: AOJu0YwKCNCuRxTskWygaMiuqZ7hVVL5qVNJFVzOYIAvT4Banrq2bFwc nKHbLcEgne6FTdbBNroZTKov/w== X-Google-Smtp-Source: AGHT+IGSsrKdk+nOb84gaytgqykOLTTQYx6NUzU19mp01UV48pCnbtWg5mBWAEhg/pyzARRZKv4Hfg== X-Received: by 2002:a05:600c:450a:b0:408:2b:3ae with SMTP id t10-20020a05600c450a00b00408002b03aemr5446408wmo.6.1700492915281; Mon, 20 Nov 2023 07:08:35 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , Greg Manning Subject: [PATCH v2 04/14] plugins: fix win plugin tests on cross compile Date: Mon, 20 Nov 2023 15:08:23 +0000 Message-Id: <20231120150833.2552739-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700492997843100007 From: Greg Manning Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1972 Cross compile gcc is more picky about argument order than msys. Changed the meson command to take the (now renamed) libqemu_plugin_api.a as a lib, rather than an object. This puts it in the right place on both native and cross compile gcc commands Reenable plugins on crossbuilds Signed-off-by: Greg Manning Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20231109124326.21106-2-gmanning@rapitasystems.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/crossbuilds.yml | 2 +- contrib/plugins/Makefile | 2 +- plugins/meson.build | 2 +- tests/plugin/meson.build | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index c2af6c7f44..d19d98cde0 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -165,7 +165,7 @@ cross-win32-system: job: win32-fedora-cross-container variables: IMAGE: fedora-win32-cross - EXTRA_CONFIGURE_OPTS: --enable-fdt=3Dinternal --disable-plugins + EXTRA_CONFIGURE_OPTS: --enable-fdt=3Dinternal CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu artifacts: diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 1783750cf6..0b64d2c1e3 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -49,7 +49,7 @@ all: $(SONAMES) $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< =20 ifeq ($(CONFIG_WIN32),y) -lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/qemu_plugin_api.lib +lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a $(CC) -shared -o $@ $^ $(LDLIBS) else ifeq ($(CONFIG_DARWIN),y) lib%$(SO_SUFFIX): %.o diff --git a/plugins/meson.build b/plugins/meson.build index 40d24529c0..6b2d7a9292 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -28,7 +28,7 @@ if get_option('plugins') # then use dlltool to assemble a delaylib. win32_qemu_plugin_api_lib =3D configure_file( input: win32_plugin_def, - output: 'qemu_plugin_api.lib', + output: 'libqemu_plugin_api.a', command: [dlltool, '--input-def', '@INPUT@', '--output-delaylib', '@OUTPUT@', '--dllname', 'qemu.exe'] ) diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 528bb9d86c..28a929dbcc 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -4,7 +4,8 @@ if get_option('plugins') if targetos =3D=3D 'windows' t +=3D shared_module(i, files(i + '.c') + '../../contrib/plugins/win= 32_linker.c', include_directories: '../../include/qemu', - objects: [win32_qemu_plugin_api_lib], + link_depends: [win32_qemu_plugin_api_lib], + link_args: ['-Lplugins', '-lqemu_plugin_api'], dependencies: glib) =20 else --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493256; cv=none; d=zohomail.com; s=zohoarc; b=d/n9ejDWu8fioXW/hA3mbH6FUWdEmZBhriGHIj3l/HjRXSBN0bYa1TcMm3WxM/ISB5knwcucnvpE5ddIX4OfWqKcVbZGIwqwPXJ8m6ffQhG965H5DQzkqL2YFMkO6u+y1RDeb9WB/ke6y2MrCsN5JU7KfCKRV8bFeFUSxLcVON4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493256; 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=xunI738Fqo6s2FpWviDGopn4HPhskLpvM21aNsZbJoM=; b=NgDA21PT5RhKQhMKKztKOlsX4GF4zqnVM2lNtEnv+id79sZIn4/Bodr3befPp9J99Lq+cd+4k/B0+sUfEfZ1ho1G/A80/Ra1YHEnTkst6DjTvlXR50+YijuZ+1V9zLjDIEe+tdiS9k9v+gFYuEt8PndSE7hedaE+Yk/7cpmxdco= 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 1700493256532146.41934459317497; Mon, 20 Nov 2023 07:14:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55td-0006GL-2k; Mon, 20 Nov 2023 10:09:09 -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 1r55tS-0005tx-Nd for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:00 -0500 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tC-0001F1-Vb for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:57 -0500 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2c5039d4e88so58777251fa.3 for ; Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fc16-20020a05600c525000b004054dcbf92asm13671291wmb.20.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7A66665773; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492921; x=1701097721; 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=xunI738Fqo6s2FpWviDGopn4HPhskLpvM21aNsZbJoM=; b=VwpMFHeAvkKBE+nuZ57WbabJpa9xnAOHjYOIFHzsMLdO2QVO859pHUoBhE6fmSMcvN a120Cn2VONxmZLyOXNWCg4SrlVhaUh+RlZhDRA1n3havHd488c5lSKW+AZO+XYs0gfkj IsWGFWbdwEKrM1mFh1Lx1p3P046r3PQ1YgWzMiVWJLr642WKGwENkuBjtKegxO3Bu+pW Sl95/IZSEzovrxi6t6kZexPwTrDb43JYv3qxIXv4zYi4nIz58gd9LTCwlucbZHWMikXA IIIFGbXkg7VYgnaewP3iwSVYk+ICtuT1vZJzB3BxnMnjETENQ4QdDfhWsAZ5p10apc9q 2V8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492921; x=1701097721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xunI738Fqo6s2FpWviDGopn4HPhskLpvM21aNsZbJoM=; b=ghOXDDi5M8Sh6FfNaYW3tj7SPK/iTDrnSnHtZfr5LTCI4By2JZT5qORMRYgvVFxniL p5leD4aciXzi3TRNPuReiwO3rosJD1bEvmU7/QgApXysA82N4o26UDvJs9frb5kAAfmY Ml4jLx1Xrb0FOJy9u3CAyX0Sjtk4NU/wRp04V5QkcRCdyM+oKZjENRXoA5gdmSlq5YwJ uL4caYtcd7wTfbxqNX437aYYw7Nq9YLc0IjpR2WjrT8ynmkYjDIxnfmliGP1gQpnLlCe 3qm+bim5zg9OtswUYWXLQ6vYVyLBojEcmfRPCDmcOwiVi6KoGN2+zilk5cL/W8VrOy/M aXGA== X-Gm-Message-State: AOJu0YwVGd96x8CBcbryvGXuJqjuoPib2omw/UoExdK1szzTeXcsPlRg Ixbow9AJdsktSYZb7w+KlaLX2Q== X-Google-Smtp-Source: AGHT+IFwJ6WbJtoEJBR0h+xaGIr/8q9ma1wJGXOzpHvHJgseeW9gzGnBJ+9SfCFUULqTsHelU100lQ== X-Received: by 2002:a2e:9d89:0:b0:2c5:2813:5534 with SMTP id c9-20020a2e9d89000000b002c528135534mr5248557ljj.51.1700492920828; Mon, 20 Nov 2023 07:08:40 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 05/14] target/nios2: Deprecate the Nios II architecture Date: Mon, 20 Nov 2023 15:08:24 +0000 Message-Id: <20231120150833.2552739-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::22b; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22b.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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 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: 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: 1700493263818100001 From: Philippe Mathieu-Daud=C3=A9 See commit 9ba1caf510 ("MAINTAINERS: Mark the Nios II CPU as orphan"), last contribution from Chris was in 2012 [1] and Marek in 2018 [2]. [1] https://lore.kernel.org/qemu-devel/1352607539-10455-2-git-send-email-cr= wulff@gmail.com/ [2] https://lore.kernel.org/qemu-devel/805fc7b5-03f0-56d4-abfd-ed010d4fa769= @denx.de/ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Marek Vasut Reviewed-by: Thomas Huth Message-Id: <20231117070250.32932-1-philmd@linaro.org> Signed-off-by: Alex Benn=C3=A9e --- docs/about/deprecated.rst | 15 +++++++++++++++ hw/nios2/10m50_devboard.c | 1 + hw/nios2/generic_nommu.c | 1 + 3 files changed, 17 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6c84db90b5..2e15040246 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -236,6 +236,16 @@ it. Since all recent x86 hardware from the past >10 ye= ars is capable of the 64-bit x86 extensions, a corresponding 64-bit OS should be used instead. =20 =20 +System emulator CPUs +-------------------- + +Nios II CPU (since 8.2) +''''''''''''''''''''''' + +The Nios II architecture is orphan. The ``nios2`` guest CPU support is +deprecated and will be removed in a future version of QEMU. + + System emulator machines ------------------------ =20 @@ -254,6 +264,11 @@ These old machine types are quite neglected nowadays a= nd thus might have various pitfalls with regards to live migration. Use a newer machine type instead. =20 +Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The Nios II architecture is orphan. + =20 Backend options --------------- diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 952a0dc33e..6cb32f777b 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -160,6 +160,7 @@ static void nios2_10m50_ghrd_class_init(ObjectClass *oc= , void *data) mc->desc =3D "Altera 10M50 GHRD Nios II design"; mc->init =3D nios2_10m50_ghrd_init; mc->is_default =3D true; + mc->deprecation_reason =3D "Nios II architecture is deprecated"; =20 object_class_property_add_bool(oc, "vic", get_vic, set_vic); object_class_property_set_description(oc, "vic", diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c index 48edb3ae37..defa16953f 100644 --- a/hw/nios2/generic_nommu.c +++ b/hw/nios2/generic_nommu.c @@ -95,6 +95,7 @@ static void nios2_generic_nommu_machine_init(struct Machi= neClass *mc) { mc->desc =3D "Generic NOMMU Nios II design"; mc->init =3D nios2_generic_nommu_init; + mc->deprecation_reason =3D "Nios II architecture is deprecated"; } =20 DEFINE_MACHINE("nios2-generic-nommu", nios2_generic_nommu_machine_init); --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493210; cv=none; d=zohomail.com; s=zohoarc; b=lihmI33oOWbnABsXnKDp/xBCyblP8YP37n4WQTajeQhi6PsX10wsSpCWoD1PSGnv2RL6C1WfIv1flBXrY/plW8b0OdQ9o+BK+owlLNbRveH6D2wX6+tDaoFqDGK1V5iPYCEeAE9sQeKRhMD3PHSmAQpOtHQ2UFpG6h0Eac0mesU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493210; 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=IjAJqKCk3iUb0SkYI6f8P9mLxZWi+VPPBoOgrXC8tUg=; b=JIKVQPlaFN9+fu+xa/vVXMCrk4GPnlQPC0l9m3ca+aHFKlho4jBUy4eo9h2KG2uFhZbm3ZDn6pRp2U2WhZ+FTT1pAD9aV4CAlUuVgr4djY5lVLxkYSBU4WeGQze0T3N8VU91bcX92ve/zwFQLjUAJiPDzt1e5LlPI/gaXl8wYaA= 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 1700493210471249.926307513629; Mon, 20 Nov 2023 07:13:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55te-0006J9-CT; Mon, 20 Nov 2023 10:09:10 -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 1r55tL-0005qO-9L for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:56 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tC-0001EQ-12 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:49 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32df66c691dso2866403f8f.3 for ; Mon, 20 Nov 2023 07:08:41 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l5-20020a5d4bc5000000b00332c4055faesm4984373wrt.87.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8D8DD65774; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492920; x=1701097720; 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=IjAJqKCk3iUb0SkYI6f8P9mLxZWi+VPPBoOgrXC8tUg=; b=BQKTFM0lIX4FCT5KeM9hgHLytNqqSQcT6HboPktwPoEMlj/8Sd81OJ2If6iWTQZdZJ xrIs/n2EHtFm9PLPbatH1Lhum9p39YpStsl2nONmTEElEU/9CS6U2RmGbBZUIRnTKvtH MdUXlucrKCcE09Bc8Fy4m6gE0mChtxckaDKLUFE6Prci0bMZ5C8k/uLVfbJhssCkp2T+ FNBvP0ZrAbsuoeaxYTYZdE38a/bU1QdCnDWcSI4FyKO9GdzXqvFAj5EQDDSVvBLPGQaI ogBvUvu1ru6/xlQ4VC0q5HEVMk0vqqR0FsSMxtfunPEPzl76VX8ICUy/EgsXhECI9ctO Hn3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492920; x=1701097720; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IjAJqKCk3iUb0SkYI6f8P9mLxZWi+VPPBoOgrXC8tUg=; b=ocgAkokFFETsA7P+UdyJMDoKlwbPHviHPH1ke8faotsYcKKsjGHoKiAONmCH1XpznT ZLG5UTJkjG6DPTI2VoxFrW6FdoJyPGwsBxpJqOYJmajD4BxVL/JT+FNOWYmb1iKX8im4 dB1Kqfq5mRotqxONlATGAxq+Ye3DDdox9E8Mex1lHOqzVVf9vum75JL1xSKsbHdHv+fV xMQVvncB1bPjObTK/jSWcg1fLr4pRT1tu4gJhiniS/OVRtPefyudCzNFn0aV2+e+Lc4h S6pAy8qPH7PictPOYqJXEVT1r8PWsZUFKtdCmUdP/dIY73yChhrMXkEqwwsQu1GxY89X ruPQ== X-Gm-Message-State: AOJu0YxM+0vVV4vjyseICgek3kc1ev9GVX+7Ap6fJRxJf9/t4DjtFtBW FJAVg96Budi7/KglaK87slwZoA== X-Google-Smtp-Source: AGHT+IGnzZYarrmBs2T1ybalMqbmG/wDdDbl5pPaKrGhn3vwefQc7sq4CUCEcB7JFX+K5XLzlZ4XdQ== X-Received: by 2002:a05:6000:1883:b0:32d:701b:a585 with SMTP id a3-20020a056000188300b0032d701ba585mr7086064wri.69.1700492920360; Mon, 20 Nov 2023 07:08:40 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 06/14] tests/tcg: fixup Aarch64 semiconsole test Date: Mon, 20 Nov 2023 15:08:25 +0000 Message-Id: <20231120150833.2552739-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493212461100003 We need to ensure we squash the serial port if we want to hand craft our muxed input. As a bonus emit the example with a V=3D1 build to make it easier for people to figure out. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/Makefile.softmmu-target | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index b74a2534e3..77c5018e02 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -48,10 +48,11 @@ QEMU_BASE_MACHINE=3D-M virt -cpu max -display none QEMU_OPTS+=3D$(QEMU_BASE_MACHINE) -semihosting-config enable=3Don,target= =3Dnative,chardev=3Doutput -kernel =20 # console test is manual only -QEMU_SEMIHOST=3D-chardev stdio,mux=3Don,id=3Dstdio0 -semihosting-config en= able=3Don,chardev=3Dstdio0 -mon chardev=3Dstdio0,mode=3Dreadline -run-semiconsole: QEMU_OPTS=3D$(QEMU_BASE_MACHINE) $(QEMU_SEMIHOST) -kernel +QEMU_SEMIHOST=3D-serial none -chardev stdio,mux=3Don,id=3Dstdio0 -semihost= ing-config enable=3Don,chardev=3Dstdio0 -mon chardev=3Dstdio0,mode=3Dreadli= ne +run-semiconsole: QEMU_OPTS=3D$(QEMU_BASE_MACHINE) $(QEMU_SEMIHOST) -kernel run-semiconsole: semiconsole $(call skip-test, $<, "MANUAL ONLY") + $(if $(V),@printf " %-7s %s %s\n" "TO RUN" $(notdir $(QEMU)) "$(QEMU_OPT= S) $<") run-plugin-semiconsole-with-%: semiconsole $(call skip-test, $<, "MANUAL ONLY") =20 --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493191; cv=none; d=zohomail.com; s=zohoarc; b=LS/h+nURqww/3MOErkch61fjkr1qWqRM43IE7CtlhahL3yF45H86grB1UcFKhA5xVcKZjmLbhfo46YURY+j4Sm7f8AqSCagvt8wqfR2m8ybvA8dko0LY/6JiLHzWSP/xPTY1DYzWvgbL0jC4IB8r8d7ruFrKeWOqfYSlCssdXKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493191; 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=/Am29rNstmoBjPWHdKzUHbk8KZyMNjdmqHD061pd8s4=; b=XwR6my6AXZYo59vApfo++CQoUA2pOa+87Y5HNOfh9hfFiuSZfjnw2bc1Pm+mdLrmzB+oHfWn48uUArhhvi5JqPn1NQhDjyVSlDSebo4O6iY/vVq0YLOhUTjyJVgssyKlHdrbKyzY2pGeu8Vit3CQUcAGOm7hd4+/oKBzrkoZ690= 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 170049319158995.82993544299268; Mon, 20 Nov 2023 07:13:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tl-0006T4-E4; Mon, 20 Nov 2023 10:09:17 -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 1r55tQ-0005sf-W3 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:59 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tC-0001EZ-RB for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:52 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4083ac51d8aso16963245e9.2 for ; Mon, 20 Nov 2023 07:08:41 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y4-20020a5d4ac4000000b003316c8ad545sm10450206wrs.76.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A0DC365775; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492921; x=1701097721; 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=/Am29rNstmoBjPWHdKzUHbk8KZyMNjdmqHD061pd8s4=; b=xvpDD/VqOy5u8dMnxMvewAW6XKwA+xGG16bTSKvRO/u9Inu1Wy1HZphlrm/XPAhHRO IXwtUQclud/8Uas5SIx084VffpX8bCiFlGdLnWsJEFtbgQeGhxAhtPjiQAVSDiAejTEf 6gnhgjXOwDsiOYB0oKlltEurluvovnv0DnGb3yTaLpjJM0CPv+9HIwavoXuN3Ab63t/4 BVT1yqcglWEI9mlxo6yqnrq66hNnsO3t1ITvxI/3uJ7I9KWy63oLy1YYHAwnfiN13wHz LChe92hArzydqrA1w2YYe2aieOI74/Rih9jNPOAUmONZVOhcLrPK0ohUfYv+E5wjPg7e VwFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492921; x=1701097721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Am29rNstmoBjPWHdKzUHbk8KZyMNjdmqHD061pd8s4=; b=sJnz7m5yM9hah0qmm5uif5O8DGEEQBJXXJJGgQSwmVfn35VcNVlVRBPXJKoVEKx/JG UsYxq4GYmMONnByE6aa4UoL7K+4md9Osp8W7J3V6GQsm1w5MRCoDmmUFvaf0BB0hm4kN QoQfakd0NZU965PLCwL0HrsxgSe6pWxQ9/mpxOtSdJsOecGMVGqo9UnjhBnV4UFiz1Ru keGMgtriRmlTxka/xqGxsWhwGi+vT2TQ+vBqBkuqrsJyNBQMu9Q3ldFqyp74aU/7zo+2 ym+aIBgwkApGJFMu1eIPkJGpmsRtSxYoMdnyoqEbmzw0xLppxrZ+fPIo1xn+y0eICY6m PcKQ== X-Gm-Message-State: AOJu0YwEz0ADR8azdqaaSbCuDy5IMjTie9YJ8qcdEi4tAHDsH3G6fyKD HFxXcnhwC7XECH/TBzwdo1R9Kw== X-Google-Smtp-Source: AGHT+IGXKd2U+WEIncOd5SP1kVcLtYZr5FJl/EL76EFXdswtHcZ2pP6rvl7lvX1ZkKAGW+XfP2QXqA== X-Received: by 2002:a7b:c342:0:b0:40a:4a7d:606b with SMTP id l2-20020a7bc342000000b0040a4a7d606bmr6547024wmj.40.1700492920613; Mon, 20 Nov 2023 07:08:40 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 07/14] docs/emulation: expand warning about semihosting Date: Mon, 20 Nov 2023 15:08:26 +0000 Message-Id: <20231120150833.2552739-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493192284100001 A surprising feature of calls like SYS_READC is this can cause QEMU to indefinitely block as there is no handling for EOF. Clarifies: https://gitlab.com/qemu-project/qemu/-/issues/1963 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- docs/about/emulation.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst index 0ad0b86f0d..a2eefe3f3f 100644 --- a/docs/about/emulation.rst +++ b/docs/about/emulation.rst @@ -129,8 +129,9 @@ causing most hypervisors to trap and fault on them. .. warning:: Semihosting inherently bypasses any isolation there may be between the guest and the host. As a result a program using semihosting can - happily trash your host system. You should only ever run trusted - code with semihosting enabled. + happily trash your host system. Some semihosting calls (e.g. + ``SYS_READC``) can block execution indefinitely. You should only + ever run trusted code with semihosting enabled. =20 Redirection ~~~~~~~~~~~ --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493117; cv=none; d=zohomail.com; s=zohoarc; b=MAl+/QS3P14WuIMg4r2MCZV2LtOpl8+NjynkpkuMyto3+b+ZOeeV7+afN5+5jmfe2LMn6mXlVVtm8eimFPps1JHX//yYEyPi2qTbjj3erOJlzCKe2hNnikQbqX7CvBtEJOWUqxyN3kMkoYJX/jY/+oWQKCysqXAeClcYyFBMtZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493117; 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=nFCIY8a2prU+vxKx/Khs2e4u+A5y+AyU+weaY1KLmL0=; b=gNsU+hSbb1jmeZBSlt/vLUBE3jCGZ31v+F/M4+ZIV0R1xfWZsEVzeTPc4bXQ3xpB8m9AibDHcx5QPdQ/tqChkLQ8kUS5hYleZuFPO2V4VIupwpddd9BVv6s/lT9qwODODe13fuULABMrRpEjUZMXc86HH94eFipOmbq/IQdUB94= 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 1700493117428349.24137825171374; Mon, 20 Nov 2023 07:11:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tf-0006L0-G7; Mon, 20 Nov 2023 10:09:11 -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 1r55tL-0005qL-8l for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:56 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tA-0001Cv-7s for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:49 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4084095722aso19156265e9.1 for ; Mon, 20 Nov 2023 07:08:39 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l6-20020a05600c4f0600b004068495910csm18174146wmq.23.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B663565776; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492918; x=1701097718; 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=nFCIY8a2prU+vxKx/Khs2e4u+A5y+AyU+weaY1KLmL0=; b=oIuUzylEAc/Mtmflle9r+o+O2IPhKKxloPSQZxmSJjqmklXenc1irTJq6Je5HIeyUg piRJU9/hSdfJdrPRmVeXDFKHE8j1PhEkq6KEtD7wIfqfygRgXtVh0yX45P7JSJ7FOoVm 0jAOCefOpSuwghwuXHaH4EuAq+ALjOpAZhdrU3boXOYb9eBr1HG4YG0FH3tN05wdQQBW nY+A5tRiXh5dO7/K+kBc7LMkaZYVRpdvzV1047tcVNLI7V5ZRqUitxMpLwMPDKVjxKWI dqHDZOR7v+LWYY4JVsX8QTbhC6VWCjmSfvafus1Uo0tg4iW4EQF+465OKxUPzV//TBvF qUYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492918; x=1701097718; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nFCIY8a2prU+vxKx/Khs2e4u+A5y+AyU+weaY1KLmL0=; b=sXrz1AFYdpbXDxLFoTrW6M4jL3KjX+zR08+ZJpU6mjD8Rs5ppxdavRVSpsSzvhM8S8 eospmXZSgoviQbC4zioMdOnpsPUv5VGtaJF1/IiueASecce0tx/2UIcFT03kOpkLA50y inXVE/WKj1z4VOCqxOSFPIcsvZJPvDKj25Jjntd7mDyhOowDhhch6Qa4tu0uXHDsBcAw DPaWcAv1XZpUVsyDfNG0Hg7hEKXsiJ7T3j7OmR7mR9fgZ2wt3ODnx8LLjPXiaxonNQEF jE0iqOuLvxC1IDB/6rHf12lgUdjc+L5WT94WaEFOHJPz7IoBb1ja7zhQT0tI1CIeV35U w1GQ== X-Gm-Message-State: AOJu0YzplxzXef21zXisQtm0aiIAmGOI1vGoili+Ur1j6+I6JNCU6BGA KzOTBsHYd2723ea+59i5wEo2FA== X-Google-Smtp-Source: AGHT+IFWf+YmPnVGzqdxPMTnA5Iz3M/1ufBsQ/wEjLZEn7xo6vDGlv/iSCCXZT1Y23ItSWDD42yXiA== X-Received: by 2002:a05:600c:3106:b0:404:4b6f:d70d with SMTP id g6-20020a05600c310600b004044b6fd70dmr6806538wmo.17.1700492918405; Mon, 20 Nov 2023 07:08:38 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 08/14] docs/system: clarify limits of using gdbstub in system emulation Date: Mon, 20 Nov 2023 15:08:27 +0000 Message-Id: <20231120150833.2552739-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493117867100001 It seems some users will try and use the gdbstub to debug userspace inside a system emulation. While possible clarify the limitations of this approach and direct the users to a less head scratching way of debugging user-space. Signed-off-by: Alex Benn=C3=A9e Clarifies: https://gitlab.com/qemu-project/qemu/-/issues/1274 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- docs/system/gdb.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/system/gdb.rst b/docs/system/gdb.rst index 9906991b84..c0cc0c9c7e 100644 --- a/docs/system/gdb.rst +++ b/docs/system/gdb.rst @@ -60,7 +60,7 @@ As TCG cannot track all memory accesses in user-mode ther= e is no support for watchpoints. =20 Relocating code ---------------- +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 On modern kernels confusion can be caused by code being relocated by features such as address space layout randomisation. To avoid @@ -68,6 +68,17 @@ confusion when debugging such things you either need to = update gdb's view of where things are in memory or perhaps more trivially disable ASLR when booting the system. =20 +Debugging user-space in system emulation +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +While technically possible to debug a user-space program running +inside a system image it does present challenges. Kernel preemption +and execution mode changes between kernel and user mode can make it +hard to follow whats going on. Unless you are specifically trying to +debug some interaction between kernel and user-space you are better +off running your guest program with gdb either in the guest or using +a gdbserver exposed via a port to the outside world. + Debugging multicore machines =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D =20 --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493080; cv=none; d=zohomail.com; s=zohoarc; b=Sut/jbgqExYFz3ZllYrg8/VLzVnbCngY3tNmk4BG9PWUWoUnithZ2hqaw3y/RotGrFyKzxoiptmvK6RMHG760QblNAb64kj/OC0jOKXISN5Bsb9jmDCfMtcEco2+RBk09CyySsm26MXR45UenlfsX4yRPSXq6ycHfjC6KxsQ3mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493080; 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=MdYIuvPCwbs1/SkyidzDPaAAsnYLQJ1SQQvqDWTDjY4=; b=lq+SlOy7Z8QGrMaGeIvhH08bf34SqRrmEF03yunFAhFxPN+r+Vm7Hf1B17kzp1fGcyGLt39bIn31KsqXf4zHRZcHyqi5XVoaX/w7NGvq7tA6KrYAu3ieUS5pU6l01SUi1afjtXgFvhJN/WxbtT2nHSiku/pz2g8eakEvoyvptIw= 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 170049308045611.75021989987306; Mon, 20 Nov 2023 07:11:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tf-0006LZ-LN; Mon, 20 Nov 2023 10:09:11 -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 1r55tR-0005tj-Ho for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:00 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001Hr-8n for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:54 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-50943ccbbaeso6230384e87.2 for ; Mon, 20 Nov 2023 07:08:43 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e29-20020adfa45d000000b0033169451a84sm11501414wra.29.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CD30865777; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492922; x=1701097722; 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=MdYIuvPCwbs1/SkyidzDPaAAsnYLQJ1SQQvqDWTDjY4=; b=m6JTyB23Uz+26G2fTIGU0iRylMm+0RbjDkZiSu4MHuUs4PEPVq6/AF1fo/17ljRStr /+feY3oSx9RMbbT1U7eYjWKZp15GSilihxT+tSdlTo4UmiCQRdnGYpPR7fZGSW38z17n ldEoR3IAZ+rsTjFUkSikOJKGDvNyaAA2ZkeY9otPRMjbWk/xBtxbDKCmZ0LdXLk67UlL 5sf+5wVJfrqkkL+15p/2CLA9pfgBYtoLmmva/mkkjigI+EgyAYTkIFpZPSfTsS2Cw4Hh dImMv+qDYL+lSKVBlMN5EITeqnVzHp7tCVqZdqGcT70LF9fqw/W1BM/j2flIbMmD7YSo aUyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492922; x=1701097722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MdYIuvPCwbs1/SkyidzDPaAAsnYLQJ1SQQvqDWTDjY4=; b=M2XZTvNk2pfO0AllhUfNEG47fGfb0Z2qyE9FXPDQGq/L2UvYu3rHLnTkH+YH4isQlt 9G4uDpKKN3I/Rm/5HCRe7tCJi3dEu10NMikAT4puYxboUdBXcMJ/EpYE03434wd+Nuvu cRWfcb7Bzu8DANjqY/WgPozaTtrmZc/K7wLnq2tDXUYMGcdehQ6PszB3/b5ztQIKQwGy 1VRoQTNfWKBoOXHHFJEtmmzTSG0UxuVrx2MRU1xtAisZM0s4b+4trnS3Pdc03Mt+UdG0 mj8JO8mLHAAT8AxgRZVdonWtcBkpt03DstU6ycRoxVlfhW7tlGuL2MDX7UntCwK5Mh1a jB0g== X-Gm-Message-State: AOJu0YzTnXwUeBijo6Bi3AA/ePOsn72uuzRg4KKwE/U82x4KYRO9HzSt sZqmjPpy+l6/bMjruan7yEkqig== X-Google-Smtp-Source: AGHT+IHGOkrx0KapVhaxqiUy8V1IlL2HM4IzeBDQH/UBvJi7eaZoPYIvqDtpZNvM6TAVX1cDEkEiYQ== X-Received: by 2002:ac2:4469:0:b0:509:e5a4:2b03 with SMTP id y9-20020ac24469000000b00509e5a42b03mr5760174lfl.13.1700492922721; Mon, 20 Nov 2023 07:08:42 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 09/14] hw/core: skip loading debug on all failures Date: Mon, 20 Nov 2023 15:08:28 +0000 Message-Id: <20231120150833.2552739-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::136; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x136.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493081628100001 ELF_LOAD_FAILED is one of many negative return codes we can have. Lets treat any positive size_t as a success for loading. Message-Id: <20231115205542.3092038-8-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- hw/core/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 3c79283777..e7a9b3775b 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -505,7 +505,7 @@ ssize_t load_elf_ram_sym(const char *filename, clear_lsb, data_swab, as, load_rom, sym_cb); } =20 - if (ret !=3D ELF_LOAD_FAILED) { + if (ret > 0) { debuginfo_report_elf(filename, fd, 0); } =20 --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493124; cv=none; d=zohomail.com; s=zohoarc; b=e6VDlCTOfjXyjk8qNC2BshNzM/ckPF7tTuOMfEajey58yMyfF7XMknYAcbRomXrMkph8oJDsga8zxrLM1qyYes3jqR4z86m/5eRy7+TDkCExRsyb26XWJI+HEQ5Bl5Vh7qrki+xCMMFQef85E0ZDrJPp3ViSU0XbnLXzH3DqJc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493124; 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=O3M5so5KQtqF5mm95cyn9rkcyTI0JWjubshaMltcnQo=; b=S7BmZmmI03z/AWYgGHDXefMjghWgRHideSR1i1Slhdz1Tjnrm3vsZQnvPIuTgrdqFgiyDWFyUIc5qDGQ2wHtnrYhfr32HqLhXJHUQ3UGgkeiFP04oRb7J8jZ4yrsU1OM70Y2MAO7P0EdfTbaS9NbinVtDYHcA8c9A8Vue76j+UQ= 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 1700493124981710.6753720210374; Mon, 20 Nov 2023 07:12:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tu-0006ZJ-7N; Mon, 20 Nov 2023 10:09:26 -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 1r55tU-0005uu-81 for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:01 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001H0-FK for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:58 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40839807e82so11558025e9.0 for ; Mon, 20 Nov 2023 07:08:43 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n23-20020a7bcbd7000000b004064ac107cfsm13599341wmi.39.2023.11.20.07.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:38 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E0A3765778; Mon, 20 Nov 2023 15:08:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492922; x=1701097722; 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=O3M5so5KQtqF5mm95cyn9rkcyTI0JWjubshaMltcnQo=; b=EaXNvAARSoxDYNDl/4Wl5cL1fUfxP9m0OHmNRObetLADqmYTz7LBVHdRgTuB4SFF4k Y+oJEYFOEin3z6rsQeQ5y+5D9jM7iN0TdAajettLd06KxIlraShzi3ewLJCIet2y8Hl4 r+vgVFVM9ADbcK9IHao4laJKlVqIlI7Elrwzp4hsL1Lja9vyDU2ilR+L8cJtZoug3TUP Rg/ndm2I0WVcnyGBh48dcoorN8ZxlMq04tCZ5MUgppe8pg3yUP50Iwlgt2knitySd7eC XCYaRCPnrGFtkzQhkFJKlUuxYKen1f42s2bh7n2CghK3pGTUoT1x9mnm2Sbm2CsbJ2QI WrXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492922; x=1701097722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O3M5so5KQtqF5mm95cyn9rkcyTI0JWjubshaMltcnQo=; b=ADmvbEDs+SIv3SLFF74LwLVaUESFyjzD0SBjzGrrfR/Arswuv0v4N2bIWmlKvW1aYr Faf2eeCNPZ+AjXfP4f5iTapNqK4vHqzAHXhkwCbE6zPSQb4zuY5oMCtKQe6dpRNtCJ3d 8BXxcCIosk8RUCChnUlsvULJL8rmstQnDT4I1SAIs3rn0ld0J75YnK3k/blHyn90P3wI pV5fugfQ/xZ5AmrBCAOobUVIp0guaUvmyfH2881P6F1VUSfP6sSjvDEOJmH0cZmn+b2v A1O/Pg0ecpBtwrNzi03QfCJv0/usD8B9oxoKYJdEjPNt2nJ4I3rA95hXgl3k2Ohls1e1 7d0w== X-Gm-Message-State: AOJu0YxCX1tX8gBFwnkFHLWkMBbV3UxCsBTfdSBuw1IHzA4Yv6Rym+xN /38LhPyY6AffUTN48QJxrdW1Og== X-Google-Smtp-Source: AGHT+IEksQ0r4JHvcvr44NsEm1g1mI2GHXdi5NLIYndv2caLqfR80ZQE9BRMSKjHlV173djZWfW4AQ== X-Received: by 2002:a05:600c:4f87:b0:407:4701:f9e with SMTP id n7-20020a05600c4f8700b0040747010f9emr6883890wmq.17.1700492922440; Mon, 20 Nov 2023 07:08:42 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 10/14] testing: move arm system tests into their own folder Date: Mon, 20 Nov 2023 15:08:29 +0000 Message-Id: <20231120150833.2552739-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493125959100003 Prepare for expanding the arm system tests by cleaning up the test directory. Message-Id: <20231115205542.3092038-9-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/arm/Makefile.softmmu-target | 5 ++--- tests/tcg/arm/{ =3D> system}/test-armv6m-undef.S | 0 tests/tcg/arm/{ =3D> system}/test-armv6m-undef.ld | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename tests/tcg/arm/{ =3D> system}/test-armv6m-undef.S (100%) rename tests/tcg/arm/{ =3D> system}/test-armv6m-undef.ld (100%) diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index 8b546e2aa3..7857ab9324 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -3,7 +3,7 @@ # ARM SoftMMU tests - included from tests/tcg/Makefile # =20 -ARM_SRC=3D$(SRC_PATH)/tests/tcg/arm +ARM_SRC=3D$(SRC_PATH)/tests/tcg/arm/system =20 # Set search path for all sources VPATH +=3D $(ARM_SRC) @@ -12,7 +12,6 @@ ARM_TESTS=3Dtest-armv6m-undef =20 TESTS +=3D $(ARM_TESTS) =20 -CFLAGS+=3D-Wl,--build-id=3Dnone -x assembler-with-cpp LDFLAGS+=3D-nostdlib -N -static =20 %: %.S %.ld @@ -20,7 +19,7 @@ LDFLAGS+=3D-nostdlib -N -static =20 # Specific Test Rules =20 -test-armv6m-undef: EXTRA_CFLAGS+=3D-mcpu=3Dcortex-m0 -mfloat-abi=3Dsoft +test-armv6m-undef: EXTRA_CFLAGS+=3D-mcpu=3Dcortex-m0 -mfloat-abi=3Dsoft -W= l,--build-id=3Dnone -x assembler-with-cpp =20 run-test-armv6m-undef: QEMU_OPTS+=3D-semihosting -M microbit -kernel =20 diff --git a/tests/tcg/arm/test-armv6m-undef.S b/tests/tcg/arm/system/test-= armv6m-undef.S similarity index 100% rename from tests/tcg/arm/test-armv6m-undef.S rename to tests/tcg/arm/system/test-armv6m-undef.S diff --git a/tests/tcg/arm/test-armv6m-undef.ld b/tests/tcg/arm/system/test= -armv6m-undef.ld similarity index 100% rename from tests/tcg/arm/test-armv6m-undef.ld rename to tests/tcg/arm/system/test-armv6m-undef.ld --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1700494594952121.28051685927699; Mon, 20 Nov 2023 07:36:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C614718E1; Mon, 20 Nov 2023 10:36:33 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 53A041924; Mon, 20 Nov 2023 10:10:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BF80F1859; Mon, 20 Nov 2023 10:08:54 -0500 (EST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A40AF17C5 for ; Mon, 20 Nov 2023 10:08:47 -0500 (EST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40a46ea95f0so19077305e9.2 for ; Mon, 20 Nov 2023 07:08:47 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b11-20020a05600010cb00b00332c0d256c5sm6570827wrx.80.2023.11.20.07.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0279F655DF; Mon, 20 Nov 2023 15:08:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492926; x=1701097726; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I9723xBaPChd48Q2Z6VrVXqqZ/PYaPzTSFScKX3Q69c=; b=AmzbNoIfqXsHymZfxGNhS60nfWpUtm1e5pju632AWhLXpUkB8ztuhl16k3TCwOFMNR N95wHKEVwZu80S8WycmQFOfEee1rOk3MTpeFH8Q8YqQHSlp0dhjfysjpp9DoEMDoDM7c xbD0erXuciF/hPxCGUYRtmsPvAIGbJMu8oVnMNWeVpCQgxNu8/ZBRKx+gRRGE/6r4UWr Or16pzIzXKBQXyS0eA2sn8gIvluMTD4JTLj5I3u8SCnPCJ11hLGsYsnz6IYA3dpwS87G 2nNlTuVcCgYDJqc7qNAt8WNeJVa8He+5tLpuuW4Mo1MiFCtffJdRCouwUMBmLlntupCc 3COQ== X-Gm-Message-State: AOJu0YzyCI/Mb4ineblwX2844QjvBnMneGFlunyBcqLWMLaaT+dmqxGc BTz7ONuBiJSWhGd4UmwWxDKq5Q== X-Google-Smtp-Source: AGHT+IEW7RMJwGLr87ADHMs2b6yOzpNnUGuakZWs8wVeD9lyvE06mI+6Ofa+E8vaaSgh9dgZGPV2dg== X-Received: by 2002:a05:600c:3ba2:b0:3fe:1b4e:c484 with SMTP id n34-20020a05600c3ba200b003fe1b4ec484mr6461662wms.5.1700492926286; Mon, 20 Nov 2023 07:08:46 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/14] tests/tcg: enable arm softmmu tests Date: Mon, 20 Nov 2023 15:08:30 +0000 Message-Id: <20231120150833.2552739-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-1-alex.bennee@linaro.org> MIME-Version: 1.0 Message-ID-Hash: LIYWLA2ISPWSQCTMYE6VHXEHXD6CI2ND X-Message-ID-Hash: LIYWLA2ISPWSQCTMYE6VHXEHXD6CI2ND X-MailFrom: alex.bennee@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1700494596057100001 To make it easier to test 32 bit Arm softmmu issues implement a basic boot.S so we can build the multiarch tests. Currently CHECK_UNALIGNED is disabled as I haven't got the right magic set for it to work. Message-Id: <20231115205542.3092038-10-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- v2 - use endf macro for global function symbols in boot.S --- tests/tcg/arm/Makefile.softmmu-target | 64 +++++- tests/tcg/arm/system/boot.S | 301 ++++++++++++++++++++++++++ tests/tcg/arm/system/kernel.ld | 24 ++ 3 files changed, 379 insertions(+), 10 deletions(-) create mode 100644 tests/tcg/arm/system/boot.S create mode 100644 tests/tcg/arm/system/kernel.ld diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index 7857ab9324..aadc12767e 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -8,20 +8,64 @@ ARM_SRC=3D$(SRC_PATH)/tests/tcg/arm/system # Set search path for all sources VPATH +=3D $(ARM_SRC) =20 -ARM_TESTS=3Dtest-armv6m-undef +# Specific Test Rules =20 -TESTS +=3D $(ARM_TESTS) +test-armv6m-undef: test-armv6m-undef.S + $(CC) -mcpu=3Dcortex-m0 -mfloat-abi=3Dsoft \ + -Wl,--build-id=3Dnone -x assembler-with-cpp \ + $< -o $@ -nostdlib -N -static \ + -T $(ARM_SRC)/$@.ld =20 -LDFLAGS+=3D-nostdlib -N -static +run-test-armv6m-undef: QEMU_OPTS+=3D-semihosting -M microbit -kernel =20 -%: %.S %.ld - $(CC) $(CFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_S= RC)/$@.ld +ARM_TESTS+=3Dtest-armv6m-undef =20 -# Specific Test Rules +# These objects provide the basic boot code and helper functions for all t= ests +CRT_OBJS=3Dboot.o =20 -test-armv6m-undef: EXTRA_CFLAGS+=3D-mcpu=3Dcortex-m0 -mfloat-abi=3Dsoft -W= l,--build-id=3Dnone -x assembler-with-cpp +ARM_TEST_SRCS=3D$(wildcard $(ARM_SRC)/*.c) +ARM_TESTS+=3D$(patsubst $(ARM_SRC)/%.c, %, $(ARM_TEST_SRCS)) =20 -run-test-armv6m-undef: QEMU_OPTS+=3D-semihosting -M microbit -kernel +CRT_PATH=3D$(ARM_SRC) +LINK_SCRIPT=3D$(ARM_SRC)/kernel.ld +LDFLAGS=3D-Wl,-T$(LINK_SCRIPT) +CFLAGS+=3D-nostdlib -ggdb -O0 $(MINILIB_INC) +LDFLAGS+=3D-static -nostdlib -N $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(ARM_SRC)/%.S + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +memory: CFLAGS+=3D-DCHECK_UNALIGNED=3D0 + +# Running +QEMU_BASE_MACHINE=3D-M virt -cpu max -display none +QEMU_OPTS+=3D$(QEMU_BASE_MACHINE) -semihosting-config enable=3Don,target= =3Dnative,chardev=3Doutput -kernel + +# Simple Record/Replay Test +.PHONY: memory-record +run-memory-record: memory-record memory + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=3D$<.out$(COMMA)id=3Doutput \ + -icount shift=3D5$(COMMA)rr=3Drecord$(COMMA)rrfile=3Drecord.bin \ + $(QEMU_OPTS) memory) + +.PHONY: memory-replay +run-memory-replay: memory-replay run-memory-record + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=3D$<.out$(COMMA)id=3Doutput \ + -icount shift=3D5$(COMMA)rr=3Dreplay$(COMMA)rrfile=3Drecord.bin \ + $(QEMU_OPTS) memory) + +EXTRA_RUNS+=3Drun-memory-replay =20 -# We don't currently support the multiarch system tests -undefine MULTIARCH_TESTS +TESTS +=3D $(ARM_TESTS) $(MULTIARCH_TESTS) +EXTRA_RUNS+=3D$(MULTIARCH_RUNS) diff --git a/tests/tcg/arm/system/boot.S b/tests/tcg/arm/system/boot.S new file mode 100644 index 0000000000..7915502ae4 --- /dev/null +++ b/tests/tcg/arm/system/boot.S @@ -0,0 +1,301 @@ +/* + * Minimal ArmV7 system boot code. + * + * Using semihosting for serial output and exit functions. + */ + +/* + * Semihosting interface on ARM AArch32 + * R0 - semihosting call number + * R1 - semihosting parameter + */ +#define semihosting_call svc 0x123456 +#define SYS_WRITEC 0x03 /* character to debug channel */ +#define SYS_WRITE0 0x04 /* string to debug channel */ +#define SYS_EXIT 0x18 + +#define ADP_Stopped_ApplicationExit 0x20026 +#define ADP_Stopped_InternalError 0x20024 + +/* + * Helper macro for the linker calling subroutines from the C code. + */ +.macro endf name + .global \name + .type \name, %function + .size \name, . - \name +.endm + + .section .interrupt_vector, "ax" + .align 5 + +vector_table: + b reset /* reset vector */ + b undef_instr /* undefined instruction vector */ + b software_intr /* software interrupt vector */ + b prefetch_abort /* prefetch abort vector */ + b data_abort /* data abort vector */ + nop /* reserved */ + b IRQ_handler /* IRQ vector */ + b FIQ_handler /* FIQ vector */ + + .text +__start: + ldr r0, =3Dvector_table + mcr p15, 0, r0, c12, c0, 0 /* Set up VBAR */ + + ldr sp, =3Dstack_end /* Set up the stack */ + bl mmu_setup /* Set up the MMU */ + bl main /* Jump to main */ + +endf __start + +_exit: + cmp r0, #0 + ite EQ // if-then-else. "EQ" is for if equal, else otherwise + ldreq r1, =3DADP_Stopped_ApplicationExit // if r0 =3D=3D 0 + ldrne r1, =3DADP_Stopped_InternalError // else + mov r0, #SYS_EXIT + semihosting_call + +endf _exit + + /* + * Helper Functions + */ + +mmu_setup: + /* + * The MMU setup for this is very simple using two stage one + * translations. The first 1Mb section points to the text + * section and the second points to the data and rss. + * Currently the fattest test only needs ~50k for that so we + * have plenty of space. + * + * The short descriptor Section format is as follows: + * + * PA[31:20] - Section Base Address + * NS[19] - Non-secure bit + * 0[18] - Section (1 for Super Section) + * nG[17] - Not global bit + * S[16] - Shareable + * TEX[14:12] - Memory Region Attributes + * AP[15, 11:10] - Access Permission Bits + * IMPDEF[9] + * Domain[8:5] + * XN[4] - Execute never bit + * C[3] - Memory Region Attributes + * B[2] - Memory Region Attributes + * 1[1] + * PXN[0] - Privileged Execute Never + * + * r0 - point at the table + * r1 - address + * r2 - entry + * r3 - common section bits + * r4 - scratch + */ + + /* + * Memory Region Bits + * + * TEX[14:12] =3D 000 + * C[3] =3D 1 + * B[2] =3D 1 + * + * Outer and Inner WB, no write allocate + */ + mov r3, #0 + ldr r4, =3D(3 << 2) + orr r3, r4, r4 + + /* Section bit */ + orr r3, r3, #2 + + /* Page table setup (identity mapping). */ + ldr r0, =3Dttb + + /* First block: .text/RO/execute enabled */ + ldr r1, =3D.text + ldr r2, =3D0xFFF00000 /* 1MB block alignment */ + and r2, r1, r2 + orr r2, r2, r3 /* common bits */ + orr r2, r2, #(1 << 15) /* AP[2] =3D 1 */ + orr r2, r2, #(1 << 10) /* AP[0] =3D 1 =3D> RO @ PL1 */ + + lsr r4, r2, #(20 - 2) + str r2, [r0, r4, lsl #0] /* write entry */ + + /* Second block: .data/RW/no execute */ + ldr r1, =3D.data + ldr r2, =3D0xFFF00000 /* 1MB block alignment */ + and r2, r1, r2 + orr r2, r2, r3 /* common bits */ + orr r2, r2, #(1 << 10) /* AP[0] =3D 1 =3D> RW @ PL1 */ + orr r2, r2, #(1 << 4) /* XN[4] =3D> no execute */ + + lsr r4, r2, #(20 - 2) + str r2, [r0, r4, lsl #0] /* write entry */ + + /* + * DACR - Domain Control + * + * Enable client mode for domain 0 (we don't use any others) + */ + ldr r0, =3D0x1 + mcr p15, 0, r0, c3, c0, 0 + + /* + * TTCBR - Translation Table Base Control Register + * + * EAE[31] =3D 0, 32-bit translation, short descriptor format + * N[2:0] =3D 5 ( TTBRO uses 31:14-5 =3D> 9 bit lookup stage ) + */ + ldr r0, =3D0x5 + mcr p15, 0, r0, c1, c0, 2 + + /* + * TTBR0 -Translation Table Base Register 0 + * + * [31:9] =3D Base address of table + * + * QEMU doesn't really care about the cache sharing + * attributes so we don't need to either. + */ + ldr r0, =3Dttb + mcr p15, 0, r0, c2, c0, 0 + + /* + * SCTLR- System Control Register + * + * TE[30] =3D 0, exceptions to A32 state + * AFE[29] =3D 0, AP[0] is the access permissions bit + * EE[25] =3D 0, Little-endian + * WXN[19] =3D 0 =3D no effect, Write does not imply XN (execute never) + * I[12] =3D Instruction cachability control + * C[2] =3D Data cachability control + * M[0] =3D 1, enable stage 1 address translation for EL0/1 + * + * At this point virtual memory is enabled. + */ + ldr r0, =3D0x1005 + mcr p15, 0, r0, c1, c0, 0 + + isb + + mov pc, lr /* done, return to caller */ + +/* Output a single character to serial port */ +__sys_outc: + STMFD sp!, {r0-r1} // push r0, r1 onto stack + mov r1, sp + mov r0, #SYS_WRITEC + semihosting_call + LDMFD sp!, {r0-r1} // pop r0, r1 from stack + bx lr + +endf __sys_outc + +reset: + ldr r1, =3Dreset_error + b exception_handler + +undef_instr: + ldr r1, =3Dundef_intr_error + b exception_handler + +software_intr: + ldr r1, =3Dsoftware_intr_error + b exception_handler + +prefetch_abort: + ldr r1, =3Dprefetch_abort_error + b exception_handler + +data_abort: + ldr r1, =3Ddata_abort_error + b exception_handler + +IRQ_handler: + ldr r1, =3Dirq_error + b exception_handler + +FIQ_handler: + ldr r1, =3Dfiq_error + b exception_handler + +/* + * Initiate a exit semihosting call whenever there is any exception + * r1 already holds the string. + */ +exception_handler: + mov r0, #SYS_WRITE0 + semihosting_call + mov r0, #SYS_EXIT + mov r1, #1 + semihosting_call + +endf exception_handler + +/* + * We implement a stub raise() function which errors out as tests + * shouldn't trigger maths errors. + */ + .global raise +raise: + mov r0, #SYS_WRITE0 + ldr r1, =3Dmaths_error + semihosting_call + mov r0, #SYS_EXIT + ldr r1, =3DADP_Stopped_InternalError + semihosting_call + +endf raise + + .data + +.data + +reset_error: + .ascii "Reset exception occurred.\n\0" + +undef_intr_error: + .ascii "Undefined Instruction Exception Occurred.\n\0" + +software_intr_error: + .ascii "Software Interrupt Occurred.\n\0" + +prefetch_abort_error: + .ascii "Prefetch Abort Occurred.\n\0" + +data_abort_error: + .ascii "Data Abort Occurred.\n\0" + +irq_error: + .ascii "IRQ exception occurred.\n\0" + +fiq_error: + .ascii "FIQ exception occurred.\n\0" + +maths_error: + .ascii "Software maths exception.\n\0" + + + /* + * 1st Stage Translation table + * 4096 entries, indexed by [31:20] + * each entry covers 1Mb of address space + * aligned on 16kb + */ + .align 15 +ttb: + .space (4096 * 4), 0 + + .align 12 + + /* Space for stack */ + .align 5 + .section .bss +stack: + .space 65536, 0 +stack_end: diff --git a/tests/tcg/arm/system/kernel.ld b/tests/tcg/arm/system/kernel.ld new file mode 100644 index 0000000000..7b3a76dcbf --- /dev/null +++ b/tests/tcg/arm/system/kernel.ld @@ -0,0 +1,24 @@ +ENTRY(__start) + +SECTIONS +{ + /* virt machine, RAM starts at 1gb */ + . =3D (1 << 30); + .text : { + *(.text) + } + .rodata : { + *(.rodata) + } + /* align r/w section to next 2mb */ + . =3D ALIGN(1 << 21); + .data : { + *(.data) + } + .bss : { + *(.bss) + } + /DISCARD/ : { + *(.ARM.attributes) + } +} --=20 2.39.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Wed Nov 27 04:58:53 2024 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=1700492996; cv=none; d=zohomail.com; s=zohoarc; b=jsinCihmVJadtek4gJ2et46sHizslPzW0fzlhRPWFXbBBYK2m9A7Ge75Yz1zI/w3+DGTmpTWWZR9etFO/1peO/FxYPBROkL/nsX2rtuL7azFcP+wRvL9jiUhzcTr02EqhPh/aLPNuLdJEoQ5csPlugwu3uN+6YaFPBuxV7ipVZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700492996; 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=Gyb1IbDacWS+M0sLJpuM3eBiDXIMLrNrMXya8IYdc1k=; b=ZTTBAR3eQ1P4HTgy1l85gi5jAXa2YWAzmPHRLSSk8RU4Yb8ykqbjqQJperTk0+TyviPDQHHjEW/oZCLKaqric9hr7KrvyzNfTtLIO4R5dxxcPEl1dnVVQTAFXVRHLcX0YswF1JSYyQhewfmhvQawaSnmJjZO3QjQE/aFkcmNYTE= 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 1700492996389211.6844024463985; Mon, 20 Nov 2023 07:09:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55tk-0006SD-JQ; Mon, 20 Nov 2023 10:09:16 -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 1r55tU-0005vD-So for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:02 -0500 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001Im-Nc for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:00 -0500 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2c5071165d5so55854991fa.0 for ; Mon, 20 Nov 2023 07:08:45 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fb11-20020a05600c520b00b004076f522058sm18057174wmb.0.2023.11.20.07.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 185C965779; Mon, 20 Nov 2023 15:08:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492924; x=1701097724; 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=Gyb1IbDacWS+M0sLJpuM3eBiDXIMLrNrMXya8IYdc1k=; b=YDrUotk2GqBTeKyBVfDfKYhW2+uvDVEcLj54dmHdwuBlQ7hFoRvMRG+yLoFwYvm66u 2L+zcbLfOySVXLLQf73fdXEmYAtIMNKsJOYn2uBqat62RHAWYbcfzLqBNgX2qxIbxRTT LYhe8uZDgCq/ngdkOr8iSZOWG5JRVSHqK6uNEYlO8EQDPn+tE73YMpXY6rXHiEnkwApB pucR+xZCRN2kPAi2KF56uRc+UyuFqimrMJy2lXFKLQXa4z95JnIGC9/6FUslf37irUe/ loE3iFlUadrKKareSf8sy3yfJ8CQcNjMmVyDJdLoRcUkm8JnJcVwXw9fjl4UhBUZV4Nu RtcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492924; x=1701097724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gyb1IbDacWS+M0sLJpuM3eBiDXIMLrNrMXya8IYdc1k=; b=IB57HMTfqAIMXOf56DAv4Z2GRR9y6lmbxNO5Nkuvgs2FxLWsYUZJsQwNd8SgCKMXIu gfYKgSjyCb6O+riSPA+de3t9JmeodS3qB8etAUeiFuWLhwSqzfn26yHUObtnHSgzVk2D njOONIly7HEeZbmuOvVh3ehqqyF95W9ge+Wh/YREGIaz7t1SUo8J+GoSCeAiTSOptfPf 7zBkLNPWdYL2CAJryflgz2CsbFsm/pVMfihIuYOC8WhegJZcf9/ahZRfzZidqJYKYIo/ n9WsZfCUo2BcKe08aISmHcx6x1p61tXAqonTZhkYrl21x8C8JnB+qUZ8nAKAnFW4TnUI ItRg== X-Gm-Message-State: AOJu0Yzxmu/KvprNYCcQXcgRAe5Z7xSBWZkHQN6kemu2hrFHdrzP+J3y 7q1J6/yCStnIRxw3SngrJrH7Hg== X-Google-Smtp-Source: AGHT+IHLyAsKb5DQBFBdNKB3pZIZItQt081kS32+KzZw9ZLhVLlEXwDuZXcYASZYowaxzLW/3EEuMQ== X-Received: by 2002:a2e:8ec2:0:b0:2c5:3139:2d04 with SMTP id e2-20020a2e8ec2000000b002c531392d04mr5312124ljl.47.1700492924291; Mon, 20 Nov 2023 07:08:44 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 12/14] tests/tcg: enable semiconsole test for Arm Date: Mon, 20 Nov 2023 15:08:31 +0000 Message-Id: <20231120150833.2552739-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::22e; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22e.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700492997845100008 This still remains a MANUAL test due to blocking issues. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/arm/system/semiconsole.c | 42 +++++++++++++++++++++++++++ tests/tcg/arm/Makefile.softmmu-target | 9 ++++++ 2 files changed, 51 insertions(+) create mode 100644 tests/tcg/arm/system/semiconsole.c diff --git a/tests/tcg/arm/system/semiconsole.c b/tests/tcg/arm/system/semi= console.c new file mode 100644 index 0000000000..206dd60eed --- /dev/null +++ b/tests/tcg/arm/system/semiconsole.c @@ -0,0 +1,42 @@ +/* + * Semihosting Console Test + * + * Copyright (c) 2019 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +#define SYS_READC 0x7 + +uintptr_t __semi_call(uintptr_t type, uintptr_t arg0) +{ + register uintptr_t t asm("r0") =3D type; + register uintptr_t a0 asm("r1") =3D arg0; +#ifdef __thumb__ +# define SVC "svc 0xab" +#else +# define SVC "svc 0x123456" +#endif + asm(SVC : "=3Dr" (t) + : "r" (t), "r" (a0)); + + return t; +} + +int main(void) +{ + char c; + + ml_printf("Semihosting Console Test\n"); + ml_printf("hit X to exit:"); + + do { + c =3D __semi_call(SYS_READC, 0); + __sys_outc(c); + } while (c !=3D 'X'); + + return 0; +} diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index aadc12767e..4c9264057f 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -48,6 +48,15 @@ memory: CFLAGS+=3D-DCHECK_UNALIGNED=3D0 QEMU_BASE_MACHINE=3D-M virt -cpu max -display none QEMU_OPTS+=3D$(QEMU_BASE_MACHINE) -semihosting-config enable=3Don,target= =3Dnative,chardev=3Doutput -kernel =20 +# console test is manual only +QEMU_SEMIHOST=3D-serial none -chardev stdio,mux=3Don,id=3Dstdio0 -semihost= ing-config enable=3Don,chardev=3Dstdio0 -mon chardev=3Dstdio0,mode=3Dreadli= ne +run-semiconsole: QEMU_OPTS=3D$(QEMU_BASE_MACHINE) $(QEMU_SEMIHOST) -kernel +run-semiconsole: semiconsole + $(call skip-test, $<, "MANUAL ONLY") + $(if $(V),@printf " %-7s %s %s\n" "TO RUN" $(notdir $(QEMU)) "$(QEMU_OPT= S) $<") +run-plugin-semiconsole-with-%: semiconsole + $(call skip-test, $<, "MANUAL ONLY") + # Simple Record/Replay Test .PHONY: memory-record run-memory-record: memory-record memory --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493207; cv=none; d=zohomail.com; s=zohoarc; b=gkWBPKYARdzhfo9YFWUh6V9jz0IadlLauHcbBvgSPCVvrn5aEIJiT+pckT1p8U++T/SicIoiNpKEdyy+3kTTK1U79PwDa8aabaQkJAZ08w/SfNkchEdA1ftwlXFNUpW2fUDep2oTdCAyQ5mYxWJ7an5o/8spZ6YKQUkwipppPPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493207; 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=VAfJwOx8Ygtt+c022BojU5oHMeEbaLxK0MlwB3wYne0=; b=KGl390klfpRPUesmYKQm3doBSlbnAq7ADvwCGy0b8sLNeMc0dBMPFnzv7xXf9HBZkHTGzdpQSt6K5kUFAHskqbDwQXQeIfS+J567uB7JZqtTNqelss+5WHmJuOLeQTx3cwzHY77RjoBognOv0d+exEXPDzr5C9BTSmJOUSDXufg= 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 1700493207028482.5062385732324; Mon, 20 Nov 2023 07:13:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55te-0006Ir-8s; Mon, 20 Nov 2023 10:09:10 -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 1r55tS-0005tz-PU for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:01 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001Jr-EO for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:58 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-32d81864e3fso2864688f8f.2 for ; Mon, 20 Nov 2023 07:08:45 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z5-20020adff745000000b0032d829e10c0sm11417440wrp.28.2023.11.20.07.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2E96A6577A; Mon, 20 Nov 2023 15:08:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492924; x=1701097724; 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=VAfJwOx8Ygtt+c022BojU5oHMeEbaLxK0MlwB3wYne0=; b=wV/yFCVSisG+kHD1Tl5yJpTEv/Cyau0OGOYjp2t//3utln8nDJd7tH7Zsv9u/F3Pw5 XFAIfAdyTb8/dvLiwKfTMiM/CQqsWq/q25Xc+qExri5M8kyzqV+VHd+Lr+6t86sLb7xq nxBH9hTa8BzuSKzFttnL0ndoNvcxfTRWd9RmZQBoUICy5ir2EI9auRjmE5KhyPS10fSW W2KKpWi+rxjj42F/sF64pS6Jz+hcRLjxJKCEJGDritLFt0GKN9RUChurawq4Qi9J7iEx wUcIgUGcxNz35Tk2BTcuDT79R1FCciJieKXnvjoc6BPktt4hdEwkPR/A9LreM79zN1IN fHnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492924; x=1701097724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VAfJwOx8Ygtt+c022BojU5oHMeEbaLxK0MlwB3wYne0=; b=B1Im3e2NzoQfWIwvWkcGMNvtC6UMYkPX1irAu+OohhxiyaY3TbjoLIDPhL5ZhAxOLv gnuMd0X1tM/TZ2EipjyHPvJxwT0BW3xalSJKi1Imby418rcLGOMH+LLKsE9E789UPux8 ol9b35hox6tKHh+rIN309pRutdP5B1fLDYWz4E4uNabe9exWAu5dok08APXh8AOJve2r wgxXuS052uZKZ9+yMF1+8h02X1ImSmLQq9Xr0zWWo4NN0Z+m0n80ZxcyuKVEZBDIOBdA /R2MDaiOcqEIDS7ioYO0+qGbh70ShdNtjWSAgAkegKu7JDwXVrN+0Jk+KrfZafjw7FWB xB+A== X-Gm-Message-State: AOJu0YznPc9lrKsSThU3GJBlNZlPCL2ihyjq04KhNW+clZ5vZI5Ql7uG GGaIVzPr/LCFNE/F6tUt0UhAFA== X-Google-Smtp-Source: AGHT+IFa650AYTf3VLK7g/UER2awl4G75Vh4hx7YpqSh0koO/lD2OIHtwz4tq8MBLYM+c3LLFegv6A== X-Received: by 2002:adf:f610:0:b0:32d:aa14:875d with SMTP id t16-20020adff610000000b0032daa14875dmr4380189wrp.29.1700492924714; Mon, 20 Nov 2023 07:08:44 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin Subject: [PATCH v2 13/14] configure: don't try a "native" cross for linux-user Date: Mon, 20 Nov 2023 15:08:32 +0000 Message-Id: <20231120150833.2552739-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493208645100003 As 32 bit x86 become rarer we are starting to run into problems with search paths. Although we switched to a Debian container we still favour the native CC on a Bookworm host. As a result we have a broken cross compile setup which then fails to build with: BUILD i386-linux-user guest-tests In file included from /usr/include/linux/stat.h:5, from /usr/include/bits/statx.h:31, from /usr/include/sys/stat.h:465, from /home/alex/lsrc/qemu.git/tests/tcg/multiarch/linux/= linux-test.c:28: /usr/include/linux/types.h:5:10: fatal error: asm/types.h: No such file o= r directory 5 | #include | ^~~~~~~~~~~~~ compilation terminated. make[1]: *** [Makefile:119: linux-test] Error 1 make: *** [/home/alex/lsrc/qemu.git/tests/Makefile.include:50: build-tcg-= tests-i386-linux-user] Error 2 This is likely to affect more and more linux-user builds so wrap the whole check in a test for softmmu targets (aka bare metal) which don't worry about such header niceties. This allows us to keep using the host compiler for softmmu tests and the roms. Signed-off-by: Alex Benn=C3=A9e --- v2 - split fix for tests/docker: replace fedora-i386 with debian-i686 as still in my tree ;-) - didn't apply dpb rb due to change requested by bonzini --- configure | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 9ea0bf5698..42fe4d0510 100755 --- a/configure +++ b/configure @@ -1391,16 +1391,19 @@ probe_target_compiler() { done =20 try=3Dcross - case "$target_arch:$cpu" in - aarch64_be:aarch64 | \ - armeb:arm | \ - i386:x86_64 | \ - mips*:mips64 | \ - ppc*:ppc64 | \ - sparc:sparc64 | \ - "$cpu:$cpu") - try=3D'native cross' ;; - esac + # For softmmu/roms we might be able to use the host compiler + if [ "${1%softmmu}" !=3D "$1" ]; then + case "$target_arch:$cpu" in + aarch64_be:aarch64 | \ + armeb:arm | \ + i386:x86_64 | \ + mips*:mips64 | \ + ppc*:ppc64 | \ + sparc:sparc64 | \ + "$cpu:$cpu") + try=3D'native cross' ;; + esac + fi eval "target_cflags=3D\${cross_cc_cflags_$target_arch}" for thistry in $try; do case $thistry in --=20 2.39.2 From nobody Wed Nov 27 04:58:53 2024 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=1700493062; cv=none; d=zohomail.com; s=zohoarc; b=LTrU5q042eaDCAqunxf/7HD4wSvxDHrF4D6QqdLt0ZTwXGrJq/lKqr3zgAroh3IWXBm8xvD087k7TWUabp7wAT70otRvmBKshgDot0+xPccx7LGiABdgHJg/MJSLtqC8SYN0dUKlYvSWQO8RoxGWSyfdF2pe1wJb8Wl51C1lUdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700493062; 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=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; b=EKS1r1ES6lgq1OUUuzibzlwHW77ir2HCRvbV7Qv9Q+KJwf9TvzpFZSgBaQgjoNuhuGPER4LzP9JpPETSgalr6yy4Z3tYWY82m89ijlbvlu/DajRmUK46xY0ifDLXq6LENGBGwD6gwXcSFfda4zJMUeB0b1qHMCXZAIVmCCGzXMM= 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 1700493062828174.36560644698125; Mon, 20 Nov 2023 07:11:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r55ty-0006gD-8P; Mon, 20 Nov 2023 10:09:30 -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 1r55tU-0005v8-8r for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:01 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001J4-FF for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:59 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-408382da7f0so18221305e9.0 for ; Mon, 20 Nov 2023 07:08:45 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c190700b004064cd71aa8sm13821581wmq.34.2023.11.20.07.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 456B16577B; Mon, 20 Nov 2023 15:08:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492924; x=1701097724; 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=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; b=s90ZyPdy82Yrqg579JYbDvzGJF3c7EglpDX0o35QKX76cq5VqKFUEJDSgjL6vGNafe kx06A0He0O65aLvpQxF3ZhBg8MLslq7Oy5fF/IOESm0QiIB9oXtb3CZKD+DgT3i0N13V qkTlv24sMVSfgWtO7Yh7bzos63KUOKjEWig+g9MbwP904/OLuh0iuYOBDe4AO8la5cN5 fIdAXIhbJZKAU+9ECk1/6eVgTWNfyy6zi8yTGU7tqln87LeyRXuRI6x90tTv4s4lbQfC wrWQSEUZK1vTkc484vrtWiO3j/hCGCqsSQaaueonG0mel7U1Kyk+YoKKco4cVjFOWhDx qfEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492924; x=1701097724; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; b=R9q+jnSm6jOmLDXlqKPvgLhpODWmjIJecL9lSuj3OdIetKNHA+gZqTzNgy8nsPzoCD k8r7EmUDjEygLVLVMGGfdKKCbOdsYnTJ800zzloy1DebuWN2fqD18x9cITN/0YNQtJEp MKXOlnUHuSfWL7j6uiUT8X9Nz8Bdyi5t9HIHhZ5bVVRZYOuBp9Dh9fq+QIk+z8ph4pcF fETFNDcjP/wIdMyfjE3aR44P/HSEpsmlcDPvIJ9/08FoReH1gKasJA7bG23lcz06mMFY sVJi1izjEWmkVTBI31l9sK9rRVFoppStq2Qf8Sxv8pm9am+yQuv9/LopYRH/XeabVOeB Pe0Q== X-Gm-Message-State: AOJu0Yyjw68sJT0nqRaCg/yzZ/VLwKNKj+YJF93W9+WzlzhvoRJg4EgA kJ3Uhay1853X3BNO9MvLMKVfrQ== X-Google-Smtp-Source: AGHT+IFtrpKoOweyLBVbJYsULSquKdUfZt6SKEqmItg6UkkT+VYKxxReEaau/NnnqZgOpjdO1OuFHw== X-Received: by 2002:a05:600c:3108:b0:409:7aa9:a903 with SMTP id g8-20020a05600c310800b004097aa9a903mr6252825wmo.19.1700492924535; Mon, 20 Nov 2023 07:08:44 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , Luis Machado Subject: [PATCH v2 14/14] tests/tcg: finesse the registers check for "hidden" regs Date: Mon, 20 Nov 2023 15:08:33 +0000 Message-Id: <20231120150833.2552739-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-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::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 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: 1700493063771100001 The reason the ppc64 and s390x test where failing was because gdb hides them although they are still accessible via regnum. We can re-arrange the test a little bit and include these two arches in our test. We still don't explicitly fail for registers that just disappear like in the ARM case: xml-tdesc has 228 registers remote-registers has 219 registers of which 0 are hidden {'name': 'CNTP_CVAL', 'regnum': 96} wasn't seen in remote-registers {'name': 'CNTV_CVAL', 'regnum': 101} wasn't seen in remote-registers {'name': 'PAR', 'regnum': 113} wasn't seen in remote-registers {'name': 'CPUACTLR', 'regnum': 114} wasn't seen in remote-registers {'name': 'CPUECTLR', 'regnum': 127} wasn't seen in remote-registers {'name': 'CPUMERRSR', 'regnum': 140} wasn't seen in remote-registers {'name': 'TTBR1', 'regnum': 148} wasn't seen in remote-registers {'name': 'L2MERRSR', 'regnum': 161} wasn't seen in remote-registers {'name': 'TTBR0', 'regnum': 168} wasn't seen in remote-registers Signed-off-by: Alex Benn=C3=A9e Cc: Ilya Leoshkevich Cc: qemu-s390x@nongnu.org Cc: Nicholas Piggin Cc: Daniel Henrique Barboza Cc: qemu-ppc@nongnu.org Cc: Luis Machado --- v2 - skip if check for total_regs !=3D total_r_regs and always dump what is elided/missed --- tests/tcg/multiarch/gdbstub/registers.py | 87 +++++++++++++++++------- tests/tcg/ppc64/Makefile.target | 7 -- tests/tcg/s390x/Makefile.target | 4 -- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/tests/tcg/multiarch/gdbstub/registers.py b/tests/tcg/multiarch= /gdbstub/registers.py index ff6076b09e..8ba14099b5 100644 --- a/tests/tcg/multiarch/gdbstub/registers.py +++ b/tests/tcg/multiarch/gdbstub/registers.py @@ -44,7 +44,6 @@ def fetch_xml_regmap(): =20 total_regs =3D 0 reg_map =3D {} - frame =3D gdb.selected_frame() =20 tree =3D ET.fromstring(xml) for f in tree.findall("feature"): @@ -61,12 +60,8 @@ def fetch_xml_regmap(): for r in regs: name =3D r.attrib["name"] regnum =3D int(r.attrib["regnum"]) - try: - value =3D frame.read_register(name) - except ValueError: - report(False, f"failed to read reg: {name}") =20 - entry =3D { "name": name, "initial": value, "regnum": regnum } + entry =3D { "name": name, "regnum": regnum } =20 if name in reg_map: report(False, f"duplicate register {entry} vs {reg_map[nam= e]}") @@ -80,6 +75,15 @@ def fetch_xml_regmap(): =20 return reg_map =20 +def get_register_by_regnum(reg_map, regnum): + """ + Helper to find a register from the map via its XML regnum + """ + for regname, entry in reg_map.items(): + if entry['regnum'] =3D=3D regnum: + return entry + return None + def crosscheck_remote_xml(reg_map): """ Cross-check the list of remote-registers with the XML info. @@ -90,6 +94,7 @@ def crosscheck_remote_xml(reg_map): =20 total_regs =3D len(reg_map.keys()) total_r_regs =3D 0 + total_r_elided_regs =3D 0 =20 for r in r_regs: fields =3D r.split() @@ -100,6 +105,15 @@ def crosscheck_remote_xml(reg_map): r_name =3D fields[0] r_regnum =3D int(fields[6]) =20 + # Some registers are "hidden" so don't have a name + # although they still should have a register number + if r_name =3D=3D "''": + total_r_elided_regs +=3D 1 + x_reg =3D get_register_by_regnum(reg_map, r_regnum) + if x_reg is not None: + x_reg["hidden"] =3D True + continue + # check in the XML try: x_reg =3D reg_map[r_name] @@ -117,14 +131,39 @@ def crosscheck_remote_xml(reg_map): # Just print a mismatch in totals as gdb will filter out 64 bit # registers on a 32 bit machine. Also print what is missing to # help with debug. - if total_regs !=3D total_r_regs: - print(f"xml-tdesc has ({total_regs}) registers") - print(f"remote-registers has ({total_r_regs}) registers") + print(f"xml-tdesc has {total_regs} registers") + print(f"remote-registers has {total_r_regs} registers") + print(f"of which {total_r_elided_regs} are hidden") + + for x_key in reg_map.keys(): + x_reg =3D reg_map[x_key] + if "hidden" in x_reg: + print(f"{x_reg} elided by gdb") + elif "seen" not in x_reg: + print(f"{x_reg} wasn't seen in remote-registers") + +def initial_register_read(reg_map): + """ + Do an initial read of all registers that we know gdb cares about + (so ignore the elided ones). + """ + frame =3D gdb.selected_frame() + + for e in reg_map.values(): + name =3D e["name"] + regnum =3D e["regnum"] + + try: + if "hidden" in e: + value =3D frame.read_register(regnum) + e["initial"] =3D value + elif "seen" in e: + value =3D frame.read_register(name) + e["initial"] =3D value + + except ValueError: + report(False, f"failed to read reg: {name}") =20 - for x_key in reg_map.keys(): - x_reg =3D reg_map[x_key] - if "seen" not in x_reg: - print(f"{x_reg} wasn't seen in remote-registers") =20 def complete_and_diff(reg_map): """ @@ -144,18 +183,19 @@ def complete_and_diff(reg_map): changed =3D 0 =20 for e in reg_map.values(): - name =3D e["name"] - old_val =3D e["initial"] + if "initial" in e and "hidden" not in e: + name =3D e["name"] + old_val =3D e["initial"] =20 - try: - new_val =3D frame.read_register(name) - except: - report(False, f"failed to read {name} at end of run") - continue + try: + new_val =3D frame.read_register(name) + except ValueError: + report(False, f"failed to read {name} at end of run") + continue =20 - if new_val !=3D old_val: - print(f"{name} changes from {old_val} to {new_val}") - changed +=3D 1 + if new_val !=3D old_val: + print(f"{name} changes from {old_val} to {new_val}") + changed +=3D 1 =20 # as long as something changed we can be confident its working report(changed > 0, f"{changed} registers were changed") @@ -168,6 +208,7 @@ def run_test(): =20 if reg_map is not None: crosscheck_remote_xml(reg_map) + initial_register_read(reg_map) complete_and_diff(reg_map) =20 =20 diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.tar= get index 1d08076756..5721c159f2 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -38,11 +38,4 @@ PPC64_TESTS +=3D signal_save_restore_xer PPC64_TESTS +=3D xxspltw PPC64_TESTS +=3D test-aes =20 -ifneq ($(GDB),) -# Skip for now until vsx registers sorted out -run-gdbstub-registers: - $(call skip-test, $<, "BROKEN reading VSX registers") -endif - - TESTS +=3D $(PPC64_TESTS) diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 46544fecd4..0e670f3f8b 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -103,10 +103,6 @@ run-gdbstub-svc: hello-s390x-asm --bin $< --test $(S390X_SRC)/gdbstub/test-svc.py, \ single-stepping svc) =20 -# Skip for now until vx registers sorted out -run-gdbstub-registers: - $(call skip-test, $<, "BROKEN reading VX registers") - EXTRA_RUNS +=3D run-gdbstub-signals-s390x run-gdbstub-svc endif =20 --=20 2.39.2