From nobody Thu May 9 08:28:17 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=1659086926; cv=none; d=zohomail.com; s=zohoarc; b=dH6VOCQU4QFCGUmxgQ6SmzsqaeinLbj23vkwvGl6MrYKQZmtTerazQjxe5DzxWG1PXYlrtEPwW/HLnyT+ndG6JCfHS6Xfaw6U9raTtmsDmNFWhvB47nkCq+JkQBuYAxe6hJxnx074Ok6cdU+VdR1b2+b8Y4ZoMh02ngepwVP0FQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659086926; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UWs22E+OLc1dgV2D716Uqj1nygUp2lEcOLcEu7aNjhA=; b=j7dMcOfcqcWlehqJNRZR08cU24UErjB/Bm0VPRNBACA8xASwyqToQOw2CdB8vndqIYR1MyzwVdI5xrQbGwHltJDQAvgp/sDeKUis1PiHboFiSofxU8wOVMJzEsKdNjtRGa8rlv4/7/ysWqQKlYRMR1iP8d/mmRZTdKhvCenIwqw= 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 1659086926892776.7402394495547; Fri, 29 Jul 2022 02:28:46 -0700 (PDT) Received: from localhost ([::1]:35034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMIX-0005Xp-IB for importer@patchew.org; Fri, 29 Jul 2022 05:28:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHM9z-0002Vh-7D for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:00 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:43853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHM9w-0005s9-4E for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id j29-20020a05600c1c1d00b003a2fdafdefbso2209639wms.2 for ; Fri, 29 Jul 2022 02:19:50 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u13-20020a05600c19cd00b003a2e1883a27sm10034734wmq.18.2022.07.29.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF72F1FFB8; Fri, 29 Jul 2022 10:19:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UWs22E+OLc1dgV2D716Uqj1nygUp2lEcOLcEu7aNjhA=; b=E8XkGejQI3FwcZWFkFvyoFMb6mwAj2luf4IYOxK9os6HEnOJEPbzdGm7yJ0d2wUUnH B+k0HR7LU7fFoTPCDWywQRMFAfeGSTdkuKzRKlypHz+jTbaj0/o0kcdV0gyLBw+1qV+p 54ktAdg3G7jjimRxEVCld047ov0xIAQ3CmK3fnaIECB/zelMZVHZJMjn5+V5vNuOXerM YQW+FhLhSFRz9pVmzPV0qz+lyeWsMtviXKsQL/0Nav9kTLBgq1Dc1nDeT6NiBXF57NMt WiRxBZgxv3LNb3RjtZYDoWMHJ4thDSzOzj/VK/MG9eoT9lQ4BL0mZT3cSNuPsbHXvSnq nz3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UWs22E+OLc1dgV2D716Uqj1nygUp2lEcOLcEu7aNjhA=; b=AHMCoGFK1489QzZ+JLosGJtraYgvCDFq5opbJq8jkvgS6hfz1Fcib+t1eFVaiTItL8 Xrp++3tYHia4LA/cwSB4xsBRLPNdh8Yc/Ff7tKYaegJ522YHf5OPv/yZ1a9gqVumxpy5 I237W1iKgnoIpMnyEPgWaZ+/54fre6U3ERmmHwR9WVzmE6wU+dyJZll7BtPCq9hiNr0r 95WYh+Tsf9mQKsJhgeDLdTsVuN/kb0TffKLNG8ajRA2TnxB0ILjFaGKJVRtUjs2/d4w1 E4CvyDVycl5o3yLAtO9kgHsrfV3TbxO6gXYwOMcsuO2H1wdB5IY8mldIYd8cz0ORjNRf 6NJg== X-Gm-Message-State: AJIora/FtKU/e4xsTw1aWb2fatfECTtHORq6BgoaEDr52n+3qCr8RjgL qd1YwyFXg4I+mAvZQ9GTrtErRg== X-Google-Smtp-Source: AGRyM1sF1mQ9INR4AaZl9QpLzrR4uQdtdB/0atFTpsK8R/9lx1diBZ78ysXLV78ByzetV4HR4Vn7LA== X-Received: by 2002:a05:600c:1e8a:b0:3a3:20fc:a651 with SMTP id be10-20020a05600c1e8a00b003a320fca651mr1819758wmb.39.1659086389479; Fri, 29 Jul 2022 02:19:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ed Maste , Li-Wen Hsu , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/13] tests: refresh to latest libvirt-ci module Date: Fri, 29 Jul 2022 10:19:31 +0100 Message-Id: <20220729091943.2152410-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659086928831100001 From: Daniel P. Berrang=C3=A9 Notable changes: - libvirt-ci source tree was re-arranged, so the script we run now lives in a bin/ sub-dir - opensuse 15.2 is replaced by opensuse 15.3 - libslirp is temporarily dropped on opensuse as the libslirp-version.h is broken https://bugzilla.opensuse.org/show_bug.cgi?id=3D1201551 - The incorrectly named python3-virtualenv module was changed to python3-venv, but most distros don't need any package as 'venv' is a standard part of python - glibc-static was renamed to libc-static, to reflect fact that it isn't going to be glibc on all distros - The cmocka/json-c deps that were manually added to the centos dockerfile and are now consistently added to all targets Acked-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220722130431.2319019-2-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson Message-Id: <20220725140520.515340-2-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index f59263731f..8fa5a320e9 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -1,5 +1,4 @@ # THIS FILE WAS AUTO-GENERATED -# ... and then edited to fix py39, pending proper lcitool update. # # $ lcitool variables freebsd-12 qemu # @@ -12,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 = pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_= rtd_theme py39-virtualenv py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy= spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja= opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index 40fc961398..8ed7e33a77 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -1,5 +1,4 @@ # THIS FILE WAS AUTO-GENERATED -# ... and then edited to fix py39, pending proper lcitool update. # # $ lcitool variables freebsd-13 qemu # @@ -12,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 = pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_= rtd_theme py39-virtualenv py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy= spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja= opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-= 11.vars index cfe9181fd4..bec6e862d4 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/usr/local/bin/pip3' -PKGS=3D'bash bc bzip2 capstone ccache ctags curl dbus diffutils dtc gcovr = gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi l= ibgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo ma= ke meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 = sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3= zlib zstd' -PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +PKGS=3D'bash bc bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc= gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c lib= epoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libu= sb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 = rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usb= redir vde vte3 zlib zstd' +PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 3f4c0f95cb..806cb19f17 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -21,6 +21,7 @@ RUN apk update && \ cdrkit \ ceph-dev \ clang \ + cmocka-dev \ ctags \ curl-dev \ cyrus-sasl-dev \ @@ -39,6 +40,7 @@ RUN apk update && \ glib-static \ gnutls-dev \ gtk+3.0-dev \ + json-c-dev \ libaio-dev \ libbpf-dev \ libcap-ng-dev \ @@ -64,6 +66,7 @@ RUN apk update && \ mesa-dev \ meson \ multipath-tools \ + musl-dev \ ncurses-dev \ ndctl-dev \ net-tools \ @@ -81,7 +84,6 @@ RUN apk update && \ py3-pip \ py3-sphinx \ py3-sphinx_rtd_theme \ - py3-virtualenv \ py3-yaml \ python3 \ rpm2cpio \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 10618bfa83..3c29883332 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -6,11 +6,12 @@ =20 FROM quay.io/centos/centos:stream8 =20 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ + dnf install -y epel-next-release && \ dnf install -y \ SDL2-devel \ alsa-lib-devel \ @@ -45,6 +46,7 @@ RUN dnf update -y && \ gtk3-devel \ hostname \ jemalloc-devel \ + json-c-devel \ libaio-devel \ libasan \ libattr-devel \ @@ -60,7 +62,6 @@ RUN dnf update -y && \ libgcrypt-devel \ libiscsi-devel \ libjpeg-devel \ - json-c-devel \ libnfs-devel \ libpmem-devel \ libpng-devel \ @@ -99,7 +100,6 @@ RUN dnf update -y && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - python3-virtualenv \ rdma-core-devel \ rpm \ sed \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index 503e282802..8d78ba2484 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev \ libcap-ng-dev \ libcapstone-dev \ + libcmocka-dev \ libcurl4-gnutls-dev \ libdaxctl-dev \ libdrm-dev \ @@ -59,6 +60,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev \ libjemalloc-dev \ libjpeg62-turbo-dev \ + libjson-c-dev \ liblttng-ust-dev \ liblzo2-dev \ libncursesw5-dev \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b60426834c..b7ba2c527f 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -84,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:arm64 \ libcap-ng-dev:arm64 \ libcapstone-dev:arm64 \ + libcmocka-dev:arm64 \ libcurl4-gnutls-dev:arm64 \ libdaxctl-dev:arm64 \ libdrm-dev:arm64 \ @@ -102,6 +103,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:arm64 \ libjemalloc-dev:arm64 \ libjpeg62-turbo-dev:arm64 \ + libjson-c-dev:arm64 \ liblttng-ust-dev:arm64 \ liblzo2-dev:arm64 \ libncursesw5-dev:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index a6153e5a83..9b1778261e 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -84,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:armel \ libcap-ng-dev:armel \ libcapstone-dev:armel \ + libcmocka-dev:armel \ libcurl4-gnutls-dev:armel \ libdaxctl-dev:armel \ libdrm-dev:armel \ @@ -102,6 +103,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:armel \ libjemalloc-dev:armel \ libjpeg62-turbo-dev:armel \ + libjson-c-dev:armel \ liblttng-ust-dev:armel \ liblzo2-dev:armel \ libncursesw5-dev:armel \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index a2ebce96f8..addbc9a793 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -84,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:armhf \ libcap-ng-dev:armhf \ libcapstone-dev:armhf \ + libcmocka-dev:armhf \ libcurl4-gnutls-dev:armhf \ libdaxctl-dev:armhf \ libdrm-dev:armhf \ @@ -102,6 +103,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:armhf \ libjemalloc-dev:armhf \ libjpeg62-turbo-dev:armhf \ + libjson-c-dev:armhf \ liblttng-ust-dev:armhf \ liblzo2-dev:armhf \ libncursesw5-dev:armhf \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index b02dcb7fd9..1bb7d8e184 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -83,6 +83,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:mips64el \ libcap-ng-dev:mips64el \ libcapstone-dev:mips64el \ + libcmocka-dev:mips64el \ libcurl4-gnutls-dev:mips64el \ libdaxctl-dev:mips64el \ libdrm-dev:mips64el \ @@ -101,6 +102,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:mips64el \ libjemalloc-dev:mips64el \ libjpeg62-turbo-dev:mips64el \ + libjson-c-dev:mips64el \ liblttng-ust-dev:mips64el \ liblzo2-dev:mips64el \ libncursesw5-dev:mips64el \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index b6d99ae324..a94b459b23 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -83,6 +83,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:mipsel \ libcap-ng-dev:mipsel \ libcapstone-dev:mipsel \ + libcmocka-dev:mipsel \ libcurl4-gnutls-dev:mipsel \ libdaxctl-dev:mipsel \ libdrm-dev:mipsel \ @@ -101,6 +102,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:mipsel \ libjemalloc-dev:mipsel \ libjpeg62-turbo-dev:mipsel \ + libjson-c-dev:mipsel \ liblttng-ust-dev:mipsel \ liblzo2-dev:mipsel \ libncursesw5-dev:mipsel \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index bcf04bc90b..c641fd5d0e 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -84,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:ppc64el \ libcap-ng-dev:ppc64el \ libcapstone-dev:ppc64el \ + libcmocka-dev:ppc64el \ libcurl4-gnutls-dev:ppc64el \ libdaxctl-dev:ppc64el \ libdrm-dev:ppc64el \ @@ -102,6 +103,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:ppc64el \ libjemalloc-dev:ppc64el \ libjpeg62-turbo-dev:ppc64el \ + libjson-c-dev:ppc64el \ liblttng-ust-dev:ppc64el \ liblzo2-dev:ppc64el \ libncursesw5-dev:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index ff79a2cc4f..c0cbe09e66 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -84,6 +84,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev:s390x \ libcap-ng-dev:s390x \ libcapstone-dev:s390x \ + libcmocka-dev:s390x \ libcurl4-gnutls-dev:s390x \ libdaxctl-dev:s390x \ libdrm-dev:s390x \ @@ -102,6 +103,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev:s390x \ libjemalloc-dev:s390x \ libjpeg62-turbo-dev:s390x \ + libjson-c-dev:s390x \ liblttng-ust-dev:s390x \ liblzo2-dev:s390x \ libncursesw5-dev:s390x \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 2e6a84abfd..b39d311bbc 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -53,12 +53,14 @@ exec "$@"' > /usr/bin/nosync && \ gtk3-devel \ hostname \ jemalloc-devel \ + json-c-devel \ libaio-devel \ libasan \ libattr-devel \ libbpf-devel \ libcacard-devel \ libcap-ng-devel \ + libcmocka-devel \ libcurl-devel \ libdrm-devel \ libepoxy-devel \ @@ -106,7 +108,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - python3-virtualenv \ rdma-core-devel \ rpm \ sed \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 6f5993d602..047a435ab5 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-153 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.2 +FROM registry.opensuse.org/opensuse/leap:15.3 =20 RUN zypper update -y && \ zypper install -y \ @@ -44,6 +44,7 @@ RUN zypper update -y && \ libbz2-devel \ libcacard-devel \ libcap-ng-devel \ + libcmocka-devel \ libcurl-devel \ libdrm-devel \ libepoxy-devel \ @@ -53,6 +54,7 @@ RUN zypper update -y && \ libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ + libjson-c-devel \ libndctl-devel \ libnettle-devel \ libnfs-devel \ @@ -94,7 +96,6 @@ RUN zypper update -y && \ python3-pip \ python3-setuptools \ python3-sphinx_rtd_theme \ - python3-virtualenv \ python3-wheel \ rdma-core-devel \ rpm \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index a3b38884e3..99803b343b 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -40,6 +40,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libcacard-dev \ libcap-ng-dev \ libcapstone-dev \ + libcmocka-dev \ libcurl4-gnutls-dev \ libdaxctl-dev \ libdrm-dev \ @@ -58,6 +59,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libiscsi-dev \ libjemalloc-dev \ libjpeg-turbo8-dev \ + libjson-c-dev \ liblttng-ust-dev \ liblzo2-dev \ libncursesw5-dev \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index f83b916d5e..324355cf62 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb +Subproject commit 324355cf62e86fb551408575afb123bac989ac37 diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index d068a7a8de..d9f826f8eb 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -9,6 +9,7 @@ packages: - capstone - ccache - clang + - cmocka - column - ctags - cyrus-sasl @@ -26,15 +27,16 @@ packages: - genisoimage - glib2 - glib2-static - - glibc-static - glusterfs - gnutls - gtk3 - hostname + - json-c - libaio - libattr - libasan - libbpf + - libc-static - libcacard - libcap-ng - libcurl @@ -90,7 +92,7 @@ packages: - python3-pip - python3-sphinx - python3-sphinx-rtd-theme - - python3-virtualenv + - python3-venv - rpm2cpio - sdl2 - sdl2-image diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5e260f8cd6..2a59150322 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -25,7 +25,7 @@ self_dir =3D Path(__file__).parent src_dir =3D self_dir.parent.parent dockerfiles_dir =3D Path(src_dir, "tests", "docker", "dockerfiles") =20 -lcitool_path =3D Path(self_dir, "libvirt-ci", "lcitool") +lcitool_path =3D Path(self_dir, "libvirt-ci", "bin", "lcitool") =20 lcitool_cmd =3D [lcitool_path, "--data-dir", self_dir] =20 @@ -112,7 +112,7 @@ try: generate_dockerfile("debian-amd64", "debian-11", trailer=3D"".join(debian11_extras)) generate_dockerfile("fedora", "fedora-35") - generate_dockerfile("opensuse-leap", "opensuse-leap-152") + generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer=3D"".join(ubuntu2004_tsanhack)) =20 --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659086959; cv=none; d=zohomail.com; s=zohoarc; b=N0t+F35Yqk+WWbmJrdKtZ3Ryuu3QaxQO2TOlkGgae9z1s6hmlSqtiQRkT6CAbCseAV78dJBerpRvdCsqwSwJfh999UZXiuO4Isdw2qVaEygAApOeEPuwiF5K8e7kspvSndNvf2nMi0V22X2LOuwP7ZknPX55fCvtqe/FjjVI01Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659086959; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9TB20DlqBprHHxxOekwwN1RvvKSvZYxOn7yLSPiI1qg=; b=OLU9ujMwm2jD3OT3WCHi/NTndgrglfxiU5tPue9ECK+E0cfNn+ge/6daZzi9veotD2DQNlO/7pHJUW5FbnTU5eKQArudgzhnQUItazFaQttc3de26sZh/TWqCXwnzyWKLZSZIvXDEaeFaKnFmlRFMuTCpQWyZnJoX1rYWqa5JuQ= 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 1659086959789737.8655179335533; Fri, 29 Jul 2022 02:29:19 -0700 (PDT) Received: from localhost ([::1]:36070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMJ4-0006Np-Nv for importer@patchew.org; Fri, 29 Jul 2022 05:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHM9w-0002Ui-Mz for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:53 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHM9t-0005s1-Fo for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:52 -0400 Received: by mail-wr1-x42d.google.com with SMTP id k8so3091346wrd.5 for ; Fri, 29 Jul 2022 02:19:48 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l13-20020a5d668d000000b0021d63fe0f03sm3127823wru.12.2022.07.29.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0E13C1FFBA; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9TB20DlqBprHHxxOekwwN1RvvKSvZYxOn7yLSPiI1qg=; b=Od7oE8RQCzDn3L0XR6GX6D/MyLuZ4nEQIq0ikjYPOvqdEDQiUY2NjqQIax+3WyzY14 tkldi5kRx31j/n+rpuXSYCddOa8MziNQllLwRwvlt3hDiSc9mn/OHQ9CR49tE49eB+xE 24/SN87M0hP2yqtlzBh24MTVt4zbPkDNNWnPgGYfBMSCSgD0efs9USEd092rUh/4tKD6 7qQzoSv58OMp0XO6VFSOpQZyIjhuG8TWPHdQBvUpNfUoudIen026QuGrgJPRcaIhFckR meFQEJLUYmn4PsQj0ZMlGDt0k0sq84IyGU7MPV0XOIOkXIc+EubyhP3v4KkFzKfb2u8q hR2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9TB20DlqBprHHxxOekwwN1RvvKSvZYxOn7yLSPiI1qg=; b=5sXX3cBXBHQKDA1hun2aADLNFN9oir/c7wm4LgrKpBTE3VwQzSO2O2kIQiemQPcuwj u7RRXyx5DKfTDKKtM6XRXdQdZYmI4XJoZb/NlSFGljpQAQ9GOG6XDZZErzfPiJ4yXrEl 53ks9dpSSR9oskdZOfRqUNouEs5Z28inruJL2aHfzjISxbNvPRnVOWRB5bq2wadj9LWC SOAq65IoNiuqKkgMIkrcGmky+RtDE1O366fKrO8ElHXAj+2O2y6cR2xiXj96ojWFxXJU qZaZjNUKagqkPMjKqaPdUcDX6+r8rbHfOCkraHiqgLu0GdIyZ6jzrYCG1ovIcYuUFlfq 9egQ== X-Gm-Message-State: ACgBeo0dLsBVuzgMrK22Af0Kpg1TqqNKi8khsyjVt0NhhQO8lyP9cBKu y9OO7gI2oUUYnpU8vM2Zj9wutw== X-Google-Smtp-Source: AA6agR7/txvfuCA/vF4YisY7yG9PfFYpvRtILFr37gD0bMqXty51hneBZ846WY6s44HyCzcxmKc+/Q== X-Received: by 2002:a05:6000:1542:b0:21e:9018:f648 with SMTP id 2-20020a056000154200b0021e9018f648mr1773201wry.160.1659086387251; Fri, 29 Jul 2022 02:19:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/13] gitlab: show testlog.txt contents when cirrus/custom-runner jobs fail Date: Fri, 29 Jul 2022 10:19:32 +0100 Message-Id: <20220729091943.2152410-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659086961172100001 From: Daniel P. Berrang=C3=A9 When tests fail meson just displays a summary and tells you to look at the testlog.txt file for details. The native jobs on shared runners publish testlog.txt as an artifact. For the Cirrus jobs and custom runner jobs this is not currently possible. The best we can do is cat the log contents on failure, to give maintainers a fighting chance of diagnosing the problem. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220722130431.2319019-3-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725140520.515340-3-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index c555f5d36e..7ef6af8d33 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -32,5 +32,6 @@ build_task: - $MAKE -j$(sysctl -n hw.ncpu) - for TARGET in $TEST_TARGETS ; do - $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=3D1 ; + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; done diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitl= ab-ci.d/custom-runners/centos-stream-8-x86_64.yml index 49aa703f55..068b0c4335 100644 --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml @@ -23,6 +23,8 @@ centos-stream-8-x86_64: - mkdir build - cd build - ../scripts/ci/org.centos/stream/8/x86_64/configure + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make -j"$JOBS" - make NINJA=3D":" check + || { cat meson-logs/testlog.txt; exit 1; } ; - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch32.yml index 1998460d06..cbfa9cc164 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml @@ -19,5 +19,7 @@ ubuntu-20.04-aarch32-all: - mkdir build - cd build - ../configure --cross-prefix=3Darm-linux-gnueabihf- + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch64.yml index 65718a188a..3d878914e7 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -17,9 +17,12 @@ ubuntu-20.04-aarch64-all-linux-static: - mkdir build - cd build - ../configure --enable-debug --static --disable-system --disable-gluster= fs --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; - make --output-sync -j`nproc --ignore=3D40` check-tcg V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-aarch64-all: needs: [] @@ -38,8 +41,10 @@ ubuntu-20.04-aarch64-all: - mkdir build - cd build - ../configure --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-aarch64-alldbg: needs: [] @@ -54,9 +59,11 @@ ubuntu-20.04-aarch64-alldbg: - mkdir build - cd build - ../configure --enable-debug --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-aarch64-clang: needs: [] @@ -75,8 +82,10 @@ ubuntu-20.04-aarch64-clang: - mkdir build - cd build - ../configure --disable-libssh --cc=3Dclang-10 --cxx=3Dclang++-10 --enab= le-sanitizers + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-aarch64-tci: needs: [] @@ -95,6 +104,7 @@ ubuntu-20.04-aarch64-tci: - mkdir build - cd build - ../configure --disable-libssh --enable-tcg-interpreter + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` =20 ubuntu-20.04-aarch64-notcg: @@ -114,5 +124,7 @@ ubuntu-20.04-aarch64-notcg: - mkdir build - cd build - ../configure --disable-libssh --disable-tcg + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-c= i.d/custom-runners/ubuntu-20.04-s390x.yml index 03e74c97db..0c835939db 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -17,9 +17,12 @@ ubuntu-20.04-s390x-all-linux-static: - mkdir build - cd build - ../configure --enable-debug --static --disable-system --disable-gluster= fs --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; - make --output-sync -j`nproc` check-tcg V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-s390x-all: needs: [] @@ -35,8 +38,10 @@ ubuntu-20.04-s390x-all: - mkdir build - cd build - ../configure --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-s390x-alldbg: needs: [] @@ -55,9 +60,11 @@ ubuntu-20.04-s390x-alldbg: - mkdir build - cd build - ../configure --enable-debug --disable-libssh + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-s390x-clang: needs: [] @@ -76,8 +83,10 @@ ubuntu-20.04-s390x-clang: - mkdir build - cd build - ../configure --disable-libssh --cc=3Dclang --cxx=3Dclang++ --enable-san= itizers + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; =20 ubuntu-20.04-s390x-tci: needs: [] @@ -96,6 +105,7 @@ ubuntu-20.04-s390x-tci: - mkdir build - cd build - ../configure --disable-libssh --enable-tcg-interpreter + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` =20 ubuntu-20.04-s390x-notcg: @@ -115,5 +125,7 @@ ubuntu-20.04-s390x-notcg: - mkdir build - cd build - ../configure --disable-libssh --disable-tcg + || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=3D1 + || { cat meson-logs/testlog.txt; exit 1; } ; --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659087767; cv=none; d=zohomail.com; s=zohoarc; b=QZ2j/sRQumjg3kh9M4RCB1cs+uXAgDhsSNmvLLqhM/cbZQxQAEnHS+lLdD0Txm77gRKPEP/NRtazzrcCCRs34hWj4cBUaSAV2i1bmYdSAPmZxGsQryjIR1+KFyXngon1SUL4Ht0WhJJfrWwjSjg+C1CS2E0Mnu2SaN4m+qZUVo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659087767; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Did8YFLxDWVlc9GWzEzTmKN+csU0Qz/8Q4CxgKIKjyY=; b=eAEQFp7ptzm/edS+QXoSG/2dFqIF1pOU2Kgq4MKFQGQ87eyUARzFO+ebC+JUP4uIs1NidSTEawRtY0dxfwpaTsPQgBTNaTQ9VZCkT+qRP/ZFBG4zMHmqlk75nQa/vbUucrOpEXwl/3Zlpc+fXK9q/7Ymcj3CBOkOpVNYq4VaMrY= 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 1659087767559619.247153175391; Fri, 29 Jul 2022 02:42:47 -0700 (PDT) Received: from localhost ([::1]:50720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMW6-00009W-7C for importer@patchew.org; Fri, 29 Jul 2022 05:42:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHM9x-0002VP-Oo for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:54 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:37492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHM9v-0005sB-Ux for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:53 -0400 Received: by mail-wm1-x32c.google.com with SMTP id c187-20020a1c35c4000000b003a30d88fe8eso3819306wma.2 for ; Fri, 29 Jul 2022 02:19:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y8-20020adfdf08000000b0021e084d9133sm3750627wrl.27.2022.07.29.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1FCBA1FFBB; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Did8YFLxDWVlc9GWzEzTmKN+csU0Qz/8Q4CxgKIKjyY=; b=gnQHMUCxSSL1DWQXEa44/S61aWJs9DDqjWREMnEgHtrdES7oSV5vqCxfea+RrHWSL6 2BlzXf6dB88CHuUpsogY5wdLUhMhyrvOrLlo2yijH/pHWMgZerD9V9c6Bi9sqBYFkx+p Fcgdp/D+ufqLnuZ2pa6011cHeY2QFEftEZnYXB4yKDPwzjd95SaFjTq8VFE4147tyxot 1r+cGksScT/pFhjNH+UrrKzc5CscZZdVi/L4AiKMn+cxDTdfIhm6RotDewrkEK9WKEg6 g6hYh/NGwL8KM9xPalmN18XrF7lg7tH4l9jr2m93sD9Ep7QOUaZLqUJAsjYc6R0LFWk2 AQvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Did8YFLxDWVlc9GWzEzTmKN+csU0Qz/8Q4CxgKIKjyY=; b=XH3H6kU1nUy9nRuAAm+RNLAaP/GbIjW9EPWB+NHKSYlBhtyR/quhwDFz8tyzY9sLcr BgQCG+x57gfga2QmxOMYQC2EvTrk+Gsau0suZ9Wfr63lypzGBOgq38TX7+j7EWQW2FH0 sZjOm6DqqJBHErEvSOUdRNGT4yji9iJ9g2HOivYoRTn0hypdVwV9hZOB71/X4uCdd8lE kl72yQoBONP/XzyZCAcKwZ4bDoH/mhfA44dZEfZyNWGkNoNXMhwSyjpDtnO7hUxdOi1Y sPBj56kbwLXNH5y87JB0AnmdR7A5/r6tx0DGTJu7zZ+xjoNmqOUuRFqC5a4nDFc+bY+c Le2w== X-Gm-Message-State: AJIora+upCzf/4iOsxs+vuC3DnB69xuIuTBE2qTjNsR9kOYYfn4vc2Ke JUvoobFHUX/+jB6cf0qme6Xpbg== X-Google-Smtp-Source: AGRyM1vJHmxHgLkdP0TVfl6yT5Q8MWpissVbnf0Xjd4tsq0FYH+u2UMQcnvjg9+hLjI9Poix5bhCKg== X-Received: by 2002:a05:600c:893:b0:3a3:1d8:c7b9 with SMTP id l19-20020a05600c089300b003a301d8c7b9mr1775263wmp.156.1659086390345; Fri, 29 Jul 2022 02:19:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/13] gitlab: drop 'containers-layer2' stage Date: Fri, 29 Jul 2022 10:19:33 +0100 Message-Id: <20220729091943.2152410-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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=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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659087770127100001 From: Daniel P. Berrang=C3=A9 Since we express dependencies via a 'needs' clause, we don't need to split container builds into separate stages. GitLab happily lets jobs depend on other jobs in the same stage and will run them when possible. Acked-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220722130431.2319019-4-berrange@redhat.com> [AJB: fix typo] Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220725140520.515340-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index b7963498a3..505b267542 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,20 +1,20 @@ alpha-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross =20 amd64-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross =20 amd64-debian-user-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross @@ -65,21 +65,21 @@ hexagon-cross-container: =20 hppa-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross =20 m68k-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross =20 mips64-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross @@ -92,7 +92,7 @@ mips64el-debian-cross-container: =20 mips-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross @@ -105,7 +105,7 @@ mipsel-debian-cross-container: =20 powerpc-test-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian11-container'] variables: NAME: debian-powerpc-test-cross @@ -127,7 +127,7 @@ riscv64-debian-cross-container: # we can however build TCG tests using a non-sid base riscv64-debian-test-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian11-container'] variables: NAME: debian-riscv64-test-cross @@ -140,21 +140,21 @@ s390x-debian-cross-container: =20 sh4-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross =20 sparc64-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross =20 tricore-debian-cross-container: extends: .container_job_template - stage: containers-layer2 + stage: containers needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross diff --git a/.gitlab-ci.d/stages.yml b/.gitlab-ci.d/stages.yml index f50826018d..f92f57a27d 100644 --- a/.gitlab-ci.d/stages.yml +++ b/.gitlab-ci.d/stages.yml @@ -3,6 +3,5 @@ # - test (for test stages, using build artefacts from a build stage) stages: - containers - - containers-layer2 - build - test --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659087209; cv=none; d=zohomail.com; s=zohoarc; b=Cjj5NkATUj2aad4FvhfBlEquq1hfy99KtGB6bDy84WDqfOxI84MxqEwMj0nzsLgEFkn+k5B9wy0IYi1Fz3rD0JQhwpcnwzE5o40a7QZmw9YplKp9iZ/niFIszG0EQpahcKDjyXxww5DWL7k3HlP6Qd6nfftXHYFiHmIAX7U8XgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659087209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b4rzYyOyefgD+FFgRWQ2ANlZ3iuspDOKuCWBXcKDEb8=; b=anxIBTP/Kbjp2825wCoc94R8PI+SsUcAMo4j5AKCdCpFdVp1+LkriW1Hp5zo0c1Bcz6leW4W2wfLIl6Rqmwton9BIkDkFSaEbkCdrQsFJqt479nPUmFMqju1I6uaE7qad4q1NGsPgTG6daDC9KcTK4JoBAOaGca+WBb4BiIsd+c= 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 1659087209820681.2257684346214; Fri, 29 Jul 2022 02:33:29 -0700 (PDT) Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMN6-00037l-GE for importer@patchew.org; Fri, 29 Jul 2022 05:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA3-0002Vo-6B for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:01 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHM9x-0005sZ-Qo for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:19:55 -0400 Received: by mail-wm1-x336.google.com with SMTP id ay11-20020a05600c1e0b00b003a3013da120so3808201wmb.5 for ; Fri, 29 Jul 2022 02:19:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q5-20020a1ce905000000b003a320e6f011sm3822090wmc.1.2022.07.29.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 38FCA1FFBC; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b4rzYyOyefgD+FFgRWQ2ANlZ3iuspDOKuCWBXcKDEb8=; b=rEzMREBiGFmJmh9mOGgHt+hyaauQH2/xi1890csC02z0C4ry13xZ1ch64qXJ0CTOQ0 zBpCCf5jQp4juRCF+WhtCmiFtWfr2XhAn+N/VTM1QuETMd8PHEFCXQIv3VQPwMgL1BmY TViVxMN5JF9fVa6w7w9rcQ+3Dijs+cwmHJTE/VSGcvyR2gjohRGsNpkRjIsH68xM8SQp Cb05AuxxuG6BigyNWSEy4lD227tBnj4LWUn84CmILAgaRMWyyra82MH8SY6oLDBGM++U vAb193N3lTCfmhIbFMR40akcAYpEzgdcMiU1+d+iXvRbrkEubtCbe+mUULKMwiSKqaB/ +EOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b4rzYyOyefgD+FFgRWQ2ANlZ3iuspDOKuCWBXcKDEb8=; b=hKMdzZfrhUaOuoobuKGBHIW7pg+2JaiecWqsGuFcCuFqNMqGvoZ/26ITkLarUfgkKB JPQnNEbTG5SgOOhKnQBINejTTNUaJp0gt1ZmiRxkP63u8uSYeUAKM+l6TJPW/JKLjINy av2dgxg3Ss3FzXtxkJI8Lp4f/HTgxzqNq849xkLcNH57hRDgpvkTrfVwCptAI2zK2khF YYQ5Vi8SEJLcJvn/7C7rJrbbEez4U9hVmN5ucwoHBcFxhLX5YmqW7eg8SB6lSOvOpcq6 XTpeHJkUCzZR3BOI37j8KnPoIE+MWzetfzI1mLKIWdJtkN4Z4eEqe/M91i7hK9gVLI5p px6Q== X-Gm-Message-State: AJIora94Ixz1hvNFWGfyJBlm8taNJdLlFhh71/Z1L07QpaKcYHTgCkrZ ZU3vXFLIcNogD6GG6hbw3mhl4Q== X-Google-Smtp-Source: AGRyM1tEZBoGC00S5vZVpuf9HCT71V7/iuoowtoYlL9DOLeysAEW8Si/nnGcD0LZqLCgqm6HsW4ZdA== X-Received: by 2002:a1c:2981:0:b0:3a2:ffe9:945c with SMTP id p123-20020a1c2981000000b003a2ffe9945cmr2173934wmp.38.1659086392490; Fri, 29 Jul 2022 02:19:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Bin Meng , Thomas Huth , Yonggang Luo , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 04/13] .cirrus.yml: Change winsymlinks to 'native' Date: Fri, 29 Jul 2022 10:19:34 +0100 Message-Id: <20220729091943.2152410-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659087211775100001 From: Bin Meng At present winsymlinks is set to 'nativestrict', and its behavior is: a) if native symlinks are enabled and exists, creates as a native Windows symlink; b) else if native symlinks are not enabled or if does not exist, 'ln -s' fails. This causes the following error message was seen during the configure: "ln: failed to create symbolic link 'x86_64-softmmu/qemu-system-x86_64.exe': No such file or directory" Change winsymlinks to 'native' whose behavior is most similar to the behavior of 'ln -s' on *nix, that is: a) if native symlinks are enabled, and whether exists or not, creates as a native Windows symlink; b) else if native symlinks are not enabled, and whether exists or not, 'ln -s' creates as a Windows shortcut file. Signed-off-by: Bin Meng Acked-by: Thomas Huth Reviewed-by: Yonggang Luo Message-Id: <20220719161230.766063-1-bmeng.cn@gmail.com> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725140520.515340-5-alex.bennee@linaro.org> diff --git a/.cirrus.yml b/.cirrus.yml index 20843a420c..eac39024f2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ windows_msys2_task: memory: 8G env: CIRRUS_SHELL: powershell - MSYS: winsymlinks:nativestrict + MSYS: winsymlinks:native MSYSTEM: MINGW64 MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/= 2022-05-03/msys2-base-x86_64-20220503.sfx.exe MSYS2_FINGERPRINT: 0 --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659086922; cv=none; d=zohomail.com; s=zohoarc; b=FpaxCcSJsDbUO6QWyB9/cti/TzDCKJ/GRnxlHwVpdUev4HnuPv/VJ6tCfV3VvKBdKfpnM5/tHNiqDfcdE4ggBqB47VXBFwMsebIoiWY2qqgSNHUhUhPleTQLthYtDAO77SXfKQICic7duk6bUwWaEE19jRy3VGi5LFOkp3dLO74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659086922; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vDDDAtTRJ4elteu1Ws3KBzxZl/nQbgq+eqnl2bGuaM8=; b=PWnLEkpnNaQsZO+n/mfi2ap9vcDM5SiMsdCCqgvVVBEZApOAiWlSdvwuMT36PPQaxTL+nqImau0ZlXy7Q6nmG1PoDa+77f/S7dT0I2OKYPIMxQMDDr4kHSg/QM3nnJ+5F6jeGPf7Zp/mskiRTnJe4GgFFXrAAj38z17JCJa7rjw= 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 1659086922698660.483800099944; Fri, 29 Jul 2022 02:28:42 -0700 (PDT) Received: from localhost ([::1]:34994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMIS-0005Vv-MF for importer@patchew.org; Fri, 29 Jul 2022 05:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA6-0002WX-Lm for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:02 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:53039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA5-0005tC-09 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:02 -0400 Received: by mail-wm1-x32c.google.com with SMTP id c22so2242023wmr.2 for ; Fri, 29 Jul 2022 02:20:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t13-20020adfe44d000000b0021e2fccea97sm3146860wrm.64.2022.07.29.02.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5056A1FFBD; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vDDDAtTRJ4elteu1Ws3KBzxZl/nQbgq+eqnl2bGuaM8=; b=qZlyx0j87fPHUf5XTPkXD/AZgcM8XUJMUgJQavwv8p1CVLU94MDq5d4opqxav0JBFJ MFvy2kMnxLz3tzmmbDUgfXf0fQiXTrGYVEWJVhexBPrCoG4xu8oFH8bz4gC3j3+x1glL sRgUsCvnetqAotrOwJEVOCc8f1UdY/n6mYX2DwaXw7eNQzI67KeRqZXlVfzwQyKGleRO ll65ux6Bk/Ez9l4IZR1ayvqas0xs2eNOh7KXnMxRg9ZvFzXTPAgqcDQo9f40MZZTIG1O ghwzRDyf0hxy+q4o0uiLOjDVaFmNi0cLsaVNOsQeET9S5Rp3hN5GmNamOpmotItOdchS EjQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vDDDAtTRJ4elteu1Ws3KBzxZl/nQbgq+eqnl2bGuaM8=; b=XcYfTePwZBerL6Q7u+PqdTeca0+FYrHs3aiEYutpbXxxCpYQ92TI0tCl26yTfHNAYH eClLVZjTGpkkmNDO/9lD8ggMBVuGI3NW9LGFcZdBg9o8Tf/ROXK4Fk7jWLDlzeCWT6fW DjtjqI6GKf0hO0eZFV12M+DXEGbNCNgUa9USc6aLrEdBY5Mv/L3SsmH0Z/2C0yjuxCGZ BON2ziFaghQeZO+oKymo/emaxxTiULmQ7BmIpTuk6wsrvapUH1P3gLtebmI4NT25cLwD 6YvGM7eb/ZT3qczlAV/rL2whMehUXoqDPcidxJQdTKFMiHpWyYJFT7eNbzzETr1DaXMw 5CiA== X-Gm-Message-State: AJIora8ldBRaChccef9U6WnntieP/+i9oKUopuiv+jxHzBD5Z3iUrhhc zq3lcOTH+/HZP1RFLx+Ip/ftNO6pOjuO4Q== X-Google-Smtp-Source: AGRyM1s3WbpX4xMbly/Nw9hFi09s0sgx/E/jFmDGXjxNdApedSI7gwAq5DRNK1RpmOIS2cqQ1ojLNw== X-Received: by 2002:a05:600c:4296:b0:3a3:58f6:9520 with SMTP id v22-20020a05600c429600b003a358f69520mr1827859wmc.52.1659086399730; Fri, 29 Jul 2022 02:19:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Bin Meng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink Date: Fri, 29 Jul 2022 10:19:35 +0100 Message-Id: <20220729091943.2152410-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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=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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659086925828100001 From: Bin Meng The following error message was seen during the configure: "ln: failed to create symbolic link 'x86_64-softmmu/qemu-system-x86_64.exe': No such file or directory" By default the MSYS environment variable is not defined, so the runtime behavior of winsymlinks is: if does not exist, 'ln -s' fails. At the configure phase, the qemu-system-x86_64.exe has not been built so creation of the symbolic link fails hence the error message. Set winsymlinks to 'native' whose behavior is most similar to the behavior of 'ln -s' on *nix, that is: a) if native symlinks are enabled, and whether exists or not, creates as a native Windows symlink; b) else if native symlinks are not enabled, and whether exists or not, 'ln -s' creates as a Windows shortcut file. Signed-off-by: Bin Meng Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725123000.807608-1-bmeng.cn@gmail.com> Message-Id: <20220725140520.515340-6-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 1b2ede49e1..0b9572a8a3 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -57,6 +57,7 @@ msys2-64bit: mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - $env:MSYSTEM =3D 'MINGW64' # Start a 64 bit Mingw environment + - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - .\msys64\usr\bin\bash -lc './configure --target-list=3Dx86_64-softmmu --enable-capstone --without-default-devices' - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=3D/d' build/config-host.mak" @@ -89,6 +90,7 @@ msys2-32bit: mingw-w64-i686-usbredir " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinG environment + - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - ..\msys64\usr\bin\bash -lc "../configure --target-list=3Dppc64-softmmu" --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659087682; cv=none; d=zohomail.com; s=zohoarc; b=LCPMDxzoT8Oa4SBaKXxsDpUvYTd0ZctmCxrSdC3rCt1F42U5z5/iCWLZem/QrFmkMVsdZyADN5SyTXDstuPW/Gf+xM65mK8bNAwGKP7tRAEXiqAM8C30rr2FVazg1E4DuVRIeYqZ4FXBlMRWCG/GQQDyJXS6mwsLQjEH4hYjkOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659087682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CI2B5ZVJoTazFK681pZ94MwKHGJqZMA5i4E0K05POYU=; b=dzhi4srlfS9e2SDHevaYaekZ6ygEmqQKKFmPbBWLsDI79jq28W+yaFzB8jK0VWj2tkf29opgVnNgwZHTFB5V5LwBxl1QXdI3dXH4AWJEvRbkQL7kO5CcoN4EyN3DRRVI4G7sqFHbo/we9XTcHxN7UVhdaQbVFSVoOQ+Oqywmkdo= 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 165908768281380.81378103407485; Fri, 29 Jul 2022 02:41:22 -0700 (PDT) Received: from localhost ([::1]:50126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMUi-0008Bh-ID for importer@patchew.org; Fri, 29 Jul 2022 05:41:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA4-0002Vr-I6 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:02 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:39701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA2-0005sy-Tn for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:00 -0400 Received: by mail-wm1-x334.google.com with SMTP id i10-20020a1c3b0a000000b003a2fa488efdso1600164wma.4 for ; Fri, 29 Jul 2022 02:19:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o5-20020a05600c510500b003a2d6f26babsm4043065wms.3.2022.07.29.02.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5CB321FFBE; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CI2B5ZVJoTazFK681pZ94MwKHGJqZMA5i4E0K05POYU=; b=ZQL0/8xif3s7kPiKkVlNFFqMfrdbHCXSAoTEkrztckLNH7aLSr5xqcQbpmsTp/URDJ j3BSES1pKnt7gu9RbbaHA+W+HEYRJAyI5O5sXaO/xCkcMnzlpm82EQrCc6Qou/JKuJDX 5VHUty0AYW0hlFq7tKxxF/+Z0W1L8INwOLDXly5jxKR5akv6YNKjjyEU3JuAdmEOUDe1 PtsncnqXRvIujqSsTruLwjqmHyd0ztzchA4LPfFQRNjklkCtfojhUmIvPyl/9lVO1m7n d1LWgQT6DmPHdvF5jDzcwg9SQIy4d2LZXnGaFcG/dvrbvz61XyFlL3L21jOz7uQ61IFd WAjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CI2B5ZVJoTazFK681pZ94MwKHGJqZMA5i4E0K05POYU=; b=zlkX1Jm3eADp3jbno1eYglDhgACIc0md/CrM1N1AFy0czEHlK2QS217SirUo82MVP1 /7ON1ECZ/Sh6bGaP0psEZESxJg3jz3W+kybs6IozWjgt6N4Pg6PZpt1iW7FIqsDqxIjm odthmTdY6muSly13YIj2tjOe5k/VC2WD1B5qgMkipvn95P5gyNPwNeD9HUCJtX5HHcsY nw2j7F+iPmbXNC++GuPdLCZRLZHjJgeYF6Hx+j1uIrxzfyBiEio5JwkOUZRnPLXU2q6f G2p29l6oWoG2HRt96EdhVID8qBB/WeW5UQGW0HwQikzHccOq8huC/HpQCmYcVz+l+z5F 32Hw== X-Gm-Message-State: AJIora/n0+kGGSzfSy40iE3dJ1DcWZP1Zyq4S2k02SC78bzAKjBJw8MS Dmlpwd9W2044hk8t0MJx4nJQNw== X-Google-Smtp-Source: AGRyM1uGDj9UjMnUr/p/DTE2SweG2zO64jbT/zG9luVuqIeqY4NNvnIj0Jh29k67/5WgCOs6SByzkg== X-Received: by 2002:a05:600c:4e88:b0:3a3:1bdc:cb72 with SMTP id f8-20020a05600c4e8800b003a31bdccb72mr2188940wmq.59.1659086395914; Fri, 29 Jul 2022 02:19:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 06/13] semihosting: Don't return negative values on qemu_semihosting_console_write() failure Date: Fri, 29 Jul 2022 10:19:36 +0100 Message-Id: <20220729091943.2152410-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659087685284100001 From: Peter Maydell The documentation comment for qemu_semihosting_console_write() says * Returns: number of bytes written -- this should only ever be short * on some sort of i/o error. and the callsites rely on this. However, the implementation code path which sends console output to a chardev doesn't honour this, and will return negative values on error. Bring it into line with the other implementation codepaths and the documentation, so that it returns 0 on error. Spotted by Coverity, because console_write() passes the return value to unlock_user(), which doesn't accept a negative length. Resolves: Coverity CID 1490288 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220719121110.225657-2-peter.maydell@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220725140520.515340-7-alex.bennee@linaro.org> diff --git a/semihosting/console.c b/semihosting/console.c index 5b1ec0a1c3..0f976fe8cb 100644 --- a/semihosting/console.c +++ b/semihosting/console.c @@ -111,7 +111,8 @@ int qemu_semihosting_console_read(CPUState *cs, void *b= uf, int len) int qemu_semihosting_console_write(void *buf, int len) { if (console.chr) { - return qemu_chr_write_all(console.chr, (uint8_t *)buf, len); + int r =3D qemu_chr_write_all(console.chr, (uint8_t *)buf, len); + return r < 0 ? 0 : r; } else { return fwrite(buf, 1, len, stderr); } --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659087967; cv=none; d=zohomail.com; s=zohoarc; b=mQT7LJhNTOXqgEGkYC7QnDazhclPdLdLfaF9bq8drbqC63GhfjJtmRAQ7OWAzmZBq3+fvJUdVyEzB5W7ubva/Xxefhy2HXHoaV682+Xts49mrz7U4FJD8YvfuXTRbPNLXxIkj4qZfocEGTijPIRZNWGMWxO8ntGMtziFQ3IEQhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659087967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AlNB6s7eS5tHMbJtmXxfFR2VmBSojG056RBlQYn6roU=; b=P8mnzI6Z+xOJtbYnSzi5u8pPDtA+ROu/wnXL3W0qyLw/0fix+NB/dThwXqa0/igjWftAdLQ098QHR1L7LBRr3nOxxn0b8sxv4cqYFTE9RbY/3RoSAhTzfHg/GcEcvGrxsQhZD35uREonr/sbGUi73niLxcGxWlVgGhvx64PACBQ= 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 16590879677410.9701805401354022; Fri, 29 Jul 2022 02:46:07 -0700 (PDT) Received: from localhost ([::1]:55062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMZK-0003Ef-Oi for importer@patchew.org; Fri, 29 Jul 2022 05:46:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA4-0002Vq-Eb for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:02 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA2-0005st-T4 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:00 -0400 Received: by mail-wm1-x334.google.com with SMTP id id17so2242743wmb.1 for ; Fri, 29 Jul 2022 02:19:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o17-20020a056000011100b0021e6baea4ffsm3182090wrx.29.2022.07.29.02.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 738F11FFBF; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AlNB6s7eS5tHMbJtmXxfFR2VmBSojG056RBlQYn6roU=; b=gGDp4erUISlQ+OXdDXgVLDUPpq3JPj0W3in8+aGe8o+vDacIwEc8feGxVcrUZNXQ3+ NfB7Ag3eSMn0BKxAB41OyhIgUiCf83DaCqNJvAGmCfynYrlAHtBxn72v67Uboikc23R/ QH6ylvtNT04Eoq/8j/HK0WMDjN8V/fO2KUCazHBchT++qrkr2tm2GPqehI19pvw7hDYT 1KkglaRBhGMqi9Nr07WTlcs31PQCF/qrQ/pK+xF88aIV5QvmETHabKbIdlWcI7D+swIr GE81se8dp1QxWPi+SSv6JtWOBqiIRRzXrtvM63mm4cvqALBpZ8u2KVNPZN6Gcln0JeA8 XlYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AlNB6s7eS5tHMbJtmXxfFR2VmBSojG056RBlQYn6roU=; b=PAzlMFidS+H0lisZoYgAIyWfzcKHJDJQchpNzfV2I4LAkC+Wp3zPo6tQggqu6ZL5dV A2uDo6VTnL/vxdvWh1Su7Hdk2AFrfbNvGxl+rBQ8Z42mE9HnlUvhGf5RnOmKVE8NyWVT LrfVazjIWwGwE5RUSAcv0AHnvCXrFV+FyqnMGd01X3L7xOmlvTq1woIww5vMQL0QRJ0+ wgIGnw0Pb7sgf+d/y5H7cePtF+sCnhgyPCZMEiQdtlOyKBOxKYzfGDRpufv6ZtVTMMEp FVSOxD6HCEp+pV+bcEtGTjOSWGSqJj7p7qlqkoChjV26InVkqUVYpSMpuUW3/+rlzoEM TrfQ== X-Gm-Message-State: AJIora9O2zCH9kgWxOYsrRQEYji4/hPLGZ7rcvICgvAAvnZG/Mdt1h48 hIq2hEyCtnPFyd80kSLHbdUNQw== X-Google-Smtp-Source: AGRyM1sSkO37cGBUYoBCA3iAb7tsrNSXPCUVz/RcaCQKARyv/q6n4XrhO+boYikB2qXrh+Zn8rxMyA== X-Received: by 2002:a1c:740d:0:b0:3a3:e1:179f with SMTP id p13-20020a1c740d000000b003a300e1179fmr2128647wmc.17.1659086394930; Fri, 29 Jul 2022 02:19:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 07/13] semihosting: Don't copy buffer after console_write() Date: Fri, 29 Jul 2022 10:19:37 +0100 Message-Id: <20220729091943.2152410-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659087969555100001 From: Peter Maydell The console_write() semihosting function outputs guest data from a buffer; it doesn't update that buffer. It therefore doesn't need to pass a length value to unlock_user(), but can pass 0, meaning "do not copy any data back to the guest memory". Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220719121110.225657-3-peter.maydell@linaro.org> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725140520.515340-8-alex.bennee@linaro.org> diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index 4847f66c02..508a0ad88c 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -627,7 +627,7 @@ static void console_write(CPUState *cs, gdb_syscall_com= plete_cb complete, } ret =3D qemu_semihosting_console_write(ptr, len); complete(cs, ret ? ret : -1, ret ? 0 : EIO); - unlock_user(ptr, buf, ret); + unlock_user(ptr, buf, 0); } =20 static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete, --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659086945; cv=none; d=zohomail.com; s=zohoarc; b=de1AChvOSS0N/swNm4RqJph3YCQrn62WdD8ELKFur3S4pLn87c2VPo0bP3ckp++5XzjHJFuLNlcMdlixRyrDtwTezbk0FlM+Onlu9TciQVi4jTjk0NEqobJdxUQwkkwQ34VNwKJbBFDBVP+2EhXkwZGsJ2y0IgILOZQe0J+0Vlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659086945; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7CojBDnzsSadEUfkkQHrKsxO1PC9/FIoZzsN5dLDDhc=; b=Rnc3RKlCiYeHENkH/a7+jMpgP19RpidRBgewf9eEGduGHWwzEsKpIyiXqmlVNNz6rAFvvA2prYrjnZhltVzvpQvGS+X8pLhILRNZ1y2swRam7k0wuwQG3W6ds6FIRqA9u/aMvRULpzlxGKvbxAPyUqZ0wZNh2OQDugPd1IDJ/cA= 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 1659086945773714.305318488948; Fri, 29 Jul 2022 02:29:05 -0700 (PDT) Received: from localhost ([::1]:35604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMIq-00062b-G1 for importer@patchew.org; Fri, 29 Jul 2022 05:29:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA5-0002Vw-PK for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:02 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA3-0005t2-C2 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:01 -0400 Received: by mail-wr1-x42f.google.com with SMTP id h8so5277468wrw.1 for ; Fri, 29 Jul 2022 02:19:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o12-20020a05600c4fcc00b003a31d200a7dsm4122665wmq.9.2022.07.29.02.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7FD4B1FFC0; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7CojBDnzsSadEUfkkQHrKsxO1PC9/FIoZzsN5dLDDhc=; b=Gyo0oAw39D9Q2vO8UwjCUhbuDDYMkqRXifp5gYOEQMkqI/JSYZ/TgtHXRkkGoH/t2e R50wWFLBMd1Uc5p4eLpV7JVhFX4E3QTQbEPfo0QDT4JGJE7QaHOZFptgDYdSAPXCaaw2 gQRj2QTOuC8IrFaDvKocPorg9f6Q1vRTnGtRgThZily5+I5tJaZ1MF91jehmPw/B/IRJ fuXfb+hXUo+Re46sQyHTblstmZiMGio5IrfOONynd/2b8/uuOI/5kBkcTnUwZSi3aTCE kpZeBul2j2m8OGc+id9JaOib8FfVOBXsCuC0qrMndr/3UH/b+nDY4MApNX0FRMyFU/Km rCNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7CojBDnzsSadEUfkkQHrKsxO1PC9/FIoZzsN5dLDDhc=; b=wxfpsjV/NKLKpJavKHSnpZzVVaVsRjeV87Exem5nM+zI/yu3NV69jlVXfzerrDU1Zr h+77YkEEXI9kkSQS0Z8dOLcQrMKp5gNv4VRidr1cpW8QSrtGozAhGQ8yO0nkZHlJUh1y H5Wwk0xq4kg/fvnaY90GdkdIF9Zv1FWeH6Gt+pOdt/KnWVd2IRc0gqOnbWBdPBDQqZHk XsVyF1Lc/ASZpc8iGRdmVdbNKa35EcbP/QVRXzPsekVLSA1nuAqIweZjzF+zyiVvlWH5 Z5AVXSk6omIYSOLGe4tNbDbNbLPLwgLnV4MCFUH0V+5cxLlMIeCfEY7pi1hhoFaJvniU D3ww== X-Gm-Message-State: ACgBeo2u/0q8BJU7sp5rpq+svR8VHOx5CMKC18LQ43xHo6nfz3gehL63 SQrE90kBvOxQUAOH5yXVB6q1HA== X-Google-Smtp-Source: AA6agR7kXCgHV8IfsVSODT6VpAho3pcL87V7AgYryQTzyTqeMyH+nG6e60zMJToC8uwMC4g0Ce2vgQ== X-Received: by 2002:a05:6000:608:b0:21e:b5f4:4bc9 with SMTP id bn8-20020a056000060800b0021eb5f44bc9mr1890182wrb.196.1659086397986; Fri, 29 Jul 2022 02:19:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 08/13] semihosting: Check for errors on SET_ARG() Date: Fri, 29 Jul 2022 10:19:38 +0100 Message-Id: <20220729091943.2152410-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659086946977100001 From: Peter Maydell The SET_ARG() macro returns an error indication; we check this in the TARGET_SYS_GET_CMDLINE case but not when we use it in implementing TARGET_SYS_ELAPSED. Check for and handle the errors via the do_fault codepath, and update the comment documenting the SET_ARG() and GET_ARG() macros to note how they handle memory access errors. Resolves: Coverity CID 1490287 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220719121110.225657-4-peter.maydell@linaro.org> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725140520.515340-9-alex.bennee@linaro.org> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 1a1e2a6960..d12288fc80 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -171,6 +171,12 @@ static LayoutInfo common_semi_find_bases(CPUState *cs) * Read the input value from the argument block; fail the semihosting * call if the memory read fails. Eventually we could use a generic * CPUState helper function here. + * Note that GET_ARG() handles memory access errors by jumping to + * do_fault, so must be used as the first thing done in handling a + * semihosting call, to avoid accidentally leaking allocated resources. + * SET_ARG(), since it unavoidably happens late, instead returns an + * error indication (0 on success, non-0 for error) which the caller + * should check. */ =20 #define GET_ARG(n) do { \ @@ -739,10 +745,14 @@ void do_common_semihosting(CPUState *cs) case TARGET_SYS_ELAPSED: elapsed =3D get_clock() - clock_start; if (sizeof(target_ulong) =3D=3D 8) { - SET_ARG(0, elapsed); + if (SET_ARG(0, elapsed)) { + goto do_fault; + } } else { - SET_ARG(0, (uint32_t) elapsed); - SET_ARG(1, (uint32_t) (elapsed >> 32)); + if (SET_ARG(0, (uint32_t) elapsed) || + SET_ARG(1, (uint32_t) (elapsed >> 32))) { + goto do_fault; + } } common_semi_set_ret(cs, 0); break; --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659088594; cv=none; d=zohomail.com; s=zohoarc; b=fnEANSCKOgDwysfSoT+QosZyxFBI1jLslnFOtS5DICKsPzAkzreALZblO8y9gaLb3hAJwCM6fVHDaR4iiZmv9fU6DsSrtdJO9AOuaKRf85ZSrosmBGLAua6eRJGGdCpzrP3cG646rnyMEnmIBuBp5dVH4qRbKnqmUeEMRZSkPi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659088594; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mbn6XiDKnJmRGG2YuNoOAPV2cZfoBYZK1OHleilmO84=; b=XJHQGd+gWqMvopOiuYIbqxRu/Vn9tTq7F4TvHqpPoM/+IzvUbeIexYfW3mu1EzAVCgrj7EceONIGFW1mMvj2bHYu0zlYRrKUaB52Dp6nfP3jwWCwi0ezCWBgP5KIsKHck6I+IWAzRuTUCRGwIe0uZf9obtDO9pPiLYtIIuHR72Q= 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 1659088594722528.807475575143; Fri, 29 Jul 2022 02:56:34 -0700 (PDT) Received: from localhost ([::1]:37406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMjR-0002Ml-9I for importer@patchew.org; Fri, 29 Jul 2022 05:56:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMFE-0005Wx-Lp for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:20 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMFC-0006hk-V3 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:20 -0400 Received: by mail-wr1-x42f.google.com with SMTP id z17so559871wrq.4 for ; Fri, 29 Jul 2022 02:25:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q5-20020a1ce905000000b003a320e6f011sm3835992wmc.1.2022.07.29.02.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:25:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 965041FFC1; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mbn6XiDKnJmRGG2YuNoOAPV2cZfoBYZK1OHleilmO84=; b=c9aoVxBvcweaE2Jfnzkf3ITZcceZf6BpIwZ4izg+CMiwn3MTAFb5KqpAMOedz3mooR bfaNS9am+X6GlHYsTr897A1SC52VTyxaAPCBBX2kL91nGcWY2Ilcm7pNetlCQOfFwIGr 1qW3lZ3hnkDMPP/S0wteABOGKPATRI5g4D3UdTzCrihj5qEd5qenuh0sxrJJuw1ptLu+ M11OxPUufSZMmH5lJ2cZNZh2uGJ9YEh5tBclEeHX6sYT1fHHGHzLbHswOTO93ScJfjGO XGMexpVuiJOtLbsx1CezNDUBdJ8m6/9rgx0EJqhdVPjqO0HOHtoVpnQr8VKC9o1m05EA pevA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mbn6XiDKnJmRGG2YuNoOAPV2cZfoBYZK1OHleilmO84=; b=ICNE6kc2sV82Fky3pPdtGHlnfMily11X8hYLpi27FKTRtMhU1q9ABPzYbbXWFOedKr zZDtGfHIvAGW+sKgYimZN9bCzyyk6AkbUO7sbScSFXDAglw9DsQw/JkEVyCD+/BvqkJJ XU90imkQZJe+5bllS8tK78321LwLili8iZPe3F7gPekB5LyvGqeTht73bSZMHqzoFA73 V0+aYvGa/QZIeOZHlPd1TjQCV1GOw6LFdqQhARt5k6pIBsmqA/YCSpc4bQNfCjVQl6bd Vq4kHgtVGGEsxwGOVap2oC5H+Ior1VZSe2DhTSPGVeo+gXl8LP3Dy4aj8nKW1xHiaWBA Q3Jg== X-Gm-Message-State: ACgBeo3uFF5DHxN5OHbziSu33vjP9i0buoHbXnBf2El9cdOU9iBWF2wi A2FE55ZrNditjuFtaVnYYIgheA== X-Google-Smtp-Source: AA6agR5HXZHYYSgyhYJi1hfsqLW2jbAIKfiOW1C9Aos+gPmd/EXMoemrLH5kvLRGNCFt8Eo+C5rABQ== X-Received: by 2002:a05:6000:807:b0:21e:daca:7df2 with SMTP id bt7-20020a056000080700b0021edaca7df2mr1846828wrb.214.1659086717603; Fri, 29 Jul 2022 02:25:17 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 09/13] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM Date: Fri, 29 Jul 2022 10:19:39 +0100 Message-Id: <20220729091943.2152410-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659088595714100001 From: Peter Maydell The TARGET_SYS_TMPNAM implementation has two bugs spotted by Coverity: * confusion about whether 'len' has the length of the string including or excluding the terminating NUL means we lock_user() len bytes of memory but memcpy() len + 1 bytes * In the error-exit cases we forget to free() the buffer that asprintf() returned to us Resolves: Coverity CID 1490285, 1490289 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220719121110.225657-5-peter.maydell@linaro.org> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220725140520.515340-10-alex.bennee@linaro.org> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index d12288fc80..e741674238 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -504,16 +504,25 @@ void do_common_semihosting(CPUState *cs) GET_ARG(1); GET_ARG(2); len =3D asprintf(&s, "/tmp/qemu-%x%02x", getpid(), (int)arg1 & 0xf= f); + if (len < 0) { + common_semi_set_ret(cs, -1); + break; + } + + /* Allow for trailing NUL */ + len++; /* Make sure there's enough space in the buffer */ - if (len < 0 || len >=3D arg2) { + if (len > arg2) { + free(s); common_semi_set_ret(cs, -1); break; } p =3D lock_user(VERIFY_WRITE, arg0, len, 0); if (!p) { + free(s); goto do_fault; } - memcpy(p, s, len + 1); + memcpy(p, s, len); unlock_user(p, arg0, len); free(s); common_semi_set_ret(cs, 0); --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659088003; cv=none; d=zohomail.com; s=zohoarc; b=dCPMLw5rqC8HIICppDnRxx+qFkyn2I1s9q46NnKtpgjkp+MHCdjeqgJSt07vTM5tFWiL7j4KC2po7gQk73sps4NOg8yejYAc23UqsgiKVfAkF5vP/r8cfNMSSwguUW2jIsELreF00VUGtCZYSS92BGlc5XVEZ6yvQ1tlqd2yNzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659088003; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xOlc+wxUC6YsZtcE4bDc4ixFDql/BQBCzStcRkhv26g=; b=mifvZCFvTb0043IENbW952cBCMBQxbamFXflII1aaGCeCmLknRoLzqIwZqBGd+v2jCnZQzH4Dmkc0yJumgWzwYuePfJrtDLKTdodN6iN5QVcK6XKJgtZUsQImu0NQWLhr7q2Si7epWBPVpZtnT/Gv3GOiGEb/P8Vl4v5nVUqyrw= 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 1659088003100286.2517880682948; Fri, 29 Jul 2022 02:46:43 -0700 (PDT) Received: from localhost ([::1]:55420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMZt-0003Ud-T5 for importer@patchew.org; Fri, 29 Jul 2022 05:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMA8-0002Yf-O1 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:04 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA6-0005sZ-9g for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:03 -0400 Received: by mail-wm1-x336.google.com with SMTP id ay11-20020a05600c1e0b00b003a3013da120so3808386wmb.5 for ; Fri, 29 Jul 2022 02:20:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f11-20020a05600c4e8b00b003a31673515bsm9475712wmq.7.2022.07.29.02.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AEC5A1FFC2; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xOlc+wxUC6YsZtcE4bDc4ixFDql/BQBCzStcRkhv26g=; b=uif8XDG29+A31dEeU4MCabM4YLFTyW5SgD9PqVO8tHr/74pw8okeXqbHXmpj0gC+Xy 6XNWTg2ssAbxKfNXv72dj1LkfPPRGiCoNEcQrKspPQ4PpF237eutePvgNjgzXaNALsXf G+RFyljjBfC7dszyiduTguPvkL8cABL/J5vg4x+fFtLuSaXEuoarNo8ZV1phJ9ISAzKp jJ3hSTUoXnYBzQ7gHpziJgJqQium27ZgTysXww4YU70AjOFgZn7ZJmAG46kmsxQQFlkN LFG/t5i1bXYysX7H4uPoT/bs21ox2CTTyjS6EzPC72ckxqZopCTsH4tUJtRbf+EAcod0 fg3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xOlc+wxUC6YsZtcE4bDc4ixFDql/BQBCzStcRkhv26g=; b=5s/ojqTtXJ8vLWOF+JuJN+bQyhFMMFOyGr+lk8FqRe6q4YAfWbzT2ysk+C9gtJrggw 2bqBCMBNBz3cF2XsRvJcZOlgMMvmaxf9vgcoUt5Ot0aBI6eGq7avbmBjJgTLPzw9I0J0 SxJ1ilGUKiwOdtLJyeGfnFvwFurJSWHJ7n7CsKyWagsKjhxxcjPHUC9wYmuo003SvNGU TBKkQj20rtq9Vo9cfKHSJEvQC0NfIelqFjkRfOXHM0+fsVNqhq02VQXgghq7+SXyKgYx T9frwOgsmbXGuJV+4sP3BvREwULXXWq+yx179gmke0VXpEvmPZ2nkJ4JS8yYoXVjXUvS pfag== X-Gm-Message-State: AJIora9Bnh9YJj+oZKj0hUUjohKTHlL/4vyy4bHL7Hryxk1BRZ+lL31X 9tg6TXB9R2r/ccOgsAbpF7Y51nCO/Q7uCQ== X-Google-Smtp-Source: AGRyM1t3Xhu1Y2aH5Wlm/1AamMo+18AE86dz2vTy48u2ZFPu8zi8rk7rWQjt2T6fASg58DQNSdGfcA== X-Received: by 2002:a05:600c:154f:b0:3a3:4383:e1eb with SMTP id f15-20020a05600c154f00b003a34383e1ebmr1808023wmg.111.1659086401488; Fri, 29 Jul 2022 02:20:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eric Blake , Markus Armbruster , Paolo Bonzini Subject: [PULL 10/13] qapi: Add exit-failure PanicAction Date: Fri, 29 Jul 2022 10:19:40 +0100 Message-Id: <20220729091943.2152410-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659088003722100001 From: Ilya Leoshkevich Currently QEMU exits with code 0 on both panic an shutdown. For tests it is useful to return 1 on panic, so that it counts as a test failure. Introduce a new exit-failure PanicAction that makes main() return EXIT_FAILURE. Tests can use -action panic=3Dexit-failure option to activate this behavior. Signed-off-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20220725223746.227063-2-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e diff --git a/qapi/run-state.json b/qapi/run-state.json index 6e2162d7b3..9273ea6516 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -364,10 +364,13 @@ # # @shutdown: Shutdown the VM and exit, according to the shutdown action # +# @exit-failure: Shutdown the VM and exit with nonzero status +# (since 7.1) +# # Since: 6.0 ## { 'enum': 'PanicAction', - 'data': [ 'pause', 'shutdown', 'none' ] } + 'data': [ 'pause', 'shutdown', 'exit-failure', 'none' ] } =20 ## # @watchdog-set-action: diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 812f66a31a..31aa45160b 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -103,7 +103,7 @@ void qemu_boot_set(const char *boot_order, Error **errp= ); bool defaults_enabled(void); =20 void qemu_init(int argc, char **argv, char **envp); -void qemu_main_loop(void); +int qemu_main_loop(void); void qemu_cleanup(void); =20 extern QemuOptsList qemu_legacy_drive_opts; diff --git a/softmmu/main.c b/softmmu/main.c index c00432ff09..1b675a8c03 100644 --- a/softmmu/main.c +++ b/softmmu/main.c @@ -32,11 +32,13 @@ =20 int qemu_main(int argc, char **argv, char **envp) { + int status; + qemu_init(argc, argv, envp); - qemu_main_loop(); + status =3D qemu_main_loop(); qemu_cleanup(); =20 - return 0; + return status; } =20 #ifndef CONFIG_COCOA diff --git a/softmmu/runstate.c b/softmmu/runstate.c index 168e1b78a0..1e68680b9d 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -482,7 +482,8 @@ void qemu_system_guest_panicked(GuestPanicInformation *= info) qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, !!info, info); vm_stop(RUN_STATE_GUEST_PANICKED); - } else if (panic_action =3D=3D PANIC_ACTION_SHUTDOWN) { + } else if (panic_action =3D=3D PANIC_ACTION_SHUTDOWN || + panic_action =3D=3D PANIC_ACTION_EXIT_FAILURE) { qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_POWEROFF, !!info, info); vm_stop(RUN_STATE_GUEST_PANICKED); @@ -662,7 +663,7 @@ void qemu_system_debug_request(void) qemu_notify_event(); } =20 -static bool main_loop_should_exit(void) +static bool main_loop_should_exit(int *status) { RunState r; ShutdownCause request; @@ -680,6 +681,10 @@ static bool main_loop_should_exit(void) if (shutdown_action =3D=3D SHUTDOWN_ACTION_PAUSE) { vm_stop(RUN_STATE_SHUTDOWN); } else { + if (request =3D=3D SHUTDOWN_CAUSE_GUEST_PANIC && + panic_action =3D=3D PANIC_ACTION_EXIT_FAILURE) { + *status =3D EXIT_FAILURE; + } return true; } } @@ -715,12 +720,14 @@ static bool main_loop_should_exit(void) return false; } =20 -void qemu_main_loop(void) +int qemu_main_loop(void) { + int status =3D EXIT_SUCCESS; #ifdef CONFIG_PROFILER int64_t ti; #endif - while (!main_loop_should_exit()) { + + while (!main_loop_should_exit(&status)) { #ifdef CONFIG_PROFILER ti =3D profile_getclock(); #endif @@ -729,6 +736,8 @@ void qemu_main_loop(void) dev_time +=3D profile_getclock() - ti; #endif } + + return status; } =20 void qemu_add_exit_notifier(Notifier *notify) diff --git a/qemu-options.hx b/qemu-options.hx index 79e00916a1..8e17c5064a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4239,7 +4239,7 @@ DEF("action", HAS_ARG, QEMU_OPTION_action, " action when guest reboots [default=3Dreset]\n" "-action shutdown=3Dpoweroff|pause\n" " action when guest shuts down [default=3Dpoweroff]\= n" - "-action panic=3Dpause|shutdown|none\n" + "-action panic=3Dpause|shutdown|exit-failure|none\n" " action when guest panics [default=3Dshutdown]\n" "-action watchdog=3Dreset|shutdown|poweroff|inject-nmi|pause|debug|non= e\n" " action when watchdog fires [default=3Dreset]\n", --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659088334; cv=none; d=zohomail.com; s=zohoarc; b=SqOkmZWM1GgzTNKBCO7ZM4YBU6SjWxVaGcRU3V5SMNxzYCKcfp/xlB1d+wdeoBzK/B0FZdxRN2NuB9uPfuQa4voiNPjUcFnQp29BNQL75L3aMudH8HL5+QjUFm55DxA/kafmhs+5Mrxx3uYc0GVJptNck979u5cxC6XHQGfdsHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659088334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gy+5PY+WqRlaBvLBWvCWjtIPhrWvg0Op57/GOX9XBTc=; b=RHsDcXqVRayGSpbMlOk6ur8mVj3fOX43c5qL04yzRu4bn1W/1MZPs+ApNKIb98Dpij1g6UJ4pmPCwZhGHntj6ZzVQuc7ovyA/HIqfkelMNQinBSlpk/BaN+Tko9RTI1iD5CAQe3wnA89zMz/yNzIlI0scGZ40fnjKFDr8y+UlJg= 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 1659088334544313.1677446874344; Fri, 29 Jul 2022 02:52:14 -0700 (PDT) Received: from localhost ([::1]:59700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMfE-0006h7-Be for importer@patchew.org; Fri, 29 Jul 2022 05:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMFC-0005Vd-C8 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:20 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:45771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMFA-0006h8-N4 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:18 -0400 Received: by mail-wm1-x32d.google.com with SMTP id u14-20020a05600c00ce00b003a323062569so2211916wmm.4 for ; Fri, 29 Jul 2022 02:25:16 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg3-20020a05600c3c8300b003a327b98c0asm4361866wmb.22.2022.07.29.02.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:25:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C8C851FFC3; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gy+5PY+WqRlaBvLBWvCWjtIPhrWvg0Op57/GOX9XBTc=; b=B8WD5jcwmYY/eu507A0UUFniFZ2KTaBxMKjt/Ag9mtcryY9oWp9LMGjfdHEbG2//N+ 57wcH71bR2lKnhXsHaZpJdgmEgcMgggPzLu/E4pVolVMNPLrf404tXUky2zomi9FykTY 2bitlYNTILYalS44c8USFPymwG9nQQQSW/qY1gjaTR9Hog+KZJ3INiS7tPIPksBk07wV rT7o7qDbhmdaZEEhofBGTrsknPOMLJMkT+PC6a3SZtvwU6nmlqZDrbJRCnhuVmshMY3I N77e0R9rtvKQmqnmk9PiuW/D0O9P2WdjPr/Ddhw1tPWofmpEMIhtpSTtfWDodIU1S0Pk XBfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gy+5PY+WqRlaBvLBWvCWjtIPhrWvg0Op57/GOX9XBTc=; b=VTuLswGHtBhgLR0wwXlUPaOWTwPLRLEHiRUWOGUPvq1mJIKsZSz64+kbZ31bC8RVpp 9bw75k1ByPb37iZh37FN/CDcrGBbWkJejZsCf8gaOZisKSMAe2CovkmuqBiEgZqp7SwZ Mi6GfpL7kIDTXv+oNX/FRDCEq3H0U6qnatEQHMQOdmrKzRDNJe8lAvk+aiXBr6/Zgwnq nWZQ934zhZ2dtJ+CebKqEfp4Dp3pIAQqgDjEqtm3deihiCXAUu/RUu9dHFQbilYBrCpV frPWgh9E8sXpXYgReES14tEAETUeE3auOnLpfwOtG1QfJPRo/biA2JhaSC0zefzzemPr 63GA== X-Gm-Message-State: AJIora/d069X73z1wPcn7FnM0bNhN9yCl6xBBQPxSorumdW73xSpz1Uq 0BRiU/t/9EAUJqQNTV6PNVgk/Q== X-Google-Smtp-Source: AGRyM1sZIbKVOpPX6W/zeecnBTBj0qR28bZOsZDp8Robh8xmWb8OxUoIb/qP1s3OwXbx3YE9WdRf2Q== X-Received: by 2002:a05:600c:22c2:b0:3a3:19e3:a55 with SMTP id 2-20020a05600c22c200b003a319e30a55mr2170372wmg.53.1659086714974; Fri, 29 Jul 2022 02:25:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Ilya Leoshkevich , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PULL 11/13] tests/tcg/s390x: Test unaligned accesses to lowcore Date: Fri, 29 Jul 2022 10:19:41 +0100 Message-Id: <20220729091943.2152410-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659088336271100001 From: Ilya Leoshkevich Add a small test to avoid regressions. Signed-off-by: Ilya Leoshkevich Acked-by: Richard Henderson Acked-by: Thomas Huth Message-Id: <20220725223746.227063-3-iii@linux.ibm.com> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target new file mode 100644 index 0000000000..a34fa68473 --- /dev/null +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -0,0 +1,9 @@ +S390X_SRC=3D$(SRC_PATH)/tests/tcg/s390x +VPATH+=3D$(S390X_SRC) +QEMU_OPTS=3D-action panic=3Dexit-failure -kernel + +%: %.S + $(CC) -march=3Dz13 -m64 -nostartfiles -static -Wl,-Ttext=3D0 \ + -Wl,--build-id=3Dnone $< -o $@ + +TESTS +=3D unaligned-lowcore diff --git a/tests/tcg/s390x/unaligned-lowcore.S b/tests/tcg/s390x/unaligne= d-lowcore.S new file mode 100644 index 0000000000..f5da2ae64c --- /dev/null +++ b/tests/tcg/s390x/unaligned-lowcore.S @@ -0,0 +1,19 @@ + .org 0x1D0 /* program new PSW */ + .quad 0x2000000000000,0 /* disabled wait */ + .org 0x200 /* lowcore padding */ + + .globl _start +_start: + lctlg %c0,%c0,_c0 + vst %v0,_unaligned + lpswe quiesce_psw + + .align 8 +quiesce_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +_c0: + .quad 0x10060000 /* lowcore protection, AFP, VX */ + + .byte 0 +_unaligned: + .octa 0 --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659088378; cv=none; d=zohomail.com; s=zohoarc; b=LKAu3IvKD6YBlAhzZhwHDM/yWqEdRTIoRh99U7+gbAcnQ0bOdES1B1zGUEA7JwSY/MzNk/8ftfO7btbfirHGLJg1CbsQ94Pin28UsOfxVxhzEsNiHVsnnlb91qtR3c+JdbPSgLfZDknAR1qyFVSnA+JxIt8Hw9qjbpToVS6wm8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659088378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3+NpxIpzMd8EaSUovyVTudU9VX9fAuDK9cF15HnV4cM=; b=LpopP6Ul9cWNKXHH+YVHdx0QzQYf5GA9JZJVNp+gf/mVbgZ9yaXdG2STHgwNvBcVVmVtPQ1ELRu4lEJQpTmWrlwj7kTLtY9DaeZldZ4gyJrK6Id+zgv5spKzhibU/l6BqSM+aMhk4vY1Hl8jQO4za2D2C0rtk4Yv2fmLnQ5bgOw= 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 1659088378216876.1720212368873; Fri, 29 Jul 2022 02:52:58 -0700 (PDT) Received: from localhost ([::1]:32954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMfw-0007i3-OI for importer@patchew.org; Fri, 29 Jul 2022 05:52:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMAA-0002aP-8N for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:06 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:44634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMA8-0005u5-ES for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:20:05 -0400 Received: by mail-wr1-x436.google.com with SMTP id q30so854310wra.11 for ; Fri, 29 Jul 2022 02:20:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m23-20020a05600c3b1700b003a30fbde91dsm8834245wms.20.2022.07.29.02.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:19:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D538B1FFC4; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3+NpxIpzMd8EaSUovyVTudU9VX9fAuDK9cF15HnV4cM=; b=M4HoVgdjZjAN8oxiUVLLAXR2iWxq5I0yWDAZVH7Vtsq4FLkS9zy8o0JVtE9CWr2hiE EiL+vf3cq+6PdkHTsBD8yul5m3GvlB/dq/D9H95NMqyTdehAj8fHKvXc1pAZhq6izSfP PgCcMKA/NVVvlUgGps2t8kugeJsulaZYJXnLS8oldT3+K5UpdTKq/MuM7JAM5uz2yZY7 5o+xnUBYpNXT1xBd8BqfvNeRgowKhyZqoruG3DqSt1B2HwRr7rnRcpFvS90LOeTLQjWC nm0yhiixayNuGh9XyXsBcPO8Aca90BEX1wjbm7QbjmXj+TH+l+iSb9xQjdSG9PCqY5D3 HcSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3+NpxIpzMd8EaSUovyVTudU9VX9fAuDK9cF15HnV4cM=; b=P8lsWBrB7as1NfBr/7Hm2zPA4QDTusehYCiCewjwS1TXXCsQHpj419bFiLU1DYI5ek Ka4D0VJqB5RbbapENQK0LDTdpSVotyt48UvpyVF/bJzChbk4df9zYNfsWGvQ5PkAOwoq jYrNOdjY+vfgMikxFnuMERVPoBpe0xVy6XDZN4PGbdo99eUfGLmRj7mptRkiDOh/Yzbq fu5BY2mhX5PNDLZq6kvDC5xaW7vmZ1yfyRIw6vRyMo5+5NXye6O7vXN0iVCVnlTY/Iqm DEBrxGxbsmU4tsQEbSwbUnpGkpi1kzhcLLFbZOfoUwBOva7XOVcPxEeRxmAycWyLMK3s kPTw== X-Gm-Message-State: ACgBeo2c/bR5XB/JFecj6x14tEzbgKSGSA5HFob3lTDJYf9QjicdRXUS hUgE/hPOh0ZYfTxK56jXYlGYqQ== X-Google-Smtp-Source: AA6agR7nWnUze/+WcXZF4/NseNkA18Irq4uyynz4qQqfVHeTy+KgoFPbnVy9dOyS/6YZE+LoNCFYPQ== X-Received: by 2002:adf:f94b:0:b0:21e:46fe:bcdb with SMTP id q11-20020adff94b000000b0021e46febcdbmr1711588wrr.143.1659086402362; Fri, 29 Jul 2022 02:20:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/13] docs/devel: fix description of OBJECT_DECLARE_SIMPLE_TYPE Date: Fri, 29 Jul 2022 10:19:42 +0100 Message-Id: <20220729091943.2152410-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659088380400100001 Since 30b5707c26 (qom: Remove module_obj_name parameter from OBJECT_DECLARE* macros) we don't need the additional two parameters. Fix the documentation. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220725140520.515340-13-alex.bennee@linaro.org> diff --git a/docs/devel/qom.rst b/docs/devel/qom.rst index e5fe3597cd..0cf9a714f0 100644 --- a/docs/devel/qom.rst +++ b/docs/devel/qom.rst @@ -292,8 +292,7 @@ in the header file: .. code-block:: c :caption: Declaring a simple type =20 - OBJECT_DECLARE_SIMPLE_TYPE(MyDevice, my_device, - MY_DEVICE, DEVICE) + OBJECT_DECLARE_SIMPLE_TYPE(MyDevice, MY_DEVICE) =20 This is equivalent to the following: =20 --=20 2.30.2 From nobody Thu May 9 08:28:17 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=1659087210; cv=none; d=zohomail.com; s=zohoarc; b=bCGH8JHIv7v/Ze/aI9Y+Vfs1yrtmvOhGzBUu50ktJsmR+s7gVv4I+Um2c4tPlMwcDNsir9DXYiSI15Zrd39BxXU4FwbAwOXrRiroPcOci5M2ieFdrPIo+FpRrxqFDHPessHW4wyPqe8lf16a1Y7n+j1+K4m/cpRFTdlRI6RKjbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659087210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hwvFbZR4/H0xiyraePhgzCmgfa2kY4WJ3yx1/sETcUM=; b=SDlGLVXPbSnYd0vJR0OTVg5PKt6esjRnyrXhujXcJXHkX6KCSuKMkoKnv6/DNF5yZ3bLLpjTsQZrbz/Ee0l0TOlOnDZ3XyggFqm358L/IIkiczTkGotmVUPJNmE1m8uus5teXtRcO8KzdrvwkBmz4wWan206m37r8kxZhw83pO8= 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 1659087210969768.198897960336; Fri, 29 Jul 2022 02:33:30 -0700 (PDT) Received: from localhost ([::1]:43160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHMN7-00030y-15 for importer@patchew.org; Fri, 29 Jul 2022 05:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHMFE-0005Vz-1T for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:20 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHMFB-0006hP-BZ for qemu-devel@nongnu.org; Fri, 29 Jul 2022 05:25:19 -0400 Received: by mail-wr1-x432.google.com with SMTP id l22so5278318wrz.7 for ; Fri, 29 Jul 2022 02:25:16 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bk9-20020a0560001d8900b0021d76a1b0e3sm3137983wrb.6.2022.07.29.02.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 02:25:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ED72D1FFC5; Fri, 29 Jul 2022 10:19:44 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hwvFbZR4/H0xiyraePhgzCmgfa2kY4WJ3yx1/sETcUM=; b=uAiWvsLW9GsXLYfPlzsVX3X09rgfo2JFXxbgzJcLUSZkXHyh1y9sEC1WYd/l0YGxqf 1rtmKgohtz34jEYRLHKicUcmy4FHp09GLDcEoZMxNI0hjT2aPbtoTKgkZ2bTAlh11ir2 eomJKbsEzjmUsKQ9cElZz4uWrnDFCqWM/sfrPA7PiVvaFr2cPfoHOueDLiLYSwr0keZ2 Tdbm6QFvCHQaHUmXbgDhb6PzdDFy7mcLpB1xajfYw6Z+R9Nt+lxwrw3U+A/w3iRtuMRW FGbQffMUtJZyWNj1NpydcueWM+NY51rZeLloGpBP9KTnXaaFmy0VXe1KQUHf2DnPuf6K iLYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hwvFbZR4/H0xiyraePhgzCmgfa2kY4WJ3yx1/sETcUM=; b=wq39VAiqpLLUMVyN5px5gXVBFaoqXdY7s/06T1dDod/B1Rlzs2zIvbQ+Y7ZTP5gsVL aCOnkm5kfSkyERQi74dcDPwjjQFTabhz7aKB9sdI9fMfYs8MYwY+0vHJ4KMRNixkMOK+ MBgRZj3HMyyuZfOXnSGmLXar2tHRYQW9BiosfK1GgADbmcqns80Y5i1V7B0ko2agmLYE xVEM7bA5Wz0bLz/Qbbi7/XfhB9Wh4hKRp6VLN7ktb+JRBrR+y0tnmnA9wUbtIQis7Qu8 uWGysBTXTsJ1/j2CtNqUH97hzIThLItUrB/wTt6RjsM6BVM+AeyOEE1qdUfmtCYo+RnR cVEQ== X-Gm-Message-State: ACgBeo1vDzyYcBk+74DKAlcb5lrmm3UL0N2mQYfm51uoKIDgCYDRGbgW 2mIKPVGuUeUdLMnGhJcCbK8VQQ== X-Google-Smtp-Source: AA6agR5nFcjWkr3evcLZ/w7UsaQRAqLhjke6njy8fKiFzBdx7SORuOJHH1v2VJMit7t26KS0dJLe5Q== X-Received: by 2002:a5d:6d46:0:b0:21f:8b7:4c1d with SMTP id k6-20020a5d6d46000000b0021f08b74c1dmr1758009wri.455.1659086715650; Fri, 29 Jul 2022 02:25:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 13/13] qemu-options: bring the kernel and image options together Date: Fri, 29 Jul 2022 10:19:43 +0100 Message-Id: <20220729091943.2152410-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org> References: <20220729091943.2152410-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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659087213034100003 How to control the booting of QEMU is often a source of confusion for users. Bring the options that control this together in the manual pages and add some verbiage to describe when each option is appropriate. This attempts to codify some of the knowledge expressed in: https://stackoverflow.com/questions/58420670/qemu-bios-vs-kernel-vs-devic= e-loader-file/58434837#58434837 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater Message-Id: <20220725140520.515340-14-alex.bennee@linaro.org> diff --git a/qemu-options.hx b/qemu-options.hx index 8e17c5064a..3f23a42fa8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1585,13 +1585,6 @@ SRST Use file as SecureDigital card image. ERST =20 -DEF("pflash", HAS_ARG, QEMU_OPTION_pflash, - "-pflash file use 'file' as a parallel flash image\n", QEMU_ARCH_AL= L) -SRST -``-pflash file`` - Use file as a parallel flash image. -ERST - DEF("snapshot", 0, QEMU_OPTION_snapshot, "-snapshot write to temporary files instead of disk image files\= n", QEMU_ARCH_ALL) @@ -3684,12 +3677,67 @@ DEFHEADING() =20 #endif =20 -DEFHEADING(Linux/Multiboot boot specific:) +DEFHEADING(Boot Image or Kernel specific:) +SRST +There are broadly 4 ways you can boot a system with QEMU. + + - specify a firmware and let it control finding a kernel + - specify a firmware and pass a hint to the kernel to boot + - direct kernel image boot + - manually load files into the guest's address space + +The third method is useful for quickly testing kernels but as there is +no firmware to pass configuration information to the kernel the +hardware must either be probeable, the kernel built for the exact +configuration or passed some configuration data (e.g. a DTB blob) +which tells the kernel what drivers it needs. This exact details are +often hardware specific. + +The final method is the most generic way of loading images into the +guest address space and used mostly for ``bare metal`` type +development where the reset vectors of the processor are taken into +account. + +ERST + SRST -When using these options, you can use a given Linux or Multiboot kernel -without installing it in the disk image. It can be useful for easier -testing of various kernels. =20 +For x86 machines and some other architectures ``-bios`` will generally +do the right thing with whatever it is given. For other machines the +more strict ``-pflash`` option needs an image that is sized for the +flash device for the given machine type. + +Please see the :ref:`system-targets-ref` section of the manual for +more detailed documentation. + +ERST + +DEF("bios", HAS_ARG, QEMU_OPTION_bios, \ + "-bios file set the filename for the BIOS\n", QEMU_ARCH_ALL) +SRST +``-bios file`` + Set the filename for the BIOS. +ERST + +DEF("pflash", HAS_ARG, QEMU_OPTION_pflash, + "-pflash file use 'file' as a parallel flash image\n", QEMU_ARCH_AL= L) +SRST +``-pflash file`` + Use file as a parallel flash image. +ERST + +SRST + +The kernel options were designed to work with Linux kernels although +other things (like hypervisors) can be packaged up as a kernel +executable image. The exact format of a executable image is usually +architecture specific. + +The way in which the kernel is started (what address it is loaded at, +what if any information is passed to it via CPU registers, the state +of the hardware when it is started, and so on) is also architecture +specific. Typically it follows the specification laid down by the +Linux kernel for how kernels for that architecture must be started. =20 ERST =20 @@ -3729,6 +3777,25 @@ SRST kernel on boot. ERST =20 +SRST + +Finally you can also manually load images directly into the address +space of the guest. This is most useful for developers who already +know the layout of their guest and take care to ensure something sane +will happen when the reset vector executes. + +The generic loader can be invoked by using the loader device: + +``-device loader,addr=3D,data=3D,data-len=3D[,data-b= e=3D][,cpu-num=3D]`` + +there is also the guest loader which operates in a similar way but +tweaks the DTB so a hypervisor loaded via ``-kernel`` can find where +the guest image is: + +``-device guest-loader,addr=3D[,kernel=3D,[bootargs=3D]][,initrd=3D]`` + +ERST + DEFHEADING() =20 DEFHEADING(Debug/Expert options:) @@ -4179,13 +4246,6 @@ SRST To list all the data directories, use ``-L help``. ERST =20 -DEF("bios", HAS_ARG, QEMU_OPTION_bios, \ - "-bios file set the filename for the BIOS\n", QEMU_ARCH_ALL) -SRST -``-bios file`` - Set the filename for the BIOS. -ERST - DEF("enable-kvm", 0, QEMU_OPTION_enable_kvm, \ "-enable-kvm enable KVM full virtualization support\n", QEMU_ARCH_ARM | QEMU_ARCH_I386 | QEMU_ARCH_MIPS | QEMU_ARCH_PPC | --=20 2.30.2