From nobody Wed Nov 27 06:40:25 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=1700081887; cv=none; d=zohomail.com; s=zohoarc; b=MdABNQb9h79muM+//K0hriPsb+QfRlV5UAhr/DeFerpp2hAaaPCmGM4PCkHTjg0pDQD9FGTwSbn5eqeQariKFu0cmwGVmAwVR/wp6D/ACxopYO3z/xG/IY1JnrpkuCj84LavcfLqLpu8p7oFKGIcC7cxGaaGHwNYOykqhyP9+MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081887; 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=cDk9A3AkID4sGRaGhwIPug5Icc2SkBEyvmrQK1bQO6g=; b=aaWlMm3mFEK3ExNv9L7rlnGyi6B7+tq/C2VIrAc9YUoaSopnJ2f+/hfe7aPo1ClUeiycpLo471uvsi+hZA350s2yEhBckc2vyhHpAGtS6KvREJsOcGxnr/hdvTSStPioXfGGf/KJ1jwqcLmPaQ5utO1e+RYdOdP2bQPqIoL7ESc= 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 1700081887218303.0499481780256; Wed, 15 Nov 2023 12:58:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvZ-0004tb-Or; Wed, 15 Nov 2023 15:56:01 -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 1r3MvT-0004mF-KS for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvO-000893-Er for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:54 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40a48775c58so406875e9.3 for ; Wed, 15 Nov 2023 12:55:45 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g7-20020a05600c4ec700b004094e565e71sm871619wmq.23.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:43 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CF76C5F7AF; Wed, 15 Nov 2023 20:55:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081744; x=1700686544; 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=cDk9A3AkID4sGRaGhwIPug5Icc2SkBEyvmrQK1bQO6g=; b=S6ZKKf8yzKD1WsOormRWx/zDpq4+giro42iw9pdYt/s3hjrrusBDR97kYMN1OPIEWq v2f1iJRX0rkRds/cI94QkBbq+qI1WBdE+y4K2lXDObnjVJdDoOzkW23HeSvv27w/fBUg oXofw9yCxqBG3sslulNFPzR+n5ZycCbNgbOdQYDFYouR9m66OrV1qped992eaXV0FCJ6 TnS5MBH+VEsGESkK/hJ1QzS7BkzvjG9BHo0vj8ah7B5sHJ04AdjY249F0J407cUWkTnx ziFb8UWLKc+4qmDsbRSf5bgQGCz5wJEWLsEQZqJnIbC8Nt6bukKraFnRc3VcNDBsgoIy Vjng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081744; x=1700686544; 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=cDk9A3AkID4sGRaGhwIPug5Icc2SkBEyvmrQK1bQO6g=; b=i21DBcpnQD8GGvWBAddtMdzMgW7DX0r0s44Bdx0qx7pKucNKcaaAupufYaXaNLRtIw qAuwK+J1mVoNwqfTGq1HJViisLV5ItuaAcYNNuEgvpmpv8n5cKlNt8VW5mbt1oQqVisV AQqZozAWiAxl9Vty/JwsR1hgngFol1gLpHmcRTgrjS9nUW1Lecm0nwjTAavHY4cS96Mt DEcjAy8NH8g2b5oEWX5F/UcAT/ffv2STSxqUpFeHd3iYP7wOU9cGGG2rKNN4xYYe7l3H tpqYEY0J/Obiep3E7DkQB1RGzNbysPvzyPQr+K0NWa0nOI2ul01byd9cz8sAq8UT/veW R5Jg== X-Gm-Message-State: AOJu0YzQkJxOnRC86KLi/ydSeuWRpws/Stu7O92jYjQ7wiIbcWQk8rRp mzdLMJW1GGmv2bBUoqquEe/sjg== X-Google-Smtp-Source: AGHT+IGDqmJAFaI7IiFi9XiiM18av4OTVvnAnSYw64ISTGxoXXnqvnXtjaIRInBZ1oSh0M8siJEKMA== X-Received: by 2002:a05:600c:894:b0:40a:44c0:fd43 with SMTP id l20-20020a05600c089400b0040a44c0fd43mr400317wmp.17.1700081743849; Wed, 15 Nov 2023 12:55:43 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 01/10] tests/docker: replace fedora-i386 with debian-i686 Date: Wed, 15 Nov 2023 20:55:33 +0000 Message-Id: <20231115205542.3092038-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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: 1700081889055100003 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] Signed-off-by: Alex Benn=C3=A9e --- configure | 2 +- .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, 202 insertions(+), 52 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..5e7b76e3a1 100755 --- a/configure +++ b/configure @@ -1307,7 +1307,7 @@ probe_target_compiler() { container_cross_cc=3D${container_cross_prefix}gcc ;; i386) - container_image=3Dfedora-i386-cross + container_image=3Ddebian-i686-cross container_cross_prefix=3D ;; loongarch64) 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 06:40:25 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=1700081839; cv=none; d=zohomail.com; s=zohoarc; b=MFcqvZqz5mHBoeaY+z+4OFwNiPv53+LXldkc5q5aYLGQf32ZOzBBReGsCT+ioHT8j/1h2YuGF5fdc9BPMzW2W334FdMhMBt3Gs+ClxFb0tB43K5qBXd9Bh/oC0XRGw023wxKFTZ1SaqckneekLF97Dm5Izf/SMpi5Bg+VT5KJpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081839; 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=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; b=GBcFGIYAth9+h0wDIorjkssy4vq9nr2WfD+uKK8TPPUyfEtsqju0w9CdBTp2+U4LKeAlhfRTcDxetu7DHsnQEU73IoulrQLMO9mKHFECHUGKis6OJJTOBXxrXkeMy/QPS6j7rl9ONzyTjpbtKE1x4YFiiCyiAI8Xa2GgHYGbV7c= 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 1700081839360730.7548480878297; Wed, 15 Nov 2023 12:57:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvV-0004mP-Cr; Wed, 15 Nov 2023 15:55:57 -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 1r3MvP-0004lZ-4x for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:51 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvK-00088w-QL for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:49 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4083f61312eso416845e9.3 for ; Wed, 15 Nov 2023 12:55:44 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fb11-20020a05600c520b00b004076f522058sm909879wmb.0.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:43 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E5A635F7B0; Wed, 15 Nov 2023 20:55:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081743; x=1700686543; 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=YWoiSiUm6iXSwHJIP4SnJtrzbg+5jh5ZVQXK2gBfc2c=; b=E13MFcddCMe4zVl37hof2xzTGekFHag1ckcvXLayNm31VRZMtA9Vfl5/Ok4tOH2q4r oenTpd6Lq9yXGiB5KypstawKpbJWL7TAwN5ExoGnLsL/39rgZAI/bxk4XgxzZrKHP9w5 L6cZXbwsDMFuY9hfKWwhnZDuw9eli8+CI6kHsPeB4rBLOHD8B+lt5roq5o5YYV6DyEfN wzYtlV4lbtUdO4CRz85tVuwfpTFEGZT9iez9hkf/OnHGYQqPJaiDat+CvKF8tgM7pyuQ IkU5nCpcOGsR0iYo1uC41f3958+4JveiHw14AKlDrdlx/W7khs3gE8fpRaQi4GSur2GU 2m0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081743; x=1700686543; 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=ZQPuAFR2wZvZ9HqciWqZBo9Uw86RXJYjPyZ683L7heDXY6t2KV1kGRAmw+AU2PvUKR Olcli6lLzMZ7W3s3+gasqauovdjqq2FVpC2QswNHkx0d9qNLmK/GI0da6G9+3QV67XXz w4gum1JEv4KRPzl23gL29Qttj21VcLTDYTJ08cCDSepfN6uS2dtgqYDAeFBYZfRdJ7gK Rr1PrscmFCTzV1ykfbJKM5nByj1f8Bhg6syPVSp7e1oOHt5WBLSjd2gYVz2rfJvLdK69 hafD8B5YigQMJT/NEk21i7MlFOtjevLixLN/2xB4iY1JfXwe0wJz01b+0IBkmY97tQ/F hMkw== X-Gm-Message-State: AOJu0YwlVN4PeTjommUxjy7oA//SWHDs/tzXNLGM0zYVtxYGAhkRoFAF ogOAz+a0Gjwdnpwk0rgWGj42Ag== X-Google-Smtp-Source: AGHT+IFQOXtrR474OUPGH8xtaCKm+uKoLOvuqASPAkglLHlzqLiV6A6jMwH3pApQRbamVxr7D5wsfg== X-Received: by 2002:a05:600c:3143:b0:3fb:feb0:6f40 with SMTP id h3-20020a05600c314300b003fbfeb06f40mr11721890wmo.11.1700081743645; Wed, 15 Nov 2023 12:55:43 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 02/10] .gitlab-ci.d/cirrus: Upgrade macOS to 13 (Ventura) Date: Wed, 15 Nov 2023 20:55:34 +0000 Message-Id: <20231115205542.3092038-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: 1700081840829100003 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 From nobody Wed Nov 27 06:40:25 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=1700081947; cv=none; d=zohomail.com; s=zohoarc; b=ljzw2G7fYMD4SCHUCA334IOisgCR93wVTSgbVCYcLg5hIgQAaHJEerST3k1GnE3F5bADXd3WVAcVAsInjv0lnB2qhivanHQzm111w6ZSbPMftwulyN9ZygjAsrAbRP1Zh3/kKTqwvugu4taNYsN1+7RDtnhgXiZoOjruRMC6ezE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081947; 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=N+YwJ2tZRNrB07nTnHZPc0Lt4zFP+qKZG3Th9hruF0XWSZooeUvbSvcOABOW9SDiBW+2MrHN99GB32/4spzZM5ecpvcPbB1aG5GtXBKyW8oYT/gSb/+xeDJvuLmxtQuEZQa9y9kd3x+TbzJuDSQ5zXHekp1MRX2pILs0urAIXkg= 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 1700081947713765.8601995609173; Wed, 15 Nov 2023 12:59:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvX-0004qQ-Kr; Wed, 15 Nov 2023 15:55:59 -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 1r3MvV-0004ne-Hl for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvQ-00089b-Cn for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40836ea8cbaso511115e9.0 for ; Wed, 15 Nov 2023 12:55:47 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x15-20020adfffcf000000b0031984b370f2sm11513405wrs.47.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:43 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0B7845F7B1; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081747; x=1700686547; 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=cJUSxv36xVFCy5pa12IDcOreCEqhzkURC/N2wkaGTpydHvYJ23RxoLjccubMIVjVAm hdfYN6Q36thlq/RE0efKz46k2xQfjnATzUhH4+Vn6NpAH/IjKbwsqoILrmWXQbG9H69g MTPXeI9lSJk3XcS9l158lCkWZ0bKJ0QWtj6U6OGL/E6LfclIniY238UyNFB7pFU51jRb rgPWjR8+X0KJvcQNMhholiMYgt8yrCEAiZcUtu57AWW8TEPrPtYzM0u9pfKh03hVsSCz lD8cquaP3IvR0QKw59+3LHvigU6oBru8Q1IuP7DruC0ZkzVRYUi61V3K7eZRuECN3hJM qpcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081747; x=1700686547; 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=cSHuiqYjKwygj0OIylQrq9iKCMocMUD2dHVJkGC1VJEP4IWMVC3wNe+W6KOOfRuIrp emKcL5ITk7HEZg95X7b+BdTKd/7aW3GkRneqLqodmxmlykkkG7K2GGc3vM54RyZJW+vF AL8WZsUJQbtc3+CtKY6Sr+qTAc51g53CThYQDemNEEbISW38N9rrshJqtGT16xljltge gwIemh6owd10oLWhCIUYOFhE+XGMnfQLfpcFugASRLx/I53YmTlKZnnh8z3TnJVmf+Lq WaceF2tKApv6ru62rYcrDZDBvDf2XCLDdj1Lh6xoixNkJgXL8UDR67T7FHmntJC9EJvS FRJw== X-Gm-Message-State: AOJu0Yw8jHsnozF18qj0jQetcmPeRlGpNHchlmfao45MGsz7MNbUvb7c E5Xq+eB8H7pilOzI8D8zFzktPw== X-Google-Smtp-Source: AGHT+IGtQuYHmRL/4VHaYNmuvFvkM2SvYkOHnV9nnuBfbCM4aqgQ8Hz03CJ/ns8MElp15us3fBMWIw== X-Received: by 2002:a05:600c:4d01:b0:406:8c7a:9520 with SMTP id u1-20020a05600c4d0100b004068c7a9520mr10301980wmp.36.1700081746521; Wed, 15 Nov 2023 12:55:46 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , Anders Roxell Subject: [PATCH 03/10] tests/docker: merge debian-native with debian-amd64 Date: Wed, 15 Nov 2023 20:55:35 +0000 Message-Id: <20231115205542.3092038-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: 1700081948537100003 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 06:40:25 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=1700081920; cv=none; d=zohomail.com; s=zohoarc; b=mLAP0sNkRrcuZIZehUl6HnzDnhxwEgR2F5RnioXnUFtyVur2qQfvlBSjaP9vYcoGqzCSD2yJNsdlMzUYk9OTfXirJNpm6gB5AaLeYra5P43y8H9ZEgzJ42dlmN1UTAN7xtUIvu3I+BhEgj4z6rK1XGpL4zXHxgYr6hkElNDOYq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081920; 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=RX1JEjKXV52qpMIU1H/kQFrbjAzhma5Fz3ZQu0YEhSIQ6oboS13bBhI99A0pB8ocG7xn4FR1OGK/jpfhmHMy1UFbzpXClOb1T4A9LqlwVZl8G14Bgxu75pThWGZ18UGbH3DoPWX2i51wpcGWzIBDJhicZ1lRp3dBjmoDd+T8MLM= 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 1700081920484595.3673426429046; Wed, 15 Nov 2023 12:58:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvW-0004p0-RV; Wed, 15 Nov 2023 15:55:58 -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 1r3MvT-0004mL-MW for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -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 1r3MvQ-00089d-CD for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:55 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-33139ecdca7so73634f8f.0 for ; Wed, 15 Nov 2023 12:55:48 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n16-20020a5d67d0000000b0032da49e18fasm11432278wrw.23.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 23FB05F7B4; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081747; x=1700686547; 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=IUFTguL+nP2xdPRP2OflRt+iPwAZwjvW/txpYCGKUsKoGakgAYV7DfyyiCR+zjSfDI k0LwdYzJM8Lq+W7ZnWk8YuKBhmRNOlJngmhxf0pYr7RWy+caoFPMmiOgYFe8DCFvyCIO LpySKtBR8VVnau+Fu8Tijp1ku31xW6faBjrDK1p17qGi5ujQipfGOaXLP7L3edKBK04C Pmao0qsVg7UA6gq27sNceQJuGOGlRO1ev8G4LgBOjCusOraHNk90O/GQMArBNS0SKS2g IuZ97JeuhPIBMDWVVqZoz6Kvut7Xs5EVJ1lJOI7CaRIH1FIBW6SetKoXuxUcAiTXMoJA AjhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081747; x=1700686547; 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=jGr0YZ4aGuczHwFA59ZLzHPfbBYtB6k4QnJiEdaLdRzu4RFgT93r9/nRLFndvt47wO aK2LwLHSukG0uSQU6IQF8UmpQPbEDpqg0tWfVb2yio/wJ5yR9dNtNqmH16QXWFjplgHa PR4QM+6FwqgyevySl49bL1iIM44KTCxB7XZ/5HyCffEfQtbDtmF1gvJOvsNZDyt3E1vq xFAgeEurJurMUaG7xi9l+G11ZBtbl8TDUnT91NPjJvbLu8gNwTtF1tU/eHH8Ta7G4nKH 1u0CW0qwE0eiIz3q5SFnSLXkC/Kvlx9CZ+4M0h6bwcHPVPyz9bUT++qchPlZH7REYHsB 0t4w== X-Gm-Message-State: AOJu0Yy4Zf9DX8DkTPyYyMJ9EvrFWAV5or58FcQy+C+kTzydU+Flw1BW GpRi04hh6Pt26sT2VXTDw41/pQ== X-Google-Smtp-Source: AGHT+IGDAgY1VMAlf+RPnWBn78RtavJI6o4qcU29ieksvxsVkAMdW6WbcFQ84Ci/77g32nU4oL2dNg== X-Received: by 2002:adf:e6d1:0:b0:32d:8cfd:5780 with SMTP id y17-20020adfe6d1000000b0032d8cfd5780mr8055379wrm.27.1700081746832; Wed, 15 Nov 2023 12:55:46 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss , Greg Manning Subject: [PATCH 04/10] plugins: fix win plugin tests on cross compile Date: Wed, 15 Nov 2023 20:55:36 +0000 Message-Id: <20231115205542.3092038-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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: 1700081929045100003 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 06:40:25 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=1700081870; cv=none; d=zohomail.com; s=zohoarc; b=SCCYUwDnmjH74trb1NRdNUuhAoRRh5JI2YQeXxK0SCRYrUnHtzC5tD6Nh5PJJnlQSKPqGVnGaaFbqbrFuM8Qd1q/URFQSCYygsb7LLFB5ukyDyfqJZLhdsyWh5ckHmGUvyjOoQsoJjAbQY5GKqHQvDhW2EABhvjMINIFzcxmvTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081870; 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=jpg9ZYR8zir5xzBhgKPQlKeYBLcQXhMFbmBDHl5KloVrgoMmDK+y23Tx98Mr9caDcZ8rLzlmBBkthzMQIxJBlEIsBdJOz+6u/syuG9dpo3lBJAC1sQqjyrp7Ki/V7/pt2zt1di141vu/fc5FLvpOCeFNepXKU09tuQeR0wUeEWg= 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 1700081870116710.1333629330502; Wed, 15 Nov 2023 12:57:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvZ-0004re-1j; Wed, 15 Nov 2023 15:56:01 -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 1r3MvT-0004mG-Km for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvQ-00089f-C5 for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:55 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40839807e82so576635e9.0 for ; Wed, 15 Nov 2023 12:55:48 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 6-20020a05600c028600b003feea62440bsm826359wmk.43.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 37AE35F7B5; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081747; x=1700686547; 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=AhXAmK4IhbMyZxxcNNS7BBpxE6enb/4MxsmhWjsJ1Ihg3CfOc3EpQ4YI8GXzLO4JjY awHXvjDmOK/6emtLtmMcBAs1C3wQs6hkrBElCKdWSu4sspwrt+2U/+ZikkL4Q66cgec9 FmvK7Xpatxr02lo2yVVV16hdo3+0miJXwMsIXDgqm51eNAi9QYHmLqhxnd1ukXSbt8KG +rCoYXJ9dDTc0nqC4KRM30I9Tw+V5xwFVt4Tf45hgUccxL8ALICjV7/417ZwjQEZRa8x PidYbd4GoAjjGpwwO1JdqGrTJ2HXLCHBxJA3mzrRBoz9WeAEGVBqRnEoVszFS+Qr/zLM O/OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081747; x=1700686547; 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=OoluJ8LASh8YwAT1N8wutVvDNtfM1Vt9uMrhsaZJODVTYbYuKD4J/PpSiTZVyx3exz c3v9T38GFyag9uIHRPo9NVkeJEgZWeb7zCBFdVqS2K46IUZesyAhyR3zzFLl4aKBhtqD LMsMhVGouZyp5to6/1NTuL3e73YRQzadZmpjFIua9WdhutN1Oa1+v76X4sqAg7ljSzHa 4A3QGvVhgwe7r0nqoQAZltgvmUQ5RnpV1VZ6wlElFrjqjEDaP6qjddPXjPHbbYCihsTO COo7qPN++FMMg+vTlAyyCK37xTH4e7oZXQu+9ddKZYHxhhI2eftUztD95s6jOWAh8X1n RxaQ== X-Gm-Message-State: AOJu0YwSPN4hHcUrbGvuD3FUbO02AoY7skmD7AbzsBOQ5xAv6UJL8KC0 sW37VkBCDjLunQrXA8SD8r35Yw== X-Google-Smtp-Source: AGHT+IF7n3QuDjtelx2jbGMoDnlKdqUewGSVxtWF5uOHWJrWAdSPoElEadcpVGcUtHjfjPS/40vlXA== X-Received: by 2002:a05:600c:1c89:b0:405:358c:ba74 with SMTP id k9-20020a05600c1c8900b00405358cba74mr6784269wms.0.1700081747034; Wed, 15 Nov 2023 12:55:47 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 05/10] tests/tcg: fixup Aarch64 semiconsole test Date: Wed, 15 Nov 2023 20:55:37 +0000 Message-Id: <20231115205542.3092038-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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: 1700081870918100003 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 06:40:25 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=1700081855; cv=none; d=zohomail.com; s=zohoarc; b=hr+G7yStb0h/MJUmRk6z87gIdtVObIunx+CRTEwySaq+qqQ81+NrmxgZNRS8EGE4iriW2hpI/lVA4hHyglUqaSHxxHT1K2M+hwDtiYDKI2PgH9N0Rchv/HtRVOtSWqKmGsr+SJ08fItKiJXw+O3pySp2otoxUtty60oN6cG+u94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081855; 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=cm/CvJvzWGsYMgHfRMIPMj9Qz4IuVNNH1j7QG5Qz8eR7lrzqdgT924yJoSt6sYbELjlNSCAXt5rzUDYaqbe/836A+oQrS4/3HfxvVyysvcaUeqx0S3W2bJQJlMS/ypuQCSWi5/13D+Y96O23i6WEj3uk7xdxot7ZWd2WfWyDczQ= 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 1700081855434470.6235395635555; Wed, 15 Nov 2023 12:57:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvY-0004qy-1T; Wed, 15 Nov 2023 15:56:00 -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 1r3MvT-0004mH-M7 for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvO-00089n-FG for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:53 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-32dc9ff4a8fso71916f8f.1 for ; Wed, 15 Nov 2023 12:55:48 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j16-20020a056000125000b0032f983f7306sm11470293wrx.78.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4D8435F7B6; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081747; x=1700686547; 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=MNh1TzrdudRIV24c4MHDEciQmvcGLfxfkDi52eH9a+0dcmNsIXNSYb78ss7Er4owN/ gRlidaANjkH6X4nbGLC7gCJwOD/5HolLMxkA1gVQB6wWwW9o79eB6tfoGGAwtB/xMBk4 al5JMFla/11tbDMfhdTMbW2Io0mO6xlOCQRGEfbd28JBWUpopkOiPYR2REyWMztiQWg/ Yum7PC+ESwkYGB2CC+78fuYd9pyoOf1YLrXtZorNbJOfXS+DmPvjja5KzucOc7Qr+aQZ 4INIaBrZks96i52SdcQHdrBuOE3qqm1Jm++SZvZJkpKAPXV/Rkpwh1AWmpf+kI5BqLi8 wWqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081747; x=1700686547; 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=sd2Jp4Svd7sHhOpUP+LBOYnH1bROCOPmQK+HYjoOUVGqPtGX2GB9EJmmjrQMXfJaSX 2hF0+jjoBZUSjgS9wgNLWtWIjkDWPa878gIP+998buRNxxzVv0YeKZ2UqihqlujSC4T0 I16O8TiiAWl5ZlgguusS8qGaJEAPokGSQAEu4NwbJRvNyXxBcVW/3sDXbmnnu1THtYmr noINJOJpOSz8945I77N3xAZNrjVhCtfRYiTJHpomgmjdsLvQRw6w093+CPcLVhn2B1TP AbRSXaLDephXxarZIjw/XUgWUB8+wwjrc/p33ldxDrn543RGKTanphOCdMqOJsdfds/o X0Og== X-Gm-Message-State: AOJu0Yz01rZKN2z3s7/2cewVnKHE0DUXWTpqZBNzSJ+0CaJtQPXjE090 27NCaD5wLeEAj9piKmAK+lNn3g== X-Google-Smtp-Source: AGHT+IGSOSgesv2hku/4P6U/jkwB4xWwn6kEpDrHL3W0gMusILYAJ/Q8soDLCnnHr0+jniVAg6L0MQ== X-Received: by 2002:a05:6000:188b:b0:32d:701b:a585 with SMTP id a11-20020a056000188b00b0032d701ba585mr12297923wri.69.1700081747300; Wed, 15 Nov 2023 12:55:47 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 06/10] docs/emulation: expand warning about semihosting Date: Wed, 15 Nov 2023 20:55:38 +0000 Message-Id: <20231115205542.3092038-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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: 1700081856854100003 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 --- 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 06:40:25 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=1700081861; cv=none; d=zohomail.com; s=zohoarc; b=U9g0nad2WupLSxaU02pvah7k9nV7CcUgeUFj9X/7NOm3MgjI5RMXmGwg0XESCTW3B3f9CthzCd7VKp2p5QFntFK/y75nFw+ZQJVd1fLYCXxBzRoQhd0oOrPrvupNw2MFyovKyg7lN4HhqROG9AOl9Sf4RQDI/oYX3nE0D5oDSds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081861; 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=J7aCt684M/Mo4aPxjDOnz7JyGbXhEmNf+Qyqgmy0nPo=; b=PBzffx02IW05kNfnzsLj6pAAXxaRcP1wUjWHsCfmNxAwWaIjfE09HlIYVYqT3cjTJcmECqJvuQXhrCCVoEaUl5p4N9OXXv3avUsb1wX7J8i/nlrkAkfFdL+OhOACybDDQO92MuUta3VQFm3qutfRxHt79PvNfoDdG4+KCiT8ook= 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 1700081861644657.4914440069869; Wed, 15 Nov 2023 12:57:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3MvX-0004pL-2L; Wed, 15 Nov 2023 15:55:59 -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 1r3MvU-0004mT-7Q for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvQ-0008Bx-Cq for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:55 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32f70391608so62582f8f.2 for ; Wed, 15 Nov 2023 12:55:51 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b11-20020a05600010cb00b0032f9688ea48sm11516899wrx.10.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 636BD5F7B7; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081750; x=1700686550; 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=J7aCt684M/Mo4aPxjDOnz7JyGbXhEmNf+Qyqgmy0nPo=; b=C52Y7YO0MFzNY+yqvKHlzRt6hBCLcdSBhgZ7iRyqpGxj03Q03xleco5olf1rLD4pKE +ts4qw+mI6Vg5aZd24RBFMYazt6jHlkgqfKZ6cgFy6uGa/1i3qB6qPuLg/WCx2fAF73N KGqG8boz2y5t75Izs/UczIOFc/l3myk6ag5rHs28Kb6gWuogWRrwC0wkhipTI/AHdHE9 c1wtsMWvQQWSAeuFmL2ayS35JWNWoUvr7xo4xpHaa6Y5wrcMpnMCfnCVH19ONxkWn8aa 09P+IcA7bbrCJmn0d+eIJc1j84JzlKXGgWvJfNr2um5TyCqDaWRlgssgm4xI213IWOYT pBXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081750; x=1700686550; 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=J7aCt684M/Mo4aPxjDOnz7JyGbXhEmNf+Qyqgmy0nPo=; b=jr0D4l2+8MiGBM6WlIlM+BswMJXGf2nsMjRZr1FqYFo2LoRs1kXrsNUJx86ec4FHhv 3JjOydSaPY+YTcSY6P1m9dW6vPN7SRU2YUjQ+ODUS7Dih/E6s9j+gqIVMvxmYgXqLe7l cjtf0UmwrenNIPvg+T9I6havi0uG/Hye+0HPNyDTPzCkGzABVYUwNnS5t48qgOHREigB 2AeeEAepN7jPaTnccs9OLJHTBjc8QA3nMAycx5Snkx2GgFiBSpF2PdGlsyvH2r8CG2xf /ERESzzi2dMM8vJ+UazusYX3HrLWwFK3D9ph1sNUWfop9pmQ/ArwGkrUTtrwVXwQblx9 T2Bg== X-Gm-Message-State: AOJu0YxCYSsWfdsS7x3pEpJ0t3ho9kBzQULD65p6tNHIqODsDmqhFiq4 dx48BL7wIoJ76mHeqYgc/yXtgA== X-Google-Smtp-Source: AGHT+IHEkMmH8ID4OjMSzmSjpKy/0AAy/kyhrV7sh9Hbu0ir33doJ2UI/IRULe2SZGRkwoW9VyghtQ== X-Received: by 2002:a5d:584c:0:b0:32f:7e1d:f039 with SMTP id i12-20020a5d584c000000b0032f7e1df039mr10866947wrf.46.1700081750692; Wed, 15 Nov 2023 12:55:50 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 07/10] hw/core: skip loading debug on all failures Date: Wed, 15 Nov 2023 20:55:39 +0000 Message-Id: <20231115205542.3092038-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: 1700081862914100003 ELF_LOAD_FAILED is one of many negative return codes we can have. Lets treat any positive size_t as a success for loading. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 06:40:25 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=1700081863; cv=none; d=zohomail.com; s=zohoarc; b=gVgDSqNF7JSt+lUlWLxAkRnUHCKpDPEkgNzsKZidzsfnNTKREu/P/FkYZq+wcEjd6ykGKEsV4L8LzknvcSMkoeuVGSKiCB/KJ2be3U2BVl3EIJaJgKwIYQG/gc+SsM0XiNsV4icGkFh2Gg5za2YK+0qcxJa68uEGwvssp4LEAXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081863; 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=n/NN7es3+1CZ0EFlUnLqZA7cRnxMs3Z1B4jfSUDxuyM=; b=lkcsAth6hXN+H+FpGOVOzHY2yGmu2Cc+bZqrlpIlfQABvpyiivjzBI4Ijeo91VuwbV9Z2QmeSk5JoP/WVTklGPYYy8f1g8eqHKeRS/CponNBJaobs7EOainApO1er0Nb+0tvLu773+k0UdrfUOumBFDegApnX5mkN1S7Pc1CNYE= 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 1700081863009989.3956824840571; Wed, 15 Nov 2023 12:57:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Mva-0004vd-Hm; Wed, 15 Nov 2023 15:56:02 -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 1r3MvV-0004oD-Sc for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvQ-0008C2-Mi for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:55:57 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso446635e9.3 for ; Wed, 15 Nov 2023 12:55:52 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c4f9400b004060f0a0fd5sm884470wmq.13.2023.11.15.12.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 766D25F76C; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081751; x=1700686551; 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=n/NN7es3+1CZ0EFlUnLqZA7cRnxMs3Z1B4jfSUDxuyM=; b=F98uRXF/7MYSytcK8ZFqplcaqtdKuqiZyPyrMGAJ11lnS952waA1DhKosh4Ghnklk3 WhBIWRs8UCwe8SMxPIapctUQqFb2OENGJ07SQ2ASWU/YsoeEtYCyOsqmrGnfjg7k+v7w fjSOgQ4mz620lwijDaucgZuvHpSCL2G5OtOxGAAafF2M3/UBA52qOBhm/URbczMUslJP C3fahJ3akb8E+Ve+Ljpep/qFTBkws9TDA0wfc8tnm0vd0MpwltGBXExbgUSq2xWppz+X gfo/uKhgJ2v8PRgXNS7djykmje1qI9f+KNjt5sBW+FtenZ4JXpIacKQWrBGHtjjZvd7y aRNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081751; x=1700686551; 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=n/NN7es3+1CZ0EFlUnLqZA7cRnxMs3Z1B4jfSUDxuyM=; b=lj3iXCXUpaL6Tc1fyT/klUn6lY8YwpBn7qhBYJAA+MU2LcJZdaw3970gmJ3JpKsipO AQ+CBRvqbfj2Cy3RwSXVbUo8Lu9SfIusw8IamMiZs39oW7/2jUcr4CRpcq3GvX2OojIq ESP6cl1qKeXqqG9vJA0JOm6riBO6IU4ThV5rHbu1zHIoYwManeakIDNk23CM2Snfzm/9 0dhZb+o7+F3VfYbJggWwx7WwlyVmi5FUh+B76zgbxHIyQxqSn2EiysT1RcTkcF5508Xa AZTcqokScB56Z19uu+wmH3DJQ7QbKSeL4E4B0VtGWgozB4zYdMVcwESUr/n/AeTbgf0T Ov9A== X-Gm-Message-State: AOJu0Yzz7zCWRj9/9lvWqtB8V+C11QpuIaSKst9QCaOokPoAK6zV6dIb qVC6iVai2sX3RDc9fZT9XrWLUESZChEVCaPS8BJYFw== X-Google-Smtp-Source: AGHT+IEQIM+qljeThCkmguttYEHfvGU6NsByrKr1pQdx/A2QHjvuu+EOjURlQ/F2LxgjlscJgp1vgg== X-Received: by 2002:a05:600c:45c9:b0:405:40ab:7693 with SMTP id s9-20020a05600c45c900b0040540ab7693mr11590077wmo.31.1700081750916; Wed, 15 Nov 2023 12:55:50 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 08/10] testing: move arm system tests into their own folder Date: Wed, 15 Nov 2023 20:55:40 +0000 Message-Id: <20231115205542.3092038-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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: 1700081864876100007 Prepare for expanding the arm system tests by cleaning up the test directory. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 06:40:25 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=1700081879; cv=none; d=zohomail.com; s=zohoarc; b=dakYAvApQsrnQoNHnBy0RAJEkdNNEdPSU8TtmbRn8xg8/HoWkNxnarC9s5MhdXbF336O7kILu1bs4B1O9HhGbci6USPz0xjGh49XR4Z5mgZCpEpTtE3jP86yrJcCVLTQWtXtP7LOmtxzhzyt0HbDqxIVwSH99KVgrU8pwbrsegM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081879; 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=WBu7TcFa0DnkjHn5rRb2bTaDElhIRlhj4saJE55wGzI=; b=kVg8Z97hJD/adgFTl7XVA2ObnbSSqICvRTS6stIEY6YU1JdEELAtFUyFC/CwTuOg2+M9EYFLEq4devjXTKmm3PeFM/yugG2M4gneSfWUvqYKUE19HPIvG3pSiJdi9UQy/9aEfyzYY6T3fXHIXR/aanDK9q9/dd4QSBpMTBqckOw= 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 1700081879405175.22809373701864; Wed, 15 Nov 2023 12:57:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Mvc-0004wf-At; Wed, 15 Nov 2023 15:56:04 -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 1r3MvY-0004rK-EY for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:56:00 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3MvT-0008Ch-Cn for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:56:00 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4083cd3917eso446805e9.3 for ; Wed, 15 Nov 2023 12:55:53 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o22-20020a05600c4fd600b004064741f855sm862126wmq.47.2023.11.15.12.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8FDF55F7B8; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081753; x=1700686553; 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=WBu7TcFa0DnkjHn5rRb2bTaDElhIRlhj4saJE55wGzI=; b=rBlmbYeuTqpwFboWhAHUPvj4Ud4+7n4UIxL6t1X8n6JG6ewkIP72pf+mGcMLET6Ium frJXqZuHp0WXVSNsqiOkFdTR3d542jZ70Q52HseS+zxwAiYhV2jcpzzrxNuk2JNJgOPJ fxRhsq/SoCGmQ9Ks4yqlAmwcEl/ZSFT+DRZvUtPrDvHazHG3WIl/unBzF4HP2NJ+Igqs e3CZfSUFv8YR1ka+dmrFP/fED7KOQKxd8rVI60t4KtS0MJL5LgWaaf35WuWbocZf8KkE WZ4MjsYgJS0GZy6O94LYY5Cw0qdUhUHJ9psWjNC07U4/Z0QNo2FiHD7qgNbPNIcB+0CH wfng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081753; x=1700686553; 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=WBu7TcFa0DnkjHn5rRb2bTaDElhIRlhj4saJE55wGzI=; b=GdRWHDL2kPvNLhRB949rknjbvfJ7R9upuO8EoTvv0LE2PfssZTrH1aJeHy5IGDxF/j N5UA3/HRasgoKT/q2O/ltnIz1+kKMXmdWGeBthTwCNSvCVOJeQ+YL7HGSctQUxfKUWr1 RK1USitmS2ov4wpkIUPXWYzs96ra8Gx6x5DCDemegTHwMvDB+wXndY/wCT2hg3nz6Rz0 bm+c3QvhzoVW6TOmHikoYLQCgfUjyKKKqWTEhd6eJwGUmdvlCU5P9SKOtwf67YHpSTM0 7FLba2Hl6TpW752F+dkvOeqWQEILhAut+EHHE9lBt7V445Fyyma5Etjsv68hB1YdzFOJ g+LQ== X-Gm-Message-State: AOJu0YxlOblM22YNjErc0xe3hGJ8nmqUB75vF3bQg6zP5t4q2KriRiWy aK0/D/sCyXQ84nwEYhM03Zexnf1pAeMmLAKRb8RF7Q== X-Google-Smtp-Source: AGHT+IERtDeZos0v4GVUZuP9gdWHUjFchajOyTrQZEnc1HJKQy6IYixQNEUgfzgOLfjKJJFLQoupQQ== X-Received: by 2002:a05:600c:474b:b0:3fe:2b8c:9f0b with SMTP id w11-20020a05600c474b00b003fe2b8c9f0bmr10286766wmo.23.1700081752845; Wed, 15 Nov 2023 12:55:52 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 09/10] tests/tcg: enable arm softmmu tests Date: Wed, 15 Nov 2023 20:55:41 +0000 Message-Id: <20231115205542.3092038-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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: 1700081881000100003 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. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/arm/Makefile.softmmu-target | 64 +++++- tests/tcg/arm/system/boot.S | 288 ++++++++++++++++++++++++++ tests/tcg/arm/system/kernel.ld | 24 +++ 3 files changed, 366 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..d1ed897eaa --- /dev/null +++ b/tests/tcg/arm/system/boot.S @@ -0,0 +1,288 @@ +/* + * 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 + + .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 + .global __start +__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 */ + +_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 + +/* + * 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 + + /* Make sure the linker knows how to call us */ + .globl __sys_outc + .type __sys_outc, %function + .size __sys_outc, . - __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 + +/* + * 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 + + .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 From nobody Wed Nov 27 06:40:25 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=1700081809; cv=none; d=zohomail.com; s=zohoarc; b=lwGpwY7OAO+7iGK6z9SRF/uSkUkvBsG7EK+iSjq/0a9MRJ1Yhh3FP3p4waTAOxdwDqxjbg2JfmX5QBa5YZfpVBVdcBN1hHQjr8Pwy+sAJPfdDltmH8AEznzKfHtZvA7Rf0pO4hvbu6dqWDLS4z/rffe7x+Q5x9xTu77KXCsaFVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700081809; 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=SP6zq+rtAF+Kil2TslM8X6LBRppN6PJr3GVkxevq5NdhtvNXsUrI66o1E5uHF9st4DYzHNEXKruAa9lleJRvZU+IQRgBAtZhfJ50rl+eH7WkdSQkD9kAMuLWe4dtBI5P8Ro/LIFrJuYfaCqr7cUEMXm25BtcvrYCIvUTlEx0fLw= 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 170008180919368.05534715893054; Wed, 15 Nov 2023 12:56:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Mvj-0004xx-Vf; Wed, 15 Nov 2023 15:56: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 1r3Mvi-0004xO-7v for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:56:10 -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 1r3MvQ-0008CA-QG for qemu-devel@nongnu.org; Wed, 15 Nov 2023 15:56:10 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40790b0a224so504215e9.0 for ; Wed, 15 Nov 2023 12:55:52 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e3-20020adffd03000000b003142e438e8csm11534869wrr.26.2023.11.15.12.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 12:55:46 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A7EC95F7B9; Wed, 15 Nov 2023 20:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700081751; x=1700686551; 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=WJRB7X0EoSv9DuzEjzFBKwvmfPW4jXYmMXfkF6Fx4s85QsSvkBwsDr4eceaI1oHc5r 5mv13Ta0oL6rgPKwuJ62l+0ptSmsnHhjRHXQ+x0ZxN5Jh/3JKkmwRaf7rWvOttGbt/Lx nVNNtokNlMWjq1R4DuQMkQXWBwRn7oIjQBsjXh0VJTssMYUQaw+7qrHdf05+dvYZVZ2k t8sZiGd07flfnRx9BAC0EC43F+VE2vSlDFsLJc8Km/lf5WPJCzNyWtL0b1Zi/Ef6mXjC aBDZ6kVeiP45i1YZJ2r5vg+z8QkYmKI20/KuTilA9zDYbt2rgV4k7fgFIRiqnHpYLQPm 6V6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700081751; x=1700686551; 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=SYRmBxJ6M3yZ3HrCal4vHT3Hc5N6sVTAGo2yUfKgfdPa7+QgkfK3AnDjOR4Ot7GOfP 44cgjeV6vPOlRDMQ8KCBTY1jcmHJP2LK48dH856lNG/gtTqlYFiFKeJhS6PiypOP27gW XFJd2CYpRCZo08QMg9oJdcUkb9ukDvQCfOTrZ7slQwhvACOrckf+NriiNeZCse8h2AgV 8VX6MDA7EgoXa0IXW5mV4tZpXibYD2dHvNlMPMmMITveBSx9X4bfRDvQzf87x9ssEQSL Q4v43ACXvhVwoOGxoahCNq1vtUnpZHjq66/4XYNptGldcE2cNhkJkfBCji6vGqGfHAYg rZbQ== X-Gm-Message-State: AOJu0Ywf5KqlwgYnQe1Td2sqo7FPcxNsDu3fjuEg8FEzbn2d0Lmalpcx sjTKc43aG7cvEqe+R+zGP2AXkw== X-Google-Smtp-Source: AGHT+IHwdwqYIKKLBmm3Mimv7EMxq41QltSW7JdqpbWZl0arue0D4KI8OIXlm+BwxHWi/7vcCv3HTQ== X-Received: by 2002:adf:ebca:0:b0:32c:ea14:89e5 with SMTP id v10-20020adfebca000000b0032cea1489e5mr9227991wrn.39.1700081751329; Wed, 15 Nov 2023 12:55:51 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Peter Maydell , Beraldo Leal , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Alexandre Iooss Subject: [PATCH 10/10] tests/tcg: enable semiconsole test for Arm Date: Wed, 15 Nov 2023 20:55:42 +0000 Message-Id: <20231115205542.3092038-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115205542.3092038-1-alex.bennee@linaro.org> References: <20231115205542.3092038-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, 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: 1700081811119100001 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