From patchwork Thu Oct 20 11:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616717 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp224543pvb; Thu, 20 Oct 2022 05:31:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM44Nwk5tehrPQbijUDiY4Ce8XWp1BBCNzo8GGWn9poQUPCa8EApzA3uTl+74yYDtZcHSODV X-Received: by 2002:a05:620a:2056:b0:6ec:52f0:f2cb with SMTP id d22-20020a05620a205600b006ec52f0f2cbmr8896306qka.191.1666269118504; Thu, 20 Oct 2022 05:31:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666269118; cv=none; d=google.com; s=arc-20160816; b=A5P0m779x+GpEPoZEZNGeq2Wpi2fUB4qXtEB8pgdkArB8bU/HgyRUEEH9qf0X2gHmc tn5AtEQRV2+nTYTvtpA02OWAGIoEerEZ1nL3au4/lafTL5/+Ur3GUvriiCw6zTVz73Z1 5CiBUrF1s4eEDjrT/mcw4OpfSztmwH/tRPaYJfhy/cCR+OX2sx6h6DyF9G50IpzyYSmj wvpuWjvnGR6lU5aqim2Adwy7/VfrgMk6S6l6++W8GoBvwJIuvduEHbuMcfrRXzqOi91r K+CRPOxPHqEEmhrCiN9LG4Q+SCrYyDBV9cB19b5rweK1lawQGFpCQfqTZnsqQwQiUGHJ cfoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HofNsp2KPjquo1DMYg2asPHFI2YUTygoMa1LVe2L/LE=; b=C/3vSK2xJhk5QWSvWvNNAcjaHi6G8Nm1qCkYiwp5pF2qONf7UfaagTLl8iNpKwQpOA /8Ge26PiRO8i6DJgrysh7LagFcoX6E6ghcFU9wpqxy0Zpc8ZLimMbZSSQIsvTZStq1qk i9a9vJFSCu3+PFHJQIL2HwPsfNSIJ5DbVpnn42yP48Zjz+Q246No8t2gMIdsGUYX4Bj2 eSDaBM1z/0YFA1bV71xkmgzDhGV/RN0P1QIVIIjTi7Tq6mW6EQrvXTGIBplF2excAruP bPjWPXw3jMqvwzJ8kNNVziucA4hI4VEkveIXdPOydy/i9uUkELuPqBOvVUkeutm3r3RF 3Ycg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="l/naE6mJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t13-20020ad45bcd000000b0049641a2ffa7si10375245qvt.229.2022.10.20.05.31.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:31:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="l/naE6mJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUiC-00007A-SU for patch@linaro.org; Thu, 20 Oct 2022 08:31:53 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUeU-0004oH-31 for patch@linaro.org; Thu, 20 Oct 2022 08:27:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU61-0002dX-TJ for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:46762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5v-0000nf-IR for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:20 -0400 Received: by mail-wr1-x431.google.com with SMTP id bk15so33948605wrb.13 for ; Thu, 20 Oct 2022 04:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HofNsp2KPjquo1DMYg2asPHFI2YUTygoMa1LVe2L/LE=; b=l/naE6mJxMffQ/zQ/OibNuyClHEbi4WZht/nSduPG/yT0/UHpYJkL77ymqiTFRxn1j ttA4I9u0rySEKWyUwJYG4I4MvF/eclxyhhKfTe3zWJNM0ltFqm/k7ZgQmp9be+8x5BpQ hJy5JOwy5+d93NJPFq/0q6QSwbk1gN7ql+znG+UM+PIwavUBmqIIUSJqGC/O0PhSd+Su UpnPRF9bUAWJPM0a/SyLZ5MyRaXu48QyM26k0ebP9th4L4qu/uJLX53u9cOG+A/K2rMj xzQBg1cefJRYd5HDhgpncmk4Xex1uEJn/4doEaozb2SQz63KB9BD+Ap7I5SO8+4RAQaY Hx4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HofNsp2KPjquo1DMYg2asPHFI2YUTygoMa1LVe2L/LE=; b=MDQGI0d9ATrf+9OGy3NfAmdKr/pMh3CltvFhsUTIwcFYRsrRe0pSvYUh6nug8eMm+u VgE0/QBLdZdTU0uu8i6OSLZR0NKw+98LIMivIznBOCUj+4bieCibwUjBNduOKa8R7MvP 5ujj37BNK6ENYmCyJ/D9sBx25EzV84PviqivQ/CAEq5Txt1WvA+MVSHktK72aqiE4jxZ miH+MjG9sEsJRSw+iL2FuSrADxcF0t8hZmBbErQyh0ioSWq01/X6ovB/KsljKzzdk6z5 OPEGBMzKIMKQNRHQt440MALgiwgqUOtIqzujLvsMMSzssvtJRdH3nDhHAoV+zNELqS4H jeYQ== X-Gm-Message-State: ACrzQf0EClOw/1w+ZF72wrqPKkKAP+AF/Wjk6Qv6+XT8w4l4eGO5iLMW uvbBMa8T7tGRe1Pb9j5cIjWcZg== X-Received: by 2002:adf:f9ca:0:b0:235:1c02:d0b with SMTP id w10-20020adff9ca000000b002351c020d0bmr2920889wrr.303.1666266733520; Thu, 20 Oct 2022 04:52:13 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h42-20020a05600c49aa00b003b4fdbb6319sm2459650wmp.21.2022.10.20.04.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 22E1E1FFB8; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 01/26] tests/docker: update fedora-win[32|64]-cross with lcitool Date: Thu, 20 Oct 2022 12:51:44 +0100 Message-Id: <20221020115209.1761864-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert another two dockerfiles to lcitool and update. I renamed the helper because it is not Debian specific. We need an updated lcitool for this to deal with the weirdness of a 32bit nsis tool for both 32 and 64 bit builds. As a result there are some minor whitespace and re-order changes in a bunch of the docker files. Signed-off-by: Alex Bennée Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Acked-by: Richard Henderson --- tests/docker/dockerfiles/alpine.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- .../dockerfiles/debian-amd64-cross.docker | 234 ++++++++--------- tests/docker/dockerfiles/debian-amd64.docker | 236 +++++++++--------- .../dockerfiles/debian-arm64-cross.docker | 232 ++++++++--------- .../dockerfiles/debian-armel-cross.docker | 230 ++++++++--------- .../dockerfiles/debian-armhf-cross.docker | 232 ++++++++--------- .../dockerfiles/debian-mips64el-cross.docker | 226 ++++++++--------- .../dockerfiles/debian-mipsel-cross.docker | 226 ++++++++--------- .../dockerfiles/debian-ppc64el-cross.docker | 230 ++++++++--------- .../dockerfiles/debian-s390x-cross.docker | 228 ++++++++--------- .../dockerfiles/fedora-win32-cross.docker | 139 ++++++++--- .../dockerfiles/fedora-win64-cross.docker | 138 +++++++--- tests/docker/dockerfiles/fedora.docker | 230 ++++++++--------- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 234 ++++++++--------- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 48 ++-- 18 files changed, 1499 insertions(+), 1372 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 9b7541261a..a854ae6b78 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -119,8 +119,8 @@ RUN apk update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index d89113c0df..1f70d41aeb 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -130,8 +130,8 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 9047759e76..8311024632 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture amd64 && \ @@ -74,76 +74,76 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-x86-64-linux-gnu \ - gcc-x86-64-linux-gnu \ - libaio-dev:amd64 \ - libasan5:amd64 \ - libasound2-dev:amd64 \ - libattr1-dev:amd64 \ - libbpf-dev:amd64 \ - libbrlapi-dev:amd64 \ - libbz2-dev:amd64 \ - libc6-dev:amd64 \ - libcacard-dev:amd64 \ - libcap-ng-dev:amd64 \ - libcapstone-dev:amd64 \ - libcmocka-dev:amd64 \ - libcurl4-gnutls-dev:amd64 \ - libdaxctl-dev:amd64 \ - libdrm-dev:amd64 \ - libepoxy-dev:amd64 \ - libfdt-dev:amd64 \ - libffi-dev:amd64 \ - libfuse3-dev:amd64 \ - libgbm-dev:amd64 \ - libgcrypt20-dev:amd64 \ - libglib2.0-dev:amd64 \ - libglusterfs-dev:amd64 \ - libgnutls28-dev:amd64 \ - libgtk-3-dev:amd64 \ - libibumad-dev:amd64 \ - libibverbs-dev:amd64 \ - libiscsi-dev:amd64 \ - libjemalloc-dev:amd64 \ - libjpeg62-turbo-dev:amd64 \ - libjson-c-dev:amd64 \ - liblttng-ust-dev:amd64 \ - liblzo2-dev:amd64 \ - libncursesw5-dev:amd64 \ - libnfs-dev:amd64 \ - libnuma-dev:amd64 \ - libpam0g-dev:amd64 \ - libpixman-1-dev:amd64 \ - libpmem-dev:amd64 \ - libpng-dev:amd64 \ - libpulse-dev:amd64 \ - librbd-dev:amd64 \ - librdmacm-dev:amd64 \ - libsasl2-dev:amd64 \ - libsdl2-dev:amd64 \ - libsdl2-image-dev:amd64 \ - libseccomp-dev:amd64 \ - libselinux1-dev:amd64 \ - libslirp-dev:amd64 \ - libsnappy-dev:amd64 \ - libspice-server-dev:amd64 \ - libssh-gcrypt-dev:amd64 \ - libsystemd-dev:amd64 \ - libtasn1-6-dev:amd64 \ - libubsan1:amd64 \ - libudev-dev:amd64 \ - liburing-dev:amd64 \ - libusb-1.0-0-dev:amd64 \ - libusbredirhost-dev:amd64 \ - libvdeplug-dev:amd64 \ - libvirglrenderer-dev:amd64 \ - libvte-2.91-dev:amd64 \ - libxen-dev:amd64 \ - libzstd-dev:amd64 \ - nettle-dev:amd64 \ - systemtap-sdt-dev:amd64 \ - xfslibs-dev:amd64 \ - zlib1g-dev:amd64 && \ + g++-x86-64-linux-gnu \ + gcc-x86-64-linux-gnu \ + libaio-dev:amd64 \ + libasan5:amd64 \ + libasound2-dev:amd64 \ + libattr1-dev:amd64 \ + libbpf-dev:amd64 \ + libbrlapi-dev:amd64 \ + libbz2-dev:amd64 \ + libc6-dev:amd64 \ + libcacard-dev:amd64 \ + libcap-ng-dev:amd64 \ + libcapstone-dev:amd64 \ + libcmocka-dev:amd64 \ + libcurl4-gnutls-dev:amd64 \ + libdaxctl-dev:amd64 \ + libdrm-dev:amd64 \ + libepoxy-dev:amd64 \ + libfdt-dev:amd64 \ + libffi-dev:amd64 \ + libfuse3-dev:amd64 \ + libgbm-dev:amd64 \ + libgcrypt20-dev:amd64 \ + libglib2.0-dev:amd64 \ + libglusterfs-dev:amd64 \ + libgnutls28-dev:amd64 \ + libgtk-3-dev:amd64 \ + libibumad-dev:amd64 \ + libibverbs-dev:amd64 \ + libiscsi-dev:amd64 \ + libjemalloc-dev:amd64 \ + libjpeg62-turbo-dev:amd64 \ + libjson-c-dev:amd64 \ + liblttng-ust-dev:amd64 \ + liblzo2-dev:amd64 \ + libncursesw5-dev:amd64 \ + libnfs-dev:amd64 \ + libnuma-dev:amd64 \ + libpam0g-dev:amd64 \ + libpixman-1-dev:amd64 \ + libpmem-dev:amd64 \ + libpng-dev:amd64 \ + libpulse-dev:amd64 \ + librbd-dev:amd64 \ + librdmacm-dev:amd64 \ + libsasl2-dev:amd64 \ + libsdl2-dev:amd64 \ + libsdl2-image-dev:amd64 \ + libseccomp-dev:amd64 \ + libselinux1-dev:amd64 \ + libslirp-dev:amd64 \ + libsnappy-dev:amd64 \ + libspice-server-dev:amd64 \ + libssh-gcrypt-dev:amd64 \ + libsystemd-dev:amd64 \ + libtasn1-6-dev:amd64 \ + libubsan1:amd64 \ + libudev-dev:amd64 \ + liburing-dev:amd64 \ + libusb-1.0-0-dev:amd64 \ + libusbredirhost-dev:amd64 \ + libvdeplug-dev:amd64 \ + libvirglrenderer-dev:amd64 \ + libvte-2.91-dev:amd64 \ + libxen-dev:amd64 \ + libzstd-dev:amd64 \ + nettle-dev:amd64 \ + systemtap-sdt-dev:amd64 \ + xfslibs-dev:amd64 \ + zlib1g-dev:amd64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index a8b728ca64..6db3079321 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -11,123 +11,123 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbpf-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcmocka-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libfuse3-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libglusterfs-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg62-turbo-dev \ - libjson-c-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libslirp-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-gcrypt-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - liburing-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - meson \ - multipath-tools \ - ncat \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg62-turbo-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-gcrypt-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -140,11 +140,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" # netmap/cscope/global RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 17a5709245..1fbe2b1376 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -74,75 +74,75 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-aarch64-linux-gnu \ - gcc-aarch64-linux-gnu \ - libaio-dev:arm64 \ - libasan5:arm64 \ - libasound2-dev:arm64 \ - libattr1-dev:arm64 \ - libbpf-dev:arm64 \ - libbrlapi-dev:arm64 \ - libbz2-dev:arm64 \ - libc6-dev:arm64 \ - libcacard-dev:arm64 \ - libcap-ng-dev:arm64 \ - libcapstone-dev:arm64 \ - libcmocka-dev:arm64 \ - libcurl4-gnutls-dev:arm64 \ - libdaxctl-dev:arm64 \ - libdrm-dev:arm64 \ - libepoxy-dev:arm64 \ - libfdt-dev:arm64 \ - libffi-dev:arm64 \ - libfuse3-dev:arm64 \ - libgbm-dev:arm64 \ - libgcrypt20-dev:arm64 \ - libglib2.0-dev:arm64 \ - libglusterfs-dev:arm64 \ - libgnutls28-dev:arm64 \ - libgtk-3-dev:arm64 \ - libibumad-dev:arm64 \ - libibverbs-dev:arm64 \ - libiscsi-dev:arm64 \ - libjemalloc-dev:arm64 \ - libjpeg62-turbo-dev:arm64 \ - libjson-c-dev:arm64 \ - liblttng-ust-dev:arm64 \ - liblzo2-dev:arm64 \ - libncursesw5-dev:arm64 \ - libnfs-dev:arm64 \ - libnuma-dev:arm64 \ - libpam0g-dev:arm64 \ - libpixman-1-dev:arm64 \ - libpng-dev:arm64 \ - libpulse-dev:arm64 \ - librbd-dev:arm64 \ - librdmacm-dev:arm64 \ - libsasl2-dev:arm64 \ - libsdl2-dev:arm64 \ - libsdl2-image-dev:arm64 \ - libseccomp-dev:arm64 \ - libselinux1-dev:arm64 \ - libslirp-dev:arm64 \ - libsnappy-dev:arm64 \ - libspice-server-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ - libsystemd-dev:arm64 \ - libtasn1-6-dev:arm64 \ - libubsan1:arm64 \ - libudev-dev:arm64 \ - liburing-dev:arm64 \ - libusb-1.0-0-dev:arm64 \ - libusbredirhost-dev:arm64 \ - libvdeplug-dev:arm64 \ - libvirglrenderer-dev:arm64 \ - libvte-2.91-dev:arm64 \ - libxen-dev:arm64 \ - libzstd-dev:arm64 \ - nettle-dev:arm64 \ - systemtap-sdt-dev:arm64 \ - xfslibs-dev:arm64 \ - zlib1g-dev:arm64 && \ + g++-aarch64-linux-gnu \ + gcc-aarch64-linux-gnu \ + libaio-dev:arm64 \ + libasan5:arm64 \ + libasound2-dev:arm64 \ + libattr1-dev:arm64 \ + libbpf-dev:arm64 \ + libbrlapi-dev:arm64 \ + libbz2-dev:arm64 \ + libc6-dev:arm64 \ + libcacard-dev:arm64 \ + libcap-ng-dev:arm64 \ + libcapstone-dev:arm64 \ + libcmocka-dev:arm64 \ + libcurl4-gnutls-dev:arm64 \ + libdaxctl-dev:arm64 \ + libdrm-dev:arm64 \ + libepoxy-dev:arm64 \ + libfdt-dev:arm64 \ + libffi-dev:arm64 \ + libfuse3-dev:arm64 \ + libgbm-dev:arm64 \ + libgcrypt20-dev:arm64 \ + libglib2.0-dev:arm64 \ + libglusterfs-dev:arm64 \ + libgnutls28-dev:arm64 \ + libgtk-3-dev:arm64 \ + libibumad-dev:arm64 \ + libibverbs-dev:arm64 \ + libiscsi-dev:arm64 \ + libjemalloc-dev:arm64 \ + libjpeg62-turbo-dev:arm64 \ + libjson-c-dev:arm64 \ + liblttng-ust-dev:arm64 \ + liblzo2-dev:arm64 \ + libncursesw5-dev:arm64 \ + libnfs-dev:arm64 \ + libnuma-dev:arm64 \ + libpam0g-dev:arm64 \ + libpixman-1-dev:arm64 \ + libpng-dev:arm64 \ + libpulse-dev:arm64 \ + librbd-dev:arm64 \ + librdmacm-dev:arm64 \ + libsasl2-dev:arm64 \ + libsdl2-dev:arm64 \ + libsdl2-image-dev:arm64 \ + libseccomp-dev:arm64 \ + libselinux1-dev:arm64 \ + libslirp-dev:arm64 \ + libsnappy-dev:arm64 \ + libspice-server-dev:arm64 \ + libssh-gcrypt-dev:arm64 \ + libsystemd-dev:arm64 \ + libtasn1-6-dev:arm64 \ + libubsan1:arm64 \ + libudev-dev:arm64 \ + liburing-dev:arm64 \ + libusb-1.0-0-dev:arm64 \ + libusbredirhost-dev:arm64 \ + libvdeplug-dev:arm64 \ + libvirglrenderer-dev:arm64 \ + libvte-2.91-dev:arm64 \ + libxen-dev:arm64 \ + libzstd-dev:arm64 \ + nettle-dev:arm64 \ + systemtap-sdt-dev:arm64 \ + xfslibs-dev:arm64 \ + zlib1g-dev:arm64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 701fc70db0..a430900505 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -74,74 +74,74 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabi \ - gcc-arm-linux-gnueabi \ - libaio-dev:armel \ - libasan5:armel \ - libasound2-dev:armel \ - libattr1-dev:armel \ - libbpf-dev:armel \ - libbrlapi-dev:armel \ - libbz2-dev:armel \ - libc6-dev:armel \ - libcacard-dev:armel \ - libcap-ng-dev:armel \ - libcapstone-dev:armel \ - libcmocka-dev:armel \ - libcurl4-gnutls-dev:armel \ - libdaxctl-dev:armel \ - libdrm-dev:armel \ - libepoxy-dev:armel \ - libfdt-dev:armel \ - libffi-dev:armel \ - libfuse3-dev:armel \ - libgbm-dev:armel \ - libgcrypt20-dev:armel \ - libglib2.0-dev:armel \ - libglusterfs-dev:armel \ - libgnutls28-dev:armel \ - libgtk-3-dev:armel \ - libibumad-dev:armel \ - libibverbs-dev:armel \ - libiscsi-dev:armel \ - libjemalloc-dev:armel \ - libjpeg62-turbo-dev:armel \ - libjson-c-dev:armel \ - liblttng-ust-dev:armel \ - liblzo2-dev:armel \ - libncursesw5-dev:armel \ - libnfs-dev:armel \ - libnuma-dev:armel \ - libpam0g-dev:armel \ - libpixman-1-dev:armel \ - libpng-dev:armel \ - libpulse-dev:armel \ - librbd-dev:armel \ - librdmacm-dev:armel \ - libsasl2-dev:armel \ - libsdl2-dev:armel \ - libsdl2-image-dev:armel \ - libseccomp-dev:armel \ - libselinux1-dev:armel \ - libslirp-dev:armel \ - libsnappy-dev:armel \ - libspice-server-dev:armel \ - libssh-gcrypt-dev:armel \ - libsystemd-dev:armel \ - libtasn1-6-dev:armel \ - libubsan1:armel \ - libudev-dev:armel \ - liburing-dev:armel \ - libusb-1.0-0-dev:armel \ - libusbredirhost-dev:armel \ - libvdeplug-dev:armel \ - libvirglrenderer-dev:armel \ - libvte-2.91-dev:armel \ - libzstd-dev:armel \ - nettle-dev:armel \ - systemtap-sdt-dev:armel \ - xfslibs-dev:armel \ - zlib1g-dev:armel && \ + g++-arm-linux-gnueabi \ + gcc-arm-linux-gnueabi \ + libaio-dev:armel \ + libasan5:armel \ + libasound2-dev:armel \ + libattr1-dev:armel \ + libbpf-dev:armel \ + libbrlapi-dev:armel \ + libbz2-dev:armel \ + libc6-dev:armel \ + libcacard-dev:armel \ + libcap-ng-dev:armel \ + libcapstone-dev:armel \ + libcmocka-dev:armel \ + libcurl4-gnutls-dev:armel \ + libdaxctl-dev:armel \ + libdrm-dev:armel \ + libepoxy-dev:armel \ + libfdt-dev:armel \ + libffi-dev:armel \ + libfuse3-dev:armel \ + libgbm-dev:armel \ + libgcrypt20-dev:armel \ + libglib2.0-dev:armel \ + libglusterfs-dev:armel \ + libgnutls28-dev:armel \ + libgtk-3-dev:armel \ + libibumad-dev:armel \ + libibverbs-dev:armel \ + libiscsi-dev:armel \ + libjemalloc-dev:armel \ + libjpeg62-turbo-dev:armel \ + libjson-c-dev:armel \ + liblttng-ust-dev:armel \ + liblzo2-dev:armel \ + libncursesw5-dev:armel \ + libnfs-dev:armel \ + libnuma-dev:armel \ + libpam0g-dev:armel \ + libpixman-1-dev:armel \ + libpng-dev:armel \ + libpulse-dev:armel \ + librbd-dev:armel \ + librdmacm-dev:armel \ + libsasl2-dev:armel \ + libsdl2-dev:armel \ + libsdl2-image-dev:armel \ + libseccomp-dev:armel \ + libselinux1-dev:armel \ + libslirp-dev:armel \ + libsnappy-dev:armel \ + libspice-server-dev:armel \ + libssh-gcrypt-dev:armel \ + libsystemd-dev:armel \ + libtasn1-6-dev:armel \ + libubsan1:armel \ + libudev-dev:armel \ + liburing-dev:armel \ + libusb-1.0-0-dev:armel \ + libusbredirhost-dev:armel \ + libvdeplug-dev:armel \ + libvirglrenderer-dev:armel \ + libvte-2.91-dev:armel \ + libzstd-dev:armel \ + nettle-dev:armel \ + systemtap-sdt-dev:armel \ + xfslibs-dev:armel \ + zlib1g-dev:armel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 5a11fe3900..4c54898420 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -74,75 +74,75 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabihf \ - gcc-arm-linux-gnueabihf \ - libaio-dev:armhf \ - libasan5:armhf \ - libasound2-dev:armhf \ - libattr1-dev:armhf \ - libbpf-dev:armhf \ - libbrlapi-dev:armhf \ - libbz2-dev:armhf \ - libc6-dev:armhf \ - libcacard-dev:armhf \ - libcap-ng-dev:armhf \ - libcapstone-dev:armhf \ - libcmocka-dev:armhf \ - libcurl4-gnutls-dev:armhf \ - libdaxctl-dev:armhf \ - libdrm-dev:armhf \ - libepoxy-dev:armhf \ - libfdt-dev:armhf \ - libffi-dev:armhf \ - libfuse3-dev:armhf \ - libgbm-dev:armhf \ - libgcrypt20-dev:armhf \ - libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ - libgnutls28-dev:armhf \ - libgtk-3-dev:armhf \ - libibumad-dev:armhf \ - libibverbs-dev:armhf \ - libiscsi-dev:armhf \ - libjemalloc-dev:armhf \ - libjpeg62-turbo-dev:armhf \ - libjson-c-dev:armhf \ - liblttng-ust-dev:armhf \ - liblzo2-dev:armhf \ - libncursesw5-dev:armhf \ - libnfs-dev:armhf \ - libnuma-dev:armhf \ - libpam0g-dev:armhf \ - libpixman-1-dev:armhf \ - libpng-dev:armhf \ - libpulse-dev:armhf \ - librbd-dev:armhf \ - librdmacm-dev:armhf \ - libsasl2-dev:armhf \ - libsdl2-dev:armhf \ - libsdl2-image-dev:armhf \ - libseccomp-dev:armhf \ - libselinux1-dev:armhf \ - libslirp-dev:armhf \ - libsnappy-dev:armhf \ - libspice-server-dev:armhf \ - libssh-gcrypt-dev:armhf \ - libsystemd-dev:armhf \ - libtasn1-6-dev:armhf \ - libubsan1:armhf \ - libudev-dev:armhf \ - liburing-dev:armhf \ - libusb-1.0-0-dev:armhf \ - libusbredirhost-dev:armhf \ - libvdeplug-dev:armhf \ - libvirglrenderer-dev:armhf \ - libvte-2.91-dev:armhf \ - libxen-dev:armhf \ - libzstd-dev:armhf \ - nettle-dev:armhf \ - systemtap-sdt-dev:armhf \ - xfslibs-dev:armhf \ - zlib1g-dev:armhf && \ + g++-arm-linux-gnueabihf \ + gcc-arm-linux-gnueabihf \ + libaio-dev:armhf \ + libasan5:armhf \ + libasound2-dev:armhf \ + libattr1-dev:armhf \ + libbpf-dev:armhf \ + libbrlapi-dev:armhf \ + libbz2-dev:armhf \ + libc6-dev:armhf \ + libcacard-dev:armhf \ + libcap-ng-dev:armhf \ + libcapstone-dev:armhf \ + libcmocka-dev:armhf \ + libcurl4-gnutls-dev:armhf \ + libdaxctl-dev:armhf \ + libdrm-dev:armhf \ + libepoxy-dev:armhf \ + libfdt-dev:armhf \ + libffi-dev:armhf \ + libfuse3-dev:armhf \ + libgbm-dev:armhf \ + libgcrypt20-dev:armhf \ + libglib2.0-dev:armhf \ + libglusterfs-dev:armhf \ + libgnutls28-dev:armhf \ + libgtk-3-dev:armhf \ + libibumad-dev:armhf \ + libibverbs-dev:armhf \ + libiscsi-dev:armhf \ + libjemalloc-dev:armhf \ + libjpeg62-turbo-dev:armhf \ + libjson-c-dev:armhf \ + liblttng-ust-dev:armhf \ + liblzo2-dev:armhf \ + libncursesw5-dev:armhf \ + libnfs-dev:armhf \ + libnuma-dev:armhf \ + libpam0g-dev:armhf \ + libpixman-1-dev:armhf \ + libpng-dev:armhf \ + libpulse-dev:armhf \ + librbd-dev:armhf \ + librdmacm-dev:armhf \ + libsasl2-dev:armhf \ + libsdl2-dev:armhf \ + libsdl2-image-dev:armhf \ + libseccomp-dev:armhf \ + libselinux1-dev:armhf \ + libslirp-dev:armhf \ + libsnappy-dev:armhf \ + libspice-server-dev:armhf \ + libssh-gcrypt-dev:armhf \ + libsystemd-dev:armhf \ + libtasn1-6-dev:armhf \ + libubsan1:armhf \ + libudev-dev:armhf \ + liburing-dev:armhf \ + libusb-1.0-0-dev:armhf \ + libusbredirhost-dev:armhf \ + libvdeplug-dev:armhf \ + libvirglrenderer-dev:armhf \ + libvte-2.91-dev:armhf \ + libxen-dev:armhf \ + libzstd-dev:armhf \ + nettle-dev:armhf \ + systemtap-sdt-dev:armhf \ + xfslibs-dev:armhf \ + zlib1g-dev:armhf && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 9b90a4d6ff..c0d4b0df17 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -74,72 +74,72 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mips64el-linux-gnuabi64 \ - gcc-mips64el-linux-gnuabi64 \ - libaio-dev:mips64el \ - libasound2-dev:mips64el \ - libattr1-dev:mips64el \ - libbpf-dev:mips64el \ - libbrlapi-dev:mips64el \ - libbz2-dev:mips64el \ - libc6-dev:mips64el \ - libcacard-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcapstone-dev:mips64el \ - libcmocka-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdaxctl-dev:mips64el \ - libdrm-dev:mips64el \ - libepoxy-dev:mips64el \ - libfdt-dev:mips64el \ - libffi-dev:mips64el \ - libfuse3-dev:mips64el \ - libgbm-dev:mips64el \ - libgcrypt20-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libgtk-3-dev:mips64el \ - libibumad-dev:mips64el \ - libibverbs-dev:mips64el \ - libiscsi-dev:mips64el \ - libjemalloc-dev:mips64el \ - libjpeg62-turbo-dev:mips64el \ - libjson-c-dev:mips64el \ - liblttng-ust-dev:mips64el \ - liblzo2-dev:mips64el \ - libncursesw5-dev:mips64el \ - libnfs-dev:mips64el \ - libnuma-dev:mips64el \ - libpam0g-dev:mips64el \ - libpixman-1-dev:mips64el \ - libpng-dev:mips64el \ - libpulse-dev:mips64el \ - librbd-dev:mips64el \ - librdmacm-dev:mips64el \ - libsasl2-dev:mips64el \ - libsdl2-dev:mips64el \ - libsdl2-image-dev:mips64el \ - libseccomp-dev:mips64el \ - libselinux1-dev:mips64el \ - libslirp-dev:mips64el \ - libsnappy-dev:mips64el \ - libspice-server-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ - libsystemd-dev:mips64el \ - libtasn1-6-dev:mips64el \ - libudev-dev:mips64el \ - liburing-dev:mips64el \ - libusb-1.0-0-dev:mips64el \ - libusbredirhost-dev:mips64el \ - libvdeplug-dev:mips64el \ - libvirglrenderer-dev:mips64el \ - libvte-2.91-dev:mips64el \ - libzstd-dev:mips64el \ - nettle-dev:mips64el \ - systemtap-sdt-dev:mips64el \ - xfslibs-dev:mips64el \ - zlib1g-dev:mips64el && \ + g++-mips64el-linux-gnuabi64 \ + gcc-mips64el-linux-gnuabi64 \ + libaio-dev:mips64el \ + libasound2-dev:mips64el \ + libattr1-dev:mips64el \ + libbpf-dev:mips64el \ + libbrlapi-dev:mips64el \ + libbz2-dev:mips64el \ + libc6-dev:mips64el \ + libcacard-dev:mips64el \ + libcap-ng-dev:mips64el \ + libcapstone-dev:mips64el \ + libcmocka-dev:mips64el \ + libcurl4-gnutls-dev:mips64el \ + libdaxctl-dev:mips64el \ + libdrm-dev:mips64el \ + libepoxy-dev:mips64el \ + libfdt-dev:mips64el \ + libffi-dev:mips64el \ + libfuse3-dev:mips64el \ + libgbm-dev:mips64el \ + libgcrypt20-dev:mips64el \ + libglib2.0-dev:mips64el \ + libglusterfs-dev:mips64el \ + libgnutls28-dev:mips64el \ + libgtk-3-dev:mips64el \ + libibumad-dev:mips64el \ + libibverbs-dev:mips64el \ + libiscsi-dev:mips64el \ + libjemalloc-dev:mips64el \ + libjpeg62-turbo-dev:mips64el \ + libjson-c-dev:mips64el \ + liblttng-ust-dev:mips64el \ + liblzo2-dev:mips64el \ + libncursesw5-dev:mips64el \ + libnfs-dev:mips64el \ + libnuma-dev:mips64el \ + libpam0g-dev:mips64el \ + libpixman-1-dev:mips64el \ + libpng-dev:mips64el \ + libpulse-dev:mips64el \ + librbd-dev:mips64el \ + librdmacm-dev:mips64el \ + libsasl2-dev:mips64el \ + libsdl2-dev:mips64el \ + libsdl2-image-dev:mips64el \ + libseccomp-dev:mips64el \ + libselinux1-dev:mips64el \ + libslirp-dev:mips64el \ + libsnappy-dev:mips64el \ + libspice-server-dev:mips64el \ + libssh-gcrypt-dev:mips64el \ + libsystemd-dev:mips64el \ + libtasn1-6-dev:mips64el \ + libudev-dev:mips64el \ + liburing-dev:mips64el \ + libusb-1.0-0-dev:mips64el \ + libusbredirhost-dev:mips64el \ + libvdeplug-dev:mips64el \ + libvirglrenderer-dev:mips64el \ + libvte-2.91-dev:mips64el \ + libzstd-dev:mips64el \ + nettle-dev:mips64el \ + systemtap-sdt-dev:mips64el \ + xfslibs-dev:mips64el \ + zlib1g-dev:mips64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 02feaf26cb..940b6794d1 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -74,72 +74,72 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mipsel-linux-gnu \ - gcc-mipsel-linux-gnu \ - libaio-dev:mipsel \ - libasound2-dev:mipsel \ - libattr1-dev:mipsel \ - libbpf-dev:mipsel \ - libbrlapi-dev:mipsel \ - libbz2-dev:mipsel \ - libc6-dev:mipsel \ - libcacard-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcapstone-dev:mipsel \ - libcmocka-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdaxctl-dev:mipsel \ - libdrm-dev:mipsel \ - libepoxy-dev:mipsel \ - libfdt-dev:mipsel \ - libffi-dev:mipsel \ - libfuse3-dev:mipsel \ - libgbm-dev:mipsel \ - libgcrypt20-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libgtk-3-dev:mipsel \ - libibumad-dev:mipsel \ - libibverbs-dev:mipsel \ - libiscsi-dev:mipsel \ - libjemalloc-dev:mipsel \ - libjpeg62-turbo-dev:mipsel \ - libjson-c-dev:mipsel \ - liblttng-ust-dev:mipsel \ - liblzo2-dev:mipsel \ - libncursesw5-dev:mipsel \ - libnfs-dev:mipsel \ - libnuma-dev:mipsel \ - libpam0g-dev:mipsel \ - libpixman-1-dev:mipsel \ - libpng-dev:mipsel \ - libpulse-dev:mipsel \ - librbd-dev:mipsel \ - librdmacm-dev:mipsel \ - libsasl2-dev:mipsel \ - libsdl2-dev:mipsel \ - libsdl2-image-dev:mipsel \ - libseccomp-dev:mipsel \ - libselinux1-dev:mipsel \ - libslirp-dev:mipsel \ - libsnappy-dev:mipsel \ - libspice-server-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libsystemd-dev:mipsel \ - libtasn1-6-dev:mipsel \ - libudev-dev:mipsel \ - liburing-dev:mipsel \ - libusb-1.0-0-dev:mipsel \ - libusbredirhost-dev:mipsel \ - libvdeplug-dev:mipsel \ - libvirglrenderer-dev:mipsel \ - libvte-2.91-dev:mipsel \ - libzstd-dev:mipsel \ - nettle-dev:mipsel \ - systemtap-sdt-dev:mipsel \ - xfslibs-dev:mipsel \ - zlib1g-dev:mipsel && \ + g++-mipsel-linux-gnu \ + gcc-mipsel-linux-gnu \ + libaio-dev:mipsel \ + libasound2-dev:mipsel \ + libattr1-dev:mipsel \ + libbpf-dev:mipsel \ + libbrlapi-dev:mipsel \ + libbz2-dev:mipsel \ + libc6-dev:mipsel \ + libcacard-dev:mipsel \ + libcap-ng-dev:mipsel \ + libcapstone-dev:mipsel \ + libcmocka-dev:mipsel \ + libcurl4-gnutls-dev:mipsel \ + libdaxctl-dev:mipsel \ + libdrm-dev:mipsel \ + libepoxy-dev:mipsel \ + libfdt-dev:mipsel \ + libffi-dev:mipsel \ + libfuse3-dev:mipsel \ + libgbm-dev:mipsel \ + libgcrypt20-dev:mipsel \ + libglib2.0-dev:mipsel \ + libglusterfs-dev:mipsel \ + libgnutls28-dev:mipsel \ + libgtk-3-dev:mipsel \ + libibumad-dev:mipsel \ + libibverbs-dev:mipsel \ + libiscsi-dev:mipsel \ + libjemalloc-dev:mipsel \ + libjpeg62-turbo-dev:mipsel \ + libjson-c-dev:mipsel \ + liblttng-ust-dev:mipsel \ + liblzo2-dev:mipsel \ + libncursesw5-dev:mipsel \ + libnfs-dev:mipsel \ + libnuma-dev:mipsel \ + libpam0g-dev:mipsel \ + libpixman-1-dev:mipsel \ + libpng-dev:mipsel \ + libpulse-dev:mipsel \ + librbd-dev:mipsel \ + librdmacm-dev:mipsel \ + libsasl2-dev:mipsel \ + libsdl2-dev:mipsel \ + libsdl2-image-dev:mipsel \ + libseccomp-dev:mipsel \ + libselinux1-dev:mipsel \ + libslirp-dev:mipsel \ + libsnappy-dev:mipsel \ + libspice-server-dev:mipsel \ + libssh-gcrypt-dev:mipsel \ + libsystemd-dev:mipsel \ + libtasn1-6-dev:mipsel \ + libudev-dev:mipsel \ + liburing-dev:mipsel \ + libusb-1.0-0-dev:mipsel \ + libusbredirhost-dev:mipsel \ + libvdeplug-dev:mipsel \ + libvirglrenderer-dev:mipsel \ + libvte-2.91-dev:mipsel \ + libzstd-dev:mipsel \ + nettle-dev:mipsel \ + systemtap-sdt-dev:mipsel \ + xfslibs-dev:mipsel \ + zlib1g-dev:mipsel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 97d3872ee2..2d59288622 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -74,74 +74,74 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-powerpc64le-linux-gnu \ - gcc-powerpc64le-linux-gnu \ - libaio-dev:ppc64el \ - libasan5:ppc64el \ - libasound2-dev:ppc64el \ - libattr1-dev:ppc64el \ - libbpf-dev:ppc64el \ - libbrlapi-dev:ppc64el \ - libbz2-dev:ppc64el \ - libc6-dev:ppc64el \ - libcacard-dev:ppc64el \ - libcap-ng-dev:ppc64el \ - libcapstone-dev:ppc64el \ - libcmocka-dev:ppc64el \ - libcurl4-gnutls-dev:ppc64el \ - libdaxctl-dev:ppc64el \ - libdrm-dev:ppc64el \ - libepoxy-dev:ppc64el \ - libfdt-dev:ppc64el \ - libffi-dev:ppc64el \ - libfuse3-dev:ppc64el \ - libgbm-dev:ppc64el \ - libgcrypt20-dev:ppc64el \ - libglib2.0-dev:ppc64el \ - libglusterfs-dev:ppc64el \ - libgnutls28-dev:ppc64el \ - libgtk-3-dev:ppc64el \ - libibumad-dev:ppc64el \ - libibverbs-dev:ppc64el \ - libiscsi-dev:ppc64el \ - libjemalloc-dev:ppc64el \ - libjpeg62-turbo-dev:ppc64el \ - libjson-c-dev:ppc64el \ - liblttng-ust-dev:ppc64el \ - liblzo2-dev:ppc64el \ - libncursesw5-dev:ppc64el \ - libnfs-dev:ppc64el \ - libnuma-dev:ppc64el \ - libpam0g-dev:ppc64el \ - libpixman-1-dev:ppc64el \ - libpng-dev:ppc64el \ - libpulse-dev:ppc64el \ - librbd-dev:ppc64el \ - librdmacm-dev:ppc64el \ - libsasl2-dev:ppc64el \ - libsdl2-dev:ppc64el \ - libsdl2-image-dev:ppc64el \ - libseccomp-dev:ppc64el \ - libselinux1-dev:ppc64el \ - libslirp-dev:ppc64el \ - libsnappy-dev:ppc64el \ - libspice-server-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ - libsystemd-dev:ppc64el \ - libtasn1-6-dev:ppc64el \ - libubsan1:ppc64el \ - libudev-dev:ppc64el \ - liburing-dev:ppc64el \ - libusb-1.0-0-dev:ppc64el \ - libusbredirhost-dev:ppc64el \ - libvdeplug-dev:ppc64el \ - libvirglrenderer-dev:ppc64el \ - libvte-2.91-dev:ppc64el \ - libzstd-dev:ppc64el \ - nettle-dev:ppc64el \ - systemtap-sdt-dev:ppc64el \ - xfslibs-dev:ppc64el \ - zlib1g-dev:ppc64el && \ + g++-powerpc64le-linux-gnu \ + gcc-powerpc64le-linux-gnu \ + libaio-dev:ppc64el \ + libasan5:ppc64el \ + libasound2-dev:ppc64el \ + libattr1-dev:ppc64el \ + libbpf-dev:ppc64el \ + libbrlapi-dev:ppc64el \ + libbz2-dev:ppc64el \ + libc6-dev:ppc64el \ + libcacard-dev:ppc64el \ + libcap-ng-dev:ppc64el \ + libcapstone-dev:ppc64el \ + libcmocka-dev:ppc64el \ + libcurl4-gnutls-dev:ppc64el \ + libdaxctl-dev:ppc64el \ + libdrm-dev:ppc64el \ + libepoxy-dev:ppc64el \ + libfdt-dev:ppc64el \ + libffi-dev:ppc64el \ + libfuse3-dev:ppc64el \ + libgbm-dev:ppc64el \ + libgcrypt20-dev:ppc64el \ + libglib2.0-dev:ppc64el \ + libglusterfs-dev:ppc64el \ + libgnutls28-dev:ppc64el \ + libgtk-3-dev:ppc64el \ + libibumad-dev:ppc64el \ + libibverbs-dev:ppc64el \ + libiscsi-dev:ppc64el \ + libjemalloc-dev:ppc64el \ + libjpeg62-turbo-dev:ppc64el \ + libjson-c-dev:ppc64el \ + liblttng-ust-dev:ppc64el \ + liblzo2-dev:ppc64el \ + libncursesw5-dev:ppc64el \ + libnfs-dev:ppc64el \ + libnuma-dev:ppc64el \ + libpam0g-dev:ppc64el \ + libpixman-1-dev:ppc64el \ + libpng-dev:ppc64el \ + libpulse-dev:ppc64el \ + librbd-dev:ppc64el \ + librdmacm-dev:ppc64el \ + libsasl2-dev:ppc64el \ + libsdl2-dev:ppc64el \ + libsdl2-image-dev:ppc64el \ + libseccomp-dev:ppc64el \ + libselinux1-dev:ppc64el \ + libslirp-dev:ppc64el \ + libsnappy-dev:ppc64el \ + libspice-server-dev:ppc64el \ + libssh-gcrypt-dev:ppc64el \ + libsystemd-dev:ppc64el \ + libtasn1-6-dev:ppc64el \ + libubsan1:ppc64el \ + libudev-dev:ppc64el \ + liburing-dev:ppc64el \ + libusb-1.0-0-dev:ppc64el \ + libusbredirhost-dev:ppc64el \ + libvdeplug-dev:ppc64el \ + libvirglrenderer-dev:ppc64el \ + libvte-2.91-dev:ppc64el \ + libzstd-dev:ppc64el \ + nettle-dev:ppc64el \ + systemtap-sdt-dev:ppc64el \ + xfslibs-dev:ppc64el \ + zlib1g-dev:ppc64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 95585e9e56..a105c1066e 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -74,73 +74,73 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-s390x-linux-gnu \ - gcc-s390x-linux-gnu \ - libaio-dev:s390x \ - libasan5:s390x \ - libasound2-dev:s390x \ - libattr1-dev:s390x \ - libbpf-dev:s390x \ - libbrlapi-dev:s390x \ - libbz2-dev:s390x \ - libc6-dev:s390x \ - libcacard-dev:s390x \ - libcap-ng-dev:s390x \ - libcapstone-dev:s390x \ - libcmocka-dev:s390x \ - libcurl4-gnutls-dev:s390x \ - libdaxctl-dev:s390x \ - libdrm-dev:s390x \ - libepoxy-dev:s390x \ - libfdt-dev:s390x \ - libffi-dev:s390x \ - libfuse3-dev:s390x \ - libgbm-dev:s390x \ - libgcrypt20-dev:s390x \ - libglib2.0-dev:s390x \ - libglusterfs-dev:s390x \ - libgnutls28-dev:s390x \ - libgtk-3-dev:s390x \ - libibumad-dev:s390x \ - libibverbs-dev:s390x \ - libiscsi-dev:s390x \ - libjemalloc-dev:s390x \ - libjpeg62-turbo-dev:s390x \ - libjson-c-dev:s390x \ - liblttng-ust-dev:s390x \ - liblzo2-dev:s390x \ - libncursesw5-dev:s390x \ - libnfs-dev:s390x \ - libnuma-dev:s390x \ - libpam0g-dev:s390x \ - libpixman-1-dev:s390x \ - libpng-dev:s390x \ - libpulse-dev:s390x \ - librbd-dev:s390x \ - librdmacm-dev:s390x \ - libsasl2-dev:s390x \ - libsdl2-dev:s390x \ - libsdl2-image-dev:s390x \ - libseccomp-dev:s390x \ - libselinux1-dev:s390x \ - libslirp-dev:s390x \ - libsnappy-dev:s390x \ - libssh-gcrypt-dev:s390x \ - libsystemd-dev:s390x \ - libtasn1-6-dev:s390x \ - libubsan1:s390x \ - libudev-dev:s390x \ - liburing-dev:s390x \ - libusb-1.0-0-dev:s390x \ - libusbredirhost-dev:s390x \ - libvdeplug-dev:s390x \ - libvirglrenderer-dev:s390x \ - libvte-2.91-dev:s390x \ - libzstd-dev:s390x \ - nettle-dev:s390x \ - systemtap-sdt-dev:s390x \ - xfslibs-dev:s390x \ - zlib1g-dev:s390x && \ + g++-s390x-linux-gnu \ + gcc-s390x-linux-gnu \ + libaio-dev:s390x \ + libasan5:s390x \ + libasound2-dev:s390x \ + libattr1-dev:s390x \ + libbpf-dev:s390x \ + libbrlapi-dev:s390x \ + libbz2-dev:s390x \ + libc6-dev:s390x \ + libcacard-dev:s390x \ + libcap-ng-dev:s390x \ + libcapstone-dev:s390x \ + libcmocka-dev:s390x \ + libcurl4-gnutls-dev:s390x \ + libdaxctl-dev:s390x \ + libdrm-dev:s390x \ + libepoxy-dev:s390x \ + libfdt-dev:s390x \ + libffi-dev:s390x \ + libfuse3-dev:s390x \ + libgbm-dev:s390x \ + libgcrypt20-dev:s390x \ + libglib2.0-dev:s390x \ + libglusterfs-dev:s390x \ + libgnutls28-dev:s390x \ + libgtk-3-dev:s390x \ + libibumad-dev:s390x \ + libibverbs-dev:s390x \ + libiscsi-dev:s390x \ + libjemalloc-dev:s390x \ + libjpeg62-turbo-dev:s390x \ + libjson-c-dev:s390x \ + liblttng-ust-dev:s390x \ + liblzo2-dev:s390x \ + libncursesw5-dev:s390x \ + libnfs-dev:s390x \ + libnuma-dev:s390x \ + libpam0g-dev:s390x \ + libpixman-1-dev:s390x \ + libpng-dev:s390x \ + libpulse-dev:s390x \ + librbd-dev:s390x \ + librdmacm-dev:s390x \ + libsasl2-dev:s390x \ + libsdl2-dev:s390x \ + libsdl2-image-dev:s390x \ + libseccomp-dev:s390x \ + libselinux1-dev:s390x \ + libslirp-dev:s390x \ + libsnappy-dev:s390x \ + libssh-gcrypt-dev:s390x \ + libsystemd-dev:s390x \ + libtasn1-6-dev:s390x \ + libubsan1:s390x \ + libudev-dev:s390x \ + liburing-dev:s390x \ + libusb-1.0-0-dev:s390x \ + libusbredirhost-dev:s390x \ + libvdeplug-dev:s390x \ + libvirglrenderer-dev:s390x \ + libvte-2.91-dev:s390x \ + libzstd-dev:s390x \ + nettle-dev:s390x \ + systemtap-sdt-dev:s390x \ + xfslibs-dev:s390x \ + zlib1g-dev:s390x && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index aca37aabc4..75383ba185 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,46 +1,103 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + FROM registry.fedoraproject.org/fedora:35 -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bison \ - bzip2 \ - ccache \ - diffutils \ - findutils \ - flex \ - gcc \ - gettext \ - git \ - glib2-devel \ - hostname \ - make \ - meson \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-glib2 \ - mingw32-gmp \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libffi \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-libusbx \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config \ - mingw32-SDL2 \ - msitools \ - perl \ - python3 \ - python3-PyYAML \ - tar \ - which +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + bash \ + bc \ + bison \ + bzip2 \ + ca-certificates \ + ccache \ + ctags \ + dbus-daemon \ + diffutils \ + findutils \ + flex \ + gcovr \ + genisoimage \ + git \ + glib2-devel \ + glibc-langpack-en \ + hostname \ + llvm \ + make \ + meson \ + ninja-build \ + nmap-ncat \ + openssh-clients \ + pcre-static \ + perl-base \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rpm \ + sed \ + sparse \ + spice-protocol \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + util-linux \ + which && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN nosync dnf install -y \ + mingw32-SDL2 \ + mingw32-SDL2_image \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-gcc \ + mingw32-gcc-c++ \ + mingw32-gettext \ + mingw32-glib2 \ + mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libgcrypt \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \ + mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "i686-w64-mingw32" +ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- +ENV DEF_TARGET_LIST i386-softmmu diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 3642766479..98c03dc13b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,43 +1,103 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + FROM registry.fedoraproject.org/fedora:35 -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bison \ - bzip2 \ - ccache \ - diffutils \ - findutils \ - flex \ - gcc \ - gettext \ - git \ - glib2-devel \ - hostname \ - make \ - meson \ - mingw32-nsis \ - mingw64-bzip2 \ - mingw64-curl \ - mingw64-glib2 \ - mingw64-gmp \ - mingw64-gtk3 \ - mingw64-libffi \ - mingw64-libjpeg-turbo \ - mingw64-libpng \ - mingw64-libtasn1 \ - mingw64-libusbx \ - mingw64-pixman \ - mingw64-pkg-config \ - msitools \ - perl \ - python3 \ - python3-PyYAML \ - tar \ - which +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + bash \ + bc \ + bison \ + bzip2 \ + ca-certificates \ + ccache \ + ctags \ + dbus-daemon \ + diffutils \ + findutils \ + flex \ + gcovr \ + genisoimage \ + git \ + glib2-devel \ + glibc-langpack-en \ + hostname \ + llvm \ + make \ + meson \ + ninja-build \ + nmap-ncat \ + openssh-clients \ + pcre-static \ + perl-base \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rpm \ + sed \ + sparse \ + spice-protocol \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + util-linux \ + which && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN nosync dnf install -y \ + mingw32-nsis \ + mingw64-SDL2 \ + mingw64-SDL2_image \ + mingw64-bzip2 \ + mingw64-curl \ + mingw64-gcc \ + mingw64-gcc-c++ \ + mingw64-gettext \ + mingw64-glib2 \ + mingw64-gnutls \ + mingw64-gtk3 \ + mingw64-libgcrypt \ + mingw64-libjpeg-turbo \ + mingw64-libpng \ + mingw64-libtasn1 \ + mingw64-nettle \ + mingw64-pixman \ + mingw64-pkg-config && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone +ENV ABI "x86_64-w64-mingw32" +ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- +ENV DEF_TARGET_LIST x86_64-softmmu diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index fe84166ca1..d200c7fc10 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -18,120 +18,120 @@ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ - SDL2-devel \ - SDL2_image-devel \ - alsa-lib-devel \ - bash \ - bc \ - bison \ - brlapi-devel \ - bzip2 \ - bzip2-devel \ - ca-certificates \ - capstone-devel \ - ccache \ - clang \ - ctags \ - cyrus-sasl-devel \ - daxctl-devel \ - dbus-daemon \ - device-mapper-multipath-devel \ - diffutils \ - findutils \ - flex \ - fuse3-devel \ - gcc \ - gcc-c++ \ - gcovr \ - genisoimage \ - gettext \ - git \ - glib2-devel \ - glib2-static \ - glibc-langpack-en \ - glibc-static \ - glusterfs-api-devel \ - gnutls-devel \ - 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 \ - libfdt-devel \ - libffi-devel \ - libgcrypt-devel \ - libiscsi-devel \ - libjpeg-devel \ - libnfs-devel \ - libpmem-devel \ - libpng-devel \ - librbd-devel \ - libseccomp-devel \ - libselinux-devel \ - libslirp-devel \ - libssh-devel \ - libtasn1-devel \ - libubsan \ - liburing-devel \ - libusbx-devel \ - libzstd-devel \ - llvm \ - lttng-ust-devel \ - lzo-devel \ - make \ - mesa-libgbm-devel \ - meson \ - ncurses-devel \ - nettle-devel \ - ninja-build \ - nmap-ncat \ - numactl-devel \ - openssh-clients \ - pam-devel \ - pcre-static \ - perl-base \ - pixman-devel \ - pkgconfig \ - pulseaudio-libs-devel \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx_rtd_theme \ - rdma-core-devel \ - rpm \ - sed \ - snappy-devel \ - sparse \ - spice-protocol \ - spice-server-devel \ - systemd-devel \ - systemtap-sdt-devel \ - tar \ - tesseract \ - tesseract-langpack-eng \ - texinfo \ - usbredir-devel \ - util-linux \ - virglrenderer-devel \ - vte291-devel \ - which \ - xen-devel \ - xfsprogs-devel \ - zlib-devel \ - zlib-static && \ + SDL2-devel \ + SDL2_image-devel \ + alsa-lib-devel \ + bash \ + bc \ + bison \ + brlapi-devel \ + bzip2 \ + bzip2-devel \ + ca-certificates \ + capstone-devel \ + ccache \ + clang \ + ctags \ + cyrus-sasl-devel \ + daxctl-devel \ + dbus-daemon \ + device-mapper-multipath-devel \ + diffutils \ + findutils \ + flex \ + fuse3-devel \ + gcc \ + gcc-c++ \ + gcovr \ + genisoimage \ + gettext \ + git \ + glib2-devel \ + glib2-static \ + glibc-langpack-en \ + glibc-static \ + glusterfs-api-devel \ + gnutls-devel \ + 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 \ + libfdt-devel \ + libffi-devel \ + libgcrypt-devel \ + libiscsi-devel \ + libjpeg-devel \ + libnfs-devel \ + libpmem-devel \ + libpng-devel \ + librbd-devel \ + libseccomp-devel \ + libselinux-devel \ + libslirp-devel \ + libssh-devel \ + libtasn1-devel \ + libubsan \ + liburing-devel \ + libusbx-devel \ + libzstd-devel \ + llvm \ + lttng-ust-devel \ + lzo-devel \ + make \ + mesa-libgbm-devel \ + meson \ + ncurses-devel \ + nettle-devel \ + ninja-build \ + nmap-ncat \ + numactl-devel \ + openssh-clients \ + pam-devel \ + pcre-static \ + perl-base \ + pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rdma-core-devel \ + rpm \ + sed \ + snappy-devel \ + sparse \ + spice-protocol \ + spice-server-devel \ + systemd-devel \ + systemtap-sdt-devel \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + usbredir-devel \ + util-linux \ + virglrenderer-devel \ + vte291-devel \ + which \ + xen-devel \ + xfsprogs-devel \ + zlib-devel \ + zlib-static && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ @@ -142,8 +142,8 @@ exec "$@"' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index d80064756f..361979d6b3 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -132,8 +132,8 @@ RUN zypper update -y && \ RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 24594afc15..ac16383da7 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -11,122 +11,122 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcmocka-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libfuse3-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libglusterfs-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - libjson-c-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libslirp-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - multipath-tools \ - ncat \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ + bash \ + bc \ + bison \ + bsdmainutils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-setuptools \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-wheel \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -141,11 +141,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" # Apply patch https://reviews.llvm.org/D75820 # This is required for TSan in clang-10 to compile with QEMU. RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3712b7912..a2633997ff 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97 +Subproject commit a2633997ffb3830acc96c98c70122885d83bebf4 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index e45c99adbe..ce0b24c0b1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -93,7 +93,7 @@ debian11_extras = [ ] -def debian_cross_build(prefix, targets): +def cross_build(prefix, targets): conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) targets = "ENV DEF_TARGET_LIST %s\n" % (targets) return "".join([conf, targets]) @@ -121,45 +121,55 @@ try: # generate_dockerfile("debian-amd64-cross", "debian-11", cross="x86_64", - trailer=debian_cross_build("x86_64-linux-gnu-", - "x86_64-softmmu," - "x86_64-linux-user," - "i386-softmmu,i386-linux-user")) + trailer=cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user")) generate_dockerfile("debian-arm64-cross", "debian-11", cross="aarch64", - trailer=debian_cross_build("aarch64-linux-gnu-", - "aarch64-softmmu,aarch64-linux-user")) + trailer=cross_build("aarch64-linux-gnu-", + "aarch64-softmmu,aarch64-linux-user")) generate_dockerfile("debian-armel-cross", "debian-11", cross="armv6l", - trailer=debian_cross_build("arm-linux-gnueabi-", - "arm-softmmu,arm-linux-user,armeb-linux-user")) + trailer=cross_build("arm-linux-gnueabi-", + "arm-softmmu,arm-linux-user,armeb-linux-user")) generate_dockerfile("debian-armhf-cross", "debian-11", cross="armv7l", - trailer=debian_cross_build("arm-linux-gnueabihf-", - "arm-softmmu,arm-linux-user")) + trailer=cross_build("arm-linux-gnueabihf-", + "arm-softmmu,arm-linux-user")) generate_dockerfile("debian-mips64el-cross", "debian-11", cross="mips64el", - trailer=debian_cross_build("mips64el-linux-gnuabi64-", - "mips64el-softmmu,mips64el-linux-user")) + trailer=cross_build("mips64el-linux-gnuabi64-", + "mips64el-softmmu,mips64el-linux-user")) generate_dockerfile("debian-mipsel-cross", "debian-11", cross="mipsel", - trailer=debian_cross_build("mipsel-linux-gnu-", - "mipsel-softmmu,mipsel-linux-user")) + trailer=cross_build("mipsel-linux-gnu-", + "mipsel-softmmu,mipsel-linux-user")) generate_dockerfile("debian-ppc64el-cross", "debian-11", cross="ppc64le", - trailer=debian_cross_build("powerpc64le-linux-gnu-", - "ppc64-softmmu,ppc64-linux-user")) + trailer=cross_build("powerpc64le-linux-gnu-", + "ppc64-softmmu,ppc64-linux-user")) generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", - trailer=debian_cross_build("s390x-linux-gnu-", - "s390x-softmmu,s390x-linux-user")) + trailer=cross_build("s390x-linux-gnu-", + "s390x-softmmu,s390x-linux-user")) + + generate_dockerfile("fedora-win32-cross", "fedora-35", + cross="mingw32", + trailer=cross_build("i686-w64-mingw32-", + "i386-softmmu")) + + generate_dockerfile("fedora-win64-cross", "fedora-35", + cross="mingw64", + trailer=cross_build("x86_64-w64-mingw32-", + "x86_64-softmmu")) # # Cirrus packages lists for GitLab From patchwork Thu Oct 20 11:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616771 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp305870pvb; Thu, 20 Oct 2022 07:37:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UkUa+ykf/e4Qo0bMUzTYYjzOgugfaCrG/XqvhGVB+yjvJjc5aTmz+I/4w4VmG6/b6ZUKR X-Received: by 2002:a05:620a:4487:b0:6ee:bcfd:bd38 with SMTP id x7-20020a05620a448700b006eebcfdbd38mr9425461qkp.468.1666276624047; Thu, 20 Oct 2022 07:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666276624; cv=none; d=google.com; s=arc-20160816; b=BdcsR34anNmkC5ZIi0JH9o2vmZtbHpP+Jw+O9o6TUHCAOviUiihr7/ujRNX5GxiTsS zTi+s2rpWPw6GBsGJ3WgNCoGh57DUIgDqjYJyOuzMXpp0OTN/XIApl8huMA/oiHBS7mf +cS9Sm8uCVC38SoJwEuMQicknuZ2fcBUVZcRAAxx454CYhR40eO1cfqguullf3faKjUc xqUJzVOqgCErmh82IzR0R9S5WkNK/R8bx32IMnhsFJ5rIDUj7RTlP22hFsF3CLbuwwL5 o7X2NQX/D/eSDVNGVMJpDLYHegdE0Jo86FpztO86NJ4TA4h6QdX9+PE62fdN9CQzyC/B zaPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s+7e67dYziM0ASwMkluF/JHdWOtxzR9FEiDumxeR7RY=; b=x1LG+rjARfcs7DWIHjdpUPEsHjpKrDvjRyrS4Cjc+uNUxtVqZyBoZ+04Y02mx9X6Tn dfYDh55WNLXGKo8/a058UfJYNcDw/nU1/c5ntkO0K9DQm1xPrJJSarR3GDTJMlhZ1zoW Q31XuPaKXGNJlgubvfIKJdLtgsZujx7YknyvU+db0Cb3448DM4sceE5uASxK4JJMxsUU Wcctva2nxxmIv3jdZGFLok8QlcOAI2I4hwB0DlVzhvkVfkv7tuuUWF4aXsGg5GxFuCsn P61P/47OPgfwwWlXYDaJpd0hvg9PAnGQ1MdYBGA4HvvKkzEtTe6G/boHIixoyYOHzt+v uDfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=selVZ8fa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y4-20020ac87044000000b0039cc8c452efsi10272188qtm.445.2022.10.20.07.37.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:37:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=selVZ8fa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWfO-0004jM-9u for patch@linaro.org; Thu, 20 Oct 2022 10:37:02 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWae-0007sq-Gg for patch@linaro.org; Thu, 20 Oct 2022 10:32:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU5w-0002d3-Vq for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5u-0000nW-S5 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:16 -0400 Received: by mail-wm1-x32f.google.com with SMTP id v130-20020a1cac88000000b003bcde03bd44so2108704wme.5 for ; Thu, 20 Oct 2022 04:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s+7e67dYziM0ASwMkluF/JHdWOtxzR9FEiDumxeR7RY=; b=selVZ8faGQY0taIvBmP9uxjH4lt+QX8zmakWdVHj8wlv3euxmCnXkqRHq5OhwMMiLy LrJAsurDLS6CQgfcZ+x0BXAffrATj7nVA0YvRD5LkUn2p4EEja/SB5pjHoubZ0lnr2hO kchto0LD9u5cQRoJmDXZ7j9fTrdiCTgPYul/IxkCvT3c8dfM6vdQ8k1zV19RX124Ubgp k3UW8Hi1qtzmTRCJJBKiVpUXlaEdBU0LxQlmnUHoRf7HbBeYawSGY6FQZKL+fOBYPtq3 YN0PMdM7FKveW5FS7gDda389/OZYzY6t1BBbzyQt/9kGahuhvsRWB5EI42uOVe33u6w4 mUmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s+7e67dYziM0ASwMkluF/JHdWOtxzR9FEiDumxeR7RY=; b=3Bfg1LHK2Q64qNQA+PKcVV3P13/Y5DhID06UchMkwLT/P8aOzw+mhVcznlOvMqyJrt bP3/qz3oEfi6T3KhzZ0TCVIkAktbszD5r2Z7hd69JR6Bf04fbiDoajHDewrRRu+WbFTc oJ/eSOKIjYf/8U+F26HKZkji6/1FJh27qTNzUw18zX1LTirPzAWhtFeHt7/Ny62nPGyl 17EtMi9xS3jc5lvSPB1WSwnew6dpQLZ0fWm4MAPQrmhtU8qemuaw1vx1BAyegrWJErYh XgZ748uvonOf8EkhjspbIIq+kiyrRBLCbgXQj47QFOgH0uQx2faKTndgpRb/O6d7B1oW 5Zzg== X-Gm-Message-State: ACrzQf3BnOiNxTYbC9vHwDvFphkK1A7lfMckICAHLGtUjI7x2J4JmEVt NQqMoGH6xKiPC/+iyJneLHltPg== X-Received: by 2002:a05:600c:19cc:b0:3c6:fd74:cb2b with SMTP id u12-20020a05600c19cc00b003c6fd74cb2bmr9186662wmq.6.1666266732646; Thu, 20 Oct 2022 04:52:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h18-20020a05600c351200b003b4868eb71bsm2817009wmq.25.2022.10.20.04.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4117D1FFBA; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 02/26] tests/docker: update test-mingw to run single build Date: Thu, 20 Oct 2022 12:51:45 +0100 Message-Id: <20221020115209.1761864-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While the test-build test happily run for mingw the test-mingw case runs more of the packaging inline with what our CI does. It however fails if we don't find both compilers and expects to be run on a docker image with both. Remove that distinction and make it work more like the other build test scripts. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/test-mingw | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 0bc6d78872..18366972eb 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -13,14 +13,12 @@ . common.rc -requires_binary x86_64-w64-mingw32-gcc -requires_binary i686-w64-mingw32-gcc +requires_binary x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc cd "$BUILD_DIR" -for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do - TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ - build_qemu --cross-prefix=$prefix \ +TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ +build_qemu \ --enable-trace-backends=simple \ --enable-gnutls \ --enable-nettle \ @@ -29,8 +27,6 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-bzip2 \ --enable-guest-agent \ --enable-docs - install_qemu - make installer - make clean - -done +install_qemu +make installer +make clean From patchwork Thu Oct 20 11:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616725 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp234160pvb; Thu, 20 Oct 2022 05:49:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4zpK0Oc35u4s9Fw0EvDc5PpVKLqZcBX2VJb8HiEUf8nxTm2E0W5kqhRv3GA2iy5o/UKhrC X-Received: by 2002:ac8:5ace:0:b0:39a:9939:8d9 with SMTP id d14-20020ac85ace000000b0039a993908d9mr10996953qtd.625.1666270186550; Thu, 20 Oct 2022 05:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666270186; cv=none; d=google.com; s=arc-20160816; b=cc8qX/PmS1tyNeh+eNYEdmBXSakCdeWdGSRNyrZXAQ1M+x7mdt+xV55YJMNOY8If3a jqJDDDDQIFAE1xhTYBfUKlQt7/GaguxcxSGZLhgzMOofJBiRBKv2ikuN9RrNEies3IoN +oEut9d3GhvRipZ1M8b258/QmDMnnjXAVp34AcNaJMGQsxZ7LVG72xqbiafwrO+ytOjS 0MTmfcizafdEUCIf13cVtRn/OQg48rg/qJggdEiz6qZDk4Y2mgApQy9GuV7w7fwBhjpA gX3T3NdmJIxFmjBpHcPAbZlbH0YuGg79IaGyHSAv2EAwt3JLMbmVV5kpY2E943spNOUy SIDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P6ZlX/GdPaZ36NnknHeGOl5vJSXm8qxKKINm9d0mPmI=; b=RfBcq+gj8ZpvD/BPt1rTtFCnclkcw8kQmJwZ4OC6lxdtxRoxMaPJga0SY3OVqtHYbk 1fIxoranlbfxCipgKxevhz3mJB+8E5yOuAX5yXNtXn5onC9Pxpk5QvduBAjGa2gIevdp PdcihTmuhuH2YKzwSzoPNfBOely9eLuFqtdQl63rl9ggdOfvINMJXEn2P5OadnzFQ7ne SlbRAhJbbtGg84KoVC1qo/hj4k45EG8PDbZgl20xnZKVvq/z0Ib2owQ6sSF7Y7veQW5n ZRqXuFnaALO9Sa7I1Xv6UoetZrhd4iCSLZU6MGvZbFiK1SqhtXWqOglnRObZ3/N+H7nN nMKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VP4FYyrG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jf9-20020a0562142a4900b004ad2a29d6cbsi10450306qvb.172.2022.10.20.05.49.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:49:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VP4FYyrG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUzY-0003ZE-Va for patch@linaro.org; Thu, 20 Oct 2022 08:49:45 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUyF-0003Ix-V7 for patch@linaro.org; Thu, 20 Oct 2022 08:48:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU5w-0002d2-SS for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5t-0000nQ-SY for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id n12so33796611wrp.10 for ; Thu, 20 Oct 2022 04:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P6ZlX/GdPaZ36NnknHeGOl5vJSXm8qxKKINm9d0mPmI=; b=VP4FYyrG+MCN21PT4kGODgeszD7Rj+N7uZ+WrS9XBG3+cJdb93wiwXAXrj9gp9t6SZ AUL53zpD65sGWqbaYUhnMAJ8Ptri0zYGC9PGb115KhHDSmgXlat7dJ/qybIj5xcypl5R MyFQRX6zpRmuF/hxfyC/6FTNP12RIKxpS3Na7W8/2UQd//t1KuzuP5A2Q4EbWvF9jS8O bdXYpGlAWOzEOsc6H/xugVlsGpVgFNB/f95LZKVkePDetBSrDVm+01Ojm+9cnXhveRL+ wFv5wTTYBz88w5r7ZMMEwoOzYSy4SAJXqhKO7/TSkQN8TzmxDq44vZ2BBRZyVxr8rZyy 6sBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P6ZlX/GdPaZ36NnknHeGOl5vJSXm8qxKKINm9d0mPmI=; b=M0KFHgiJ8l88XowMDADBs8Wg7s52J2cTpsVKqCY0zbLCg3Ou7OHzLxUkoJXPUFcwfm qYOvirEukT7fMFQgPmaBwLk2PVWzlom4iGYoa/nVcWWVf3h8QzPfz+BPLAQsM4zKEbZx vHvsZq2JW4GqOg9CmODL2rQNWg3K7+WRvZdFQla9vUWttkyaVZse+AkH7rl9uOM+DXDC DwIafKq9PnMpBYboYAPXYrZmRZoqvRcUl7Z4vf8B3tEzbB2UQhqaT2Xo76o67sHDXzAE g7R3Yf59IDHLsRZOAEnrdhITTMVzemVwkEaXcIYaPWAyqHZ/ZiHzGEH+mkjqo13llsb0 yvKg== X-Gm-Message-State: ACrzQf2vCfiyIm92KO6f/VwKtIiwQpgKlRJ2c76/QK2iuFtQTIjeJcAt N/UmAr++k+mbXGGiuchbEJvw8w== X-Received: by 2002:a05:6000:1c03:b0:232:1b9a:eb47 with SMTP id ba3-20020a0560001c0300b002321b9aeb47mr8239086wrb.661.1666266731749; Thu, 20 Oct 2022 04:52:11 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m13-20020a05600c4f4d00b003c6c76b43a1sm1864459wmq.13.2022.10.20.04.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 571071FFBB; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Anton Johansson , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 03/26] tests/docker: Add flex/bison to `debian-all-test` Date: Thu, 20 Oct 2022 12:51:46 +0100 Message-Id: <20221020115209.1761864-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Anton Johansson Adds flex/bison to the debian-all-test-cross container which was missed in the previous CI patch. These dependencies are required by the idef-parser patchset for target/hexagon. Signed-off-by: Anton Johansson Signed-off-by: Alex Bennée Message-Id: <20221011173229.57909-1-anjo@rev.ng> Reviewed-by: Thomas Huth --- tests/docker/dockerfiles/debian-all-test-cross.docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 2beb077fb4..8dc5e1b5de 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -20,8 +20,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ # Add extra build tools and as many cross compilers as we can for testing RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + bison \ ccache \ clang \ + flex \ git \ ninja-build \ gcc-aarch64-linux-gnu \ From patchwork Thu Oct 20 11:51:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616724 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp232511pvb; Thu, 20 Oct 2022 05:46:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6xI+MeNj+bz6R3yZnlA2dO625hFwnQs6plGA+t2AhksTguXEoQehrybeRDM816ZEqH9Q7B X-Received: by 2002:ad4:5c8c:0:b0:4b9:436:de75 with SMTP id o12-20020ad45c8c000000b004b90436de75mr1273262qvh.73.1666270004762; Thu, 20 Oct 2022 05:46:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666270004; cv=none; d=google.com; s=arc-20160816; b=AqdWkAYWl8HDW6v1Ju7hQ2ECNA6ptWTv3dNaXaeFa5bDxD3p93l+WOLQ7yT8cHkSGr qS3JJKGzJ5k+QBDHcjKSthn2CJFnxfV61zlPbs8VfCm/RJh32rC213PyPBMQ6g1byolT 9iFAMi7orXBVrAeMJEukknYo/xaTE+66zuroR+uRYY5SJa3urDcjXTPrz3EvCTi+Zvjl oMHWjBWecEvEOxwsakrb7EjPJUdTQ/visPg0xk648ojr0Agr8WDo/Gd9xOBQCAXRv5vC cZOQT/sv71EAa8z5PDFA+cpYbhX4GVoZI0OxdAoV5oYlz3HMqCJfaPj8DeCXCyq+EWXB GnmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eTmZioBHomlpJDRXUv3StRRoYOLWVw0UemeKw+NtcTA=; b=plsjz7XpZpAUh1QY7UjDDlfbMLSBJD6yRRNHDLcdgbcDi1HgR3+cWQ92oE2KA4usvL weYYxOumNMRtlyB34AJ51BKViJLATr5sLGzUVzNhVBqpmy7b1p0KATVsN8Z+EOoiFzAF og6q3M/Ef1O3pWJQeCDwT1eRRXfp7/cDY5NCMB6J88Q/kFkBw18S6tqTdV/JLVIQVeQA UbDezA0q/VBjRMZ3j29Xi5HsPZJSzdmakt2cFYVfcTzne7u+znuJly6WV6UiCHqRzCjz s1bmP2m32gZnlZ/meMGkU0Xe09oOpJTJaGUSZtxyGAmfjkOrvONSzExjxW0uS3azGlnD MT0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=os4l0wMs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z29-20020ac8431d000000b0039cf603ce22si4133032qtm.424.2022.10.20.05.46.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:46:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=os4l0wMs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUwb-0002Zk-Te for patch@linaro.org; Thu, 20 Oct 2022 08:46:43 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUjT-0004xL-Iu for patch@linaro.org; Thu, 20 Oct 2022 08:33:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU61-0002dT-8w for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5v-0000nd-4b for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:18 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w18so33982804wro.7 for ; Thu, 20 Oct 2022 04:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eTmZioBHomlpJDRXUv3StRRoYOLWVw0UemeKw+NtcTA=; b=os4l0wMssUM528MPVwaRW2CHGjVhaylClzMz52gWKwAM8AfeYQk+1mBLvs4TFBQQDK vkzCeBGxRrnuDUQG9f0Wrd+Xpxay14Z6dki6OLN5ajxKvtrB8s5sUz/OClSAENeIfVAE k5vd/fCXE0eQmhaDmqDQ6E391uhkyFZ0WzuQ41RQXvV4QEM1VZ3dKeQY7PAIY70PuaxJ xmefraRa/7X6dSRlwdTE9/NVy4y9PGr4cL3y7+fBOoTTbD4ZrVnDJdKYhYIQNXXl+4eh 2DKzAL08MP9kNT5jIAU2ueCIomTgr85eXWmMNJZ1bOzPAHh9fJXxA+2tn9+XweJt3uQa QsEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eTmZioBHomlpJDRXUv3StRRoYOLWVw0UemeKw+NtcTA=; b=Vt+HXvzBdAr0jRRIO8NkBsm4+RHs38Q83lZSMh6PKoOzRNGhF2lMfA1wMgKCKUVOjN fPfauYOak5I4TE2UiE1bEBnp8rpZhBYOdKxeWj6XY3Qcghpyix66a9uYoCzYF0swOijh BlRUHyEQkewiJ+wdZN0GIV6gMusYbjtDFVoguCUYLL9ILRIietktdIeuKm8tWEgUInME zz+2b6g0DeqlUdHbJga6Onzm10KThm6RRDOB6yT35JcHcovl2NPh4fkHPXQ9u4UhtVoF 2XEU1wW89U4TC1QbyZfoqoFEZxCqToufhmP1LjyeDCLISErpgXMyAIVAx+LWQujTMdRM UfTg== X-Gm-Message-State: ACrzQf0R5ptHUMrMh/ZqUSeOpYh73lMZfNEz4jCKSAUjmmznuWqeX3gx xGHO/RdZZl0gmeCY6qipxk0+Tg== X-Received: by 2002:a5d:6683:0:b0:22c:dcc5:abb2 with SMTP id l3-20020a5d6683000000b0022cdcc5abb2mr8157504wru.85.1666266733888; Thu, 20 Oct 2022 04:52:13 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m8-20020adfe0c8000000b0022efc4322a9sm16207372wri.10.2022.10.20.04.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D95A1FFBC; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 04/26] configure: don't enable cross compilers unless in target_list Date: Thu, 20 Oct 2022 12:51:47 +0100 Message-Id: <20221020115209.1761864-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This avoids the unfortunate effect of always builds the pc-bios blobs for targets the user isn't interested in. Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure b/configure index 81561be7c1..dd6f58dcde 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,15 @@ probe_target_compiler() { container_cross_ranlib= container_cross_strip= + # We shall skip configuring the target compiler if the user didn't + # bother enabling an appropriate guest. This avoids building + # extraneous firmware images and tests. + if test "${target_list#*$1}" != "$1"; then + break; + else + return 1 + fi + target_arch=${1%%-*} case $target_arch in aarch64) container_hosts="x86_64 aarch64" ;; From patchwork Thu Oct 20 11:51:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616726 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp234937pvb; Thu, 20 Oct 2022 05:51:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Zxd6RysIXRL+nv5uaZ0HgsrHusW0LGVrddyS0+V2GV32+8gp8k35/fsBgZ46Y+SzUhIus X-Received: by 2002:a05:620a:40cb:b0:6ee:79ce:e985 with SMTP id g11-20020a05620a40cb00b006ee79cee985mr8969077qko.219.1666270282885; Thu, 20 Oct 2022 05:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666270282; cv=none; d=google.com; s=arc-20160816; b=kOh7i17+Bm+FrVSh1xWfoAUGmM3Its7fqk2Uq27J7ce6Eoc5ZHr5r2yPqIWRVM5ggv HIU/KuhHIzU/ZSa7X8IDRaO/EOdRdMbysS8burIcUZMB48f/uXml4VaYRL/f54VYWwmi dG+uT/Ec/A7eCsuRKADtGS+SHCV2+y4RynPL9bTrxRfwVa+T38sC/pD6z1JQ6wk8d9Sp 7tEDL7v/doWzprtH9OQ7Tf4+cVAYjsMyTVJ+5xIqRKH/o3EprkzM8mNRk24QJimmRsSZ io2o6siVrtG6+yyw1FEQ127tb5CVS8GzvH9zDwlGDUH+6XXgB/NByi+M9o43Z4eKLZcG hXkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=y2r86cIkMVyRHBjasU8BLM80fUl/rbZ8N5I6eEXnTy0=; b=UmmxIIfj1vONqA98SBv/HzFYmvp3KTrgIH/bEUw+Z16PlFHO28wfm7oNRT9RwgoCVA +NmTnmQeuSMhv0TQuvE740ONiz2h5MlxzubDuXl99WGSJ/P5g9UaVYm9DUos0+XiIcj7 PO5cBVJsuaDkdjbCFAqZcLSKbu0zHAPQ0wVFuhlHQfDWssFzo/tbCW6fvU+mr47zgTw/ iIOGxF1pU/XJN1v+5Z78+p5xjC+qDAPwerSlzIMTtGNA/X05C050PFTYy7HLSzMHgv1c c5nCURz63YezCgMMsVEmVZe6OWJDgQaaubJtf4+8QhQSSfuV4IKgIAeBUiLl4nSxqBSn EsxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ANRU/Keo"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q26-20020ac8411a000000b0039cf9020039si3666806qtl.494.2022.10.20.05.51.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ANRU/Keo"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olV16-0008Cr-N5 for patch@linaro.org; Thu, 20 Oct 2022 08:51:21 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUt3-0000Qp-Ni for patch@linaro.org; Thu, 20 Oct 2022 08:43:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU61-0002dU-9G for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5w-0000nr-SI for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:18 -0400 Received: by mail-wr1-x42c.google.com with SMTP id b4so33935162wrs.1 for ; Thu, 20 Oct 2022 04:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y2r86cIkMVyRHBjasU8BLM80fUl/rbZ8N5I6eEXnTy0=; b=ANRU/KeoHIaJWxrGXqWgW9XdXpCwu49JRqXdEZjgqrlK3KYAvFDY8CIV+3OtnyPQQX BBGNb2tzvXCPA9L74+wNH5qf+0sKLhpe7aUsvr6j1N+BJdsdsX5VQnkmMju6FrAMs9us YdxKyqWTMLJLk40pAzC/XawUvSQz1EF9ekOWEtvr0Cpn+DttGVvaXUO2JYT2Ne7RBAAB dwIp6bL7FW28MY2iKr7seIp7ndGbX0pZtcqEZXp8JD38b32+oJqXB68Ot8KvJxxoUvGt a2OshkqSUSR4mpJYierwmKh6z45VFhKcnxZzs7LDc1nDKYmkwndxDCCWxMAo/21MDpJi 4YwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y2r86cIkMVyRHBjasU8BLM80fUl/rbZ8N5I6eEXnTy0=; b=VMLN9ITIuMf7RdSmxIh53c+u8yS4AO2hxS5xv7UvE/cim3WXtimVm7PfTNQAukDw7Y u7nDWGtaf+kUNdQyBxSlAFNHrp8JnDN7O16lovZlndShHDYezvdX2fPe/mE1kOviiaaH ylQXYi89egwV0QP+TUTgtqepE+CqwetPBt/B2qdHXDIc6IGQoj62ReDAAsZLKAA9fVkP 5JbzkZ5Rn3OHGsWAKxaCfZ98C2b1ozezRbYJ87H6IJE0EXf1oS59GAFIgoZ3spB37Ow4 Qf3chKYS0FK7dgQC/j/aA/ewDxd7TybMGRz4TZjgFomtv1QgHG48pPqCT6k6SE+PQA80 zIWQ== X-Gm-Message-State: ACrzQf1RRIqCBLS9T0mCB2knL7ANoSgLnXVX5Stv4K0up70QU/TFIARd 8bwqalXBO+m387fgsC1kj3gjCCK6A1+o/w== X-Received: by 2002:adf:db42:0:b0:22e:386e:f6af with SMTP id f2-20020adfdb42000000b0022e386ef6afmr8154492wrj.400.1666266735232; Thu, 20 Oct 2022 04:52:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m6-20020a05600c3b0600b003c6c2ff7f25sm3045368wms.15.2022.10.20.04.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 832B41FFBD; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 05/26] configure: fix the --enable-static --disable-pie case Date: Thu, 20 Oct 2022 12:51:48 +0100 Message-Id: <20221020115209.1761864-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The previous tweak was incomplete as it missed a leg. Fixes: abafb64b6d (configure: explicitly set cflags for --disable-pie) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dd6f58dcde..8c2c4c1a04 100755 --- a/configure +++ b/configure @@ -1327,6 +1327,8 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF +# Meson currently only handles pie as a boolean for now so if we have +# explicitly disabled PIE we need to extend our cflags because it wont. if test "$static" = "yes"; then if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" @@ -1335,13 +1337,12 @@ if test "$static" = "yes"; then error_exit "-static-pie not available due to missing toolchain support" else pie="no" + QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS" fi elif test "$pie" = "no"; then if compile_prog "-Werror -fno-pie" "-no-pie"; then CONFIGURE_CFLAGS="-fno-pie $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS="-no-pie $CONFIGURE_LDFLAGS" - # Meson currently only handles pie as a boolean for now so if we have - # explicitly disabled PIE we need to extend our cflags because it wont. QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS" fi elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then From patchwork Thu Oct 20 11:51:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616719 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp225472pvb; Thu, 20 Oct 2022 05:33:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4UFSz+y+0Ab8GYEVbMiplaBnPdcfw/2tqXEHLzHPac3g95QU1jz9rQ2SL1Uv/1pau0bhOl X-Received: by 2002:ac8:7f0c:0:b0:39d:a20:1d39 with SMTP id f12-20020ac87f0c000000b0039d0a201d39mr2661368qtk.164.1666269208400; Thu, 20 Oct 2022 05:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666269208; cv=none; d=google.com; s=arc-20160816; b=kvYf4OR5pNLJlcqFaNg9a5kn9Q1NcYzmZqlT7Xu36LRbQkpaCYoZozNoO9O4WxduD6 u4V3LYwC86BGjS0fxIZual6dbOvxQ1IGF/bqoJeRLiuobLN6q5i6Zt/FfM4faWbzJlhW EL3Q3S/qd/ZvyTyuprcNkPZURe301/mNjJrVkO8yqY3tZlrKluvtJzFcFG0WbzQYMJwc IMeK0Tc7SK+2Ij9qoaMp2H6apDPCMfbADNGUlKSXbxKHQ4N6MB9Ktx+9ayvtHZJTQB3p teiHl7BZ96g54r11eOgnlAuk0o3CbTgZT4n0iQc+D1R/ijDeZGYZgLB4yUJ+jX+6aA9D 9z2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mFOnT1sMtXBnCTZImDBtlQzxhw9rMaTtI2H9oXB4Uf0=; b=jSjVkPdlrFFGKi6tq/Z4i9o79eS8Qf/d6VV84K/mQ9/qjpDtYvGX4FuuSB437uOguh McAJhB4ZtMtjLvxqsHjRTq2ziX0tJTAQBqaAXfS2P0kDjjCdJuMz3Ov2f408H1fPYdNp wXvgrwZJu3fmNDVGk4BXswkZKIIir7DvXnYl2R54wv49NLn8Epy00SdY1cIbuOuryk3I pb1l9a4Ij9zk8K7i3E09wXPjubfGZcQgIg7ABG3pV6YKDeRbbn+UbZZAAf6Knt9V+LWh j04fFvpRlYgQej3nrNs7yMtp6azIzpnoQSzzGbiYj6YditVkod1hM6r07MFW5uQemIKt 1Pyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FblwjFzi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bb1-20020a05622a1b0100b003988271b752si3917787qtb.673.2022.10.20.05.33.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:33:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FblwjFzi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUjg-0002Ql-5w for patch@linaro.org; Thu, 20 Oct 2022 08:33:22 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUdo-000401-MV for patch@linaro.org; Thu, 20 Oct 2022 08:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU64-0002dr-P9 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5z-0000o7-Jn for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:22 -0400 Received: by mail-wr1-x434.google.com with SMTP id bv10so33914526wrb.4 for ; Thu, 20 Oct 2022 04:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mFOnT1sMtXBnCTZImDBtlQzxhw9rMaTtI2H9oXB4Uf0=; b=FblwjFzi8QQuoCkr39VUSN3IIwX2HVQMj9vxCNWWCBW/E7KfsKZqoS1e3YYl+BZ74b gVM6dNpXWw+MQZzQn8/B4M+qvSdfE9dwQ88C+k+Sm9t1KeYDqnE0tvih4xX014o9iUtV /pbEUvR2j+2Hsz7VYZXzEOB5+BnqjmiUBxDSxXjON8WALyY0rCj6gCXc1M01FRE5ASR+ YbT5ItMgDtnBXCIPxza1MtWR9oeRxWpNmOPxfnBp9c5e/8NhmN8kcXBLtyQj5FVzrkQM k9UBtft/73tMV8zjsnxKA33A9fJR44ekAlfNSbV2iShRuEsT1/EHeSb2j5XHocnrG24Q KiBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mFOnT1sMtXBnCTZImDBtlQzxhw9rMaTtI2H9oXB4Uf0=; b=WuA4OpPWZBWZqmg2OPeOLi88xe10Ko0DhLA31PV+rds0XZdNvHB4CE872CPkI4uiam yBWm8Cg8yThHaQV7TP1LxcJBUiFXXgBb0ZuEO85n+79KEfAcbomexz8aYDMsdrqn8+r5 4CplOh6FZ5czCMFaZqhaLzuZFrtqFi6x4+7nTD0Sng0YFdwRm6kBwNkXHigP7B3z8E+Z mfEiFi0AnbgqPSsDf9lT2BojZAPTkFWZxlMmG0ReVC82G24AMBQ7ztswF/QBvjle6lUE z98YtY5R2Sq3t/mLrrn9+H7ADKISv/3IaoNkR3m3pzkztxEYzjZOLUfz4Q9mYn65jk3K /xfw== X-Gm-Message-State: ACrzQf3p5+xYitDe547iWNawn5BspDnAzWFfaPTAq7sbP5Vlk5a1mcna 37cTgXYvICLr+D1WA1ST4E4o7w== X-Received: by 2002:a5d:4248:0:b0:234:3216:7659 with SMTP id s8-20020a5d4248000000b0023432167659mr4047406wrr.488.1666266736165; Thu, 20 Oct 2022 04:52:16 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b0022b315b4649sm16317229wrr.26.2022.10.20.04.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9954C1FFBE; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 06/26] tests/avocado: extend the timeout for x86_64 tcg tests Date: Thu, 20 Oct 2022 12:51:49 +0100 Message-Id: <20221020115209.1761864-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are timeing out on gitlab. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Acked-by: Richard Henderson --- tests/avocado/boot_linux.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index b7522ad3a1..571d33882a 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -19,6 +19,7 @@ class BootLinuxX8664(LinuxTest): """ :avocado: tags=arch:x86_64 """ + timeout = 480 def test_pc_i440fx_tcg(self): """ From patchwork Thu Oct 20 11:51:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616737 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp257192pvb; Thu, 20 Oct 2022 06:23:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Y40Alycb9XfOjcTNJNUIb+OxIP8J4fpNpgJ/6M4AGihd4fWaG/W2/T7BiIY8sGg5AjlkJ X-Received: by 2002:a05:620a:4725:b0:6ee:bf5c:915a with SMTP id bs37-20020a05620a472500b006eebf5c915amr9119118qkb.326.1666272230733; Thu, 20 Oct 2022 06:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666272230; cv=none; d=google.com; s=arc-20160816; b=NMYFmq8hDUOov5elMAvvk6vBeyCrBTDAodrG+f6zcGc0OXgtN37M41bAuCWMjjBWfL fi3bdrADdRMJpzeZ2F28NhD7c0+/OsO5hVy768EAOHYfMAMU0gl0YX7u80C0nlGf9DmI +I60dCDBKP7hsghXyj5QJExhFAkUGqliDmikucpt35+dAWAyrMtg9TFJj0KsiIgR1WIe MLqmvcN0UxxZfPvOmLsBH+0tYROjNjmHTQwwVx1F2ENNSEAjWEGceA3ZUKuuhrSYjbmf gjyGoINVq+LxGwFGQFVtYaOrUUEVRk8Tn5XmDhQwYJ+z7HhmAiTY8zfd1b248iw9wAWI 1JEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ga4vzH2veazcKCRinBLnrJ8/fVJBJ2PbX9ZSmpCZ7fE=; b=KfjT9amKx97z0G7Nh3VUbIIcRMSfu+QxLpzvt+CRHpRoCFPIeJ4nppTF9Vjf8kajAG YtbPYG8dErkyX0kwXqZPgM+sRljbt+XJi46dLlQ1PSilSdlpypLeIIP0PY3oOYHZSUB3 FpuRa7yfR5DVAqOjgXNxL6sOT+xS8b0NT4IZ4jsfc3Ikn5kUYtZ9160AHQL3ARJ2yQb1 Dgaa+yy2xg/AS39MbHHzN87Ajl0wvIdI3FSyZxgb6YDzoF820nhTyR6xHCU+d7BKTaXg EtbRxvm5cTO72VuXxbQhm2dT5FaiTB7J02bn+/sAlQryw+LdRWp0xFZfjnIdh+tJcbn9 Ku4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jqh0c80C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bm41-20020a05620a19a900b006ce8c77425asi10155924qkb.133.2022.10.20.06.23.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 06:23:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jqh0c80C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVWV-0007cw-Sh for patch@linaro.org; Thu, 20 Oct 2022 09:23:48 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUcS-0003MN-KI for patch@linaro.org; Thu, 20 Oct 2022 08:25:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU61-0002dY-Tk for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5y-0000nz-RV for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:20 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n16-20020a05600c4f9000b003c17bf8ddecso2365895wmq.0 for ; Thu, 20 Oct 2022 04:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ga4vzH2veazcKCRinBLnrJ8/fVJBJ2PbX9ZSmpCZ7fE=; b=jqh0c80CXpXn9kPEW1ccC+xk/3ycif7RA5QE6AIi7VZrmuEGo0HvM3fUN7Y675Vbl6 DN1sVurBevqmOgifMpJ67cYaWl1nEzQ8jRNUUhJ2jLoj/e3ar4ZEIWUfml+AxBbm7s48 i8FCKNxGYqrE9Ja0d6HvVw74ab6Fno8zNw7hdkYD0Pnw9IoqRUVyTn01sFje569wXRtc C317ZHiWvo8VgFD61tUEdKttolftpmN3Cc8nBnIqIEUC2ypW+6dabI9hKZjHHMxkuIf4 uaEEqoOXK4PHcPds1/F94O0nXmJ+nM4IUw1xENHZNCaZ+VmdAD1+rqRu50LKPC2QVTs5 XHpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ga4vzH2veazcKCRinBLnrJ8/fVJBJ2PbX9ZSmpCZ7fE=; b=1prKQt/CdrCHGI7Wxr+Z3IbDVs6dJY/wL1Nbl4f/F4ZfO+8hr59HFSjm0G3j2QhtNm sy1RJV+uj68upgKEBnk+BHOAACygxt4d3vFg9e5m0iEvvyZFbnkGoWQjb93xF++9eMcy AX/MI7bfUaPsx15ndNt2O9AdVSiYUruKQ3UMB9bxYOlnBR3DtScGh3jTw8buVpZp1dwb SV7s/rJFBOccHo3Y+PxSriTVfCpgS4GBE94Lsl3/UNCjZzJHVWyIpnpxTi2BeK/48Vhm LaWkMRBmI5rDn9F5w4FTAyzACg5QCEDpwE76tGkEVyRhwwPRDIu3OPkmFec0RnO/Hbm1 Pdxw== X-Gm-Message-State: ACrzQf2ejc7bcJTmiqPh80oUDyph7VQ8EJsitpUrnPTGUKf2kDb0nMa/ HUBf5tJHZbdDkkdcOOai9XQJ/VxRuzcQ/A== X-Received: by 2002:a05:600c:21d1:b0:3c6:ea1d:cf32 with SMTP id x17-20020a05600c21d100b003c6ea1dcf32mr20909128wmj.108.1666266735678; Thu, 20 Oct 2022 04:52:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003b4ff30e566sm5599365wms.3.2022.10.20.04.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AF5651FFBF; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Anton Johansson , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 07/26] tests/docker: Add flex/bison to `debian-hexagon-cross` Date: Thu, 20 Oct 2022 12:51:50 +0100 Message-Id: <20221020115209.1761864-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Anton Johansson debian-hexagon-cross contains two images, one to build the toolchain used for building the Hexagon tests themselves, and one image to build QEMU and run the tests. This commit adds flex/bison to the final image that builds QEMU so that it can also build idef-parser. Note: This container is not built by the CI and needs to be rebuilt and updated manually. Signed-off-by: Anton Johansson Message-Id: <20221014223642.147845-1-anjo@rev.ng> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/docker/dockerfiles/debian-hexagon-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 8d219bb81d..c4238e893f 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -43,7 +43,7 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis # Install QEMU build deps for use in CI RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy git ninja-build && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy bison flex git ninja-build && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy --arch-only qemu COPY --from=0 /usr/local /usr/local From patchwork Thu Oct 20 11:51:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616727 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp235234pvb; Thu, 20 Oct 2022 05:51:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5vB2nKDUMmbvwBr2bm0EBgCU1R/TG8PbOSjoCNubLg6ypRu5u6waBv7W999sgbp1kAugqM X-Received: by 2002:a05:620a:2230:b0:6ee:22f6:7218 with SMTP id n16-20020a05620a223000b006ee22f67218mr9084388qkh.250.1666270318125; Thu, 20 Oct 2022 05:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666270318; cv=none; d=google.com; s=arc-20160816; b=pdzn4fSarHJlxuYY4C3fgw0s/pBh3Ns0COOnPSlGtc39njgIOQk6vUz9v9ZrpyW8LF DHPnMttvzixBNtfrRnVAvAmVOLe7MJR34YkysNfWMDlc/QVkYuTtb8ZI7mjgIUk44cKe Abx6XyIoGIZtDQYHs9z1Fzl1NR6Ix4Pa0QsZUwxReXvmjqU8YjPlnonwsYOn6I3ifqFD 5EL2YjcVkvaJOY0rbAHoAgGhU1O28aS3eqPrTkd8u8QUjR8LgJr5GaJPczU6ZOay0H5R ZdVwyDr8YZjxXjZgf1aGZLPNIzRVMxVuql6jCOP1dg9L3sd15bHTvdhSFQOPOC2kQmeL oTkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yShOXbzELIGNaOPIz9eBhTKjXWoTlNpcm8mEq/fJPX4=; b=JiS7sIZ0Tkwr54zsW/PZm8Rp5w8EX0q8Wd9DsAYnigDV+lM+Wf5CoxlsnJ0iZIeVHF UlqtFfme41m0Pq2TogUJzgyckXhU0Ll8WByQU5ArlDkLKaVIdPo33TkmlaiyNI4qOTip 3XgYGAaC/iis9U2H1YYt0XIMWtjtxS1JiksYAz1UPBIMub+8Gli9oMHDxSLkGvHaGHxi X7uh3sHsupPsdekSGeoF18k9/iWKiqsHMeUzV4g2al5xRIaN1TEKZw1feUS4ayufgCQc r008NJeIFyXdceXdWu/R23odE326wB2Z1Xr/64QN17ASvTl61E020pC5K0VmXEX7eUsS ZyMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UTWSgz94; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hf7-20020a0562140e8700b004afa0938207si10133772qvb.132.2022.10.20.05.51.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:51:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UTWSgz94; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olV1U-0000RO-3B for patch@linaro.org; Thu, 20 Oct 2022 08:51:47 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUxl-0001Sj-G8 for patch@linaro.org; Thu, 20 Oct 2022 08:47:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU64-0002dq-PA for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU5z-0000oQ-Jr for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:23 -0400 Received: by mail-wr1-x429.google.com with SMTP id bv10so33914581wrb.4 for ; Thu, 20 Oct 2022 04:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yShOXbzELIGNaOPIz9eBhTKjXWoTlNpcm8mEq/fJPX4=; b=UTWSgz944WdZdCwlIR1s1kjj2VLZgGDDjOCxSUFtZz97cEt7YVYw9L35LfTEW9fil+ AsMadMYNH7MoFWKefYiQ4JQ57j5Nc/JYDvZ8CMDMpg6OmlsDn5H6n8lR6Q8hZGgTojtO sTKLSyyogIbUcMp/q/oQGPJ4jMAp2N1+P+aFEOiKE2MScE7V2J2+SOHif6nR5jCIv3vl f6krnF3yXpEvp1W/u0HLW9Bl7PyYnZnehlgDQmOUoTk9mW/qPt/tj9cN0lRAzsiZR++k OBa0WpF5N7DDgSdRpxLwqquVuBOSdB55DXB06HDMZtzC3mJ1CGkrGD6u0qB8G9wkpT12 kI1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yShOXbzELIGNaOPIz9eBhTKjXWoTlNpcm8mEq/fJPX4=; b=jXxy6hZYwkFis3l/CEv7WQWkwQo7TCjfC4hCxfNzhFnEf2E7rXEN63GB5yYMVL31uN ZhV+1rfWoJiQMXBXh7nYo3Zd5SR7ERdYRWyXPOo7lx80hY8Lujl77U/CAMF8wSGVc1PU rarj32dEHCWG9ZBLDxCGhoMMfa4u97BZHW3Tzla5ctriWPjbf3diSJ8JssQV4G3onkD+ uO2caSzNfIC+OSdDa/HtlFsJTTM5KxZhAI8qD8UPmPxMDQc/3JQvY4Mn05Yr7yAHQowZ 8c8vcSyZ0zISu/6i86gblq1M5kntoJLzmdSpewBg9FyIfZ61Y3LQWcoeh8tekEU883V2 VMOg== X-Gm-Message-State: ACrzQf1FWsgs9xfL/W87ajSTiReV7/izRA0JdR3zi3JAVs2iRhPZH07P rxtENd3ljsifL5mp7PyCUcd6Cg== X-Received: by 2002:a5d:4a4d:0:b0:22d:c8cb:8687 with SMTP id v13-20020a5d4a4d000000b0022dc8cb8687mr8211142wrs.554.1666266737119; Thu, 20 Oct 2022 04:52:17 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v2-20020a5d4b02000000b0022ed6ff3a96sm15958829wrq.39.2022.10.20.04.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C50301FFC0; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 08/26] tests/tcg: use regular semihosting for nios2-softmmu Date: Thu, 20 Oct 2022 12:51:51 +0100 Message-Id: <20221020115209.1761864-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The nios2 code now plugs into the common semihosting code so we can use the same redirect invocation as the other boards. There is however a bug raised for the fact the tests don't seem to be completing properly and silently passing anyway: https://gitlab.com/qemu-project/qemu/-/issues/1258 Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/nios2/Makefile.softmmu-target | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tcg/nios2/Makefile.softmmu-target b/tests/tcg/nios2/Makefile.softmmu-target index c3d0594a39..bc7fd55060 100644 --- a/tests/tcg/nios2/Makefile.softmmu-target +++ b/tests/tcg/nios2/Makefile.softmmu-target @@ -25,8 +25,7 @@ LDFLAGS += -Wl,-T$(LINK_SCRIPT) -static -nostdlib $(CRT_OBJS) -lgcc %: %.o $(LINK_SCRIPT) $(CRT_OBJS) $(call quiet-command, $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS), LD, $@) -# FIXME: nios2 semihosting writes to stdout, not a chardev -QEMU_OPTS = -M 10m50-ghrd,vic=on -semihosting >$@.out -kernel +QEMU_OPTS = -M 10m50-ghrd,vic=on -semihosting-config enable=on,target=native,chardev=output -kernel memory: CFLAGS+=-DCHECK_UNALIGNED=0 TESTS += $(MULTIARCH_TESTS) From patchwork Thu Oct 20 11:51:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616783 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp322271pvb; Thu, 20 Oct 2022 08:02:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4wq8M1+me6MYw2CvQtp0Kj2B5XA6CP0Tps0zVlOFQn4rLzYsFxcoJC6mhOB6bBLP07HRjo X-Received: by 2002:a05:6512:31c4:b0:4a2:696e:4302 with SMTP id j4-20020a05651231c400b004a2696e4302mr5386459lfe.478.1666278134358; Thu, 20 Oct 2022 08:02:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666278134; cv=none; d=google.com; s=arc-20160816; b=bcOBxPVW5yTZflNlZ+6RQCRUqZZ00HdeaWGKPAcf4pr+o1EFVn5u79n4tOcXkuF+aB LV8/R1yLauhXQSAip/V6QzJLteCooLnBSnBWuPfyBEGnUw4Qd7n2CSNatWG4gDc+U6Kg rAbFyKqvrRnLyYU/pbIYiRcQrthzIykSmd1xR6a9HB86QuR0adyqSI+WtDDlO/Xk5Q8Q EvBULe4XF1FKQ7K2Ff06BtgG1RTkvDjta0dV4cX7/uSWBn6h+levN+TUfH7mZ7B8Iqwp oUFN7uQL6xSYG7AUJs5N1xrhc6WaWXVMAuyeKBmvOKVH7z5QGSumkI9JLRKFiXhBHV5v vNaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HYqxxXiV14D6A58Gw4d25+T/ktiHuabUrj5sliO8A0I=; b=bB3BbuhZWtb/0+uscbO4hT85OLA5xsUMMyGgIZ/EWRo6sapFeONxPkA6LRcqa767MO 1KXDSfAQy+BV7vjbYtXCokY/K1rY4XDI8aGkQznCQWG/2n6EAvvddsIAvMJE2LrNmTzZ s6dxPvdNiuO+XvkbxEBk8KxwqzYbvvg661Bcgp5jHbXPpRTeiagVR0amDnEpTPNsVYXa xO/UiJDTHdVYUZTR4cHVOCI0ZVhODDlwhKqB08JWN5QwWa82zLmDj+40WXemKeUueryc RV3hg5XhUfjJ6SLqVsFMZeENd6U5X+JkRGwQjjn35GPoemeftXvaaCGksmaqmjsZ22Jh r1kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sBJWsHdJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n11-20020a2eb78b000000b0026e682a0781si8540420ljo.595.2022.10.20.08.02.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 08:02:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sBJWsHdJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX3e-0005ah-Sp for patch@linaro.org; Thu, 20 Oct 2022 11:02:07 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWtn-0007X0-Eo for patch@linaro.org; Thu, 20 Oct 2022 10:51:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU67-0002e4-7m for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU61-0000nW-2P for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:27 -0400 Received: by mail-wm1-x32f.google.com with SMTP id v130-20020a1cac88000000b003bcde03bd44so2108849wme.5 for ; Thu, 20 Oct 2022 04:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HYqxxXiV14D6A58Gw4d25+T/ktiHuabUrj5sliO8A0I=; b=sBJWsHdJAefeunO9qBfNgOyHyZCQdjFIbPX2fTZLhfiuL5AywXG3+TX2QnOOKvRtwl nJenMmgIe7gsSvcQta4/KN0SClxkggYuol8jxRtKecgazIemjE5lWZhK3cCEVlpcknMn NF/cfTsobj4ElmwgkmuA+fsVK4BEBNVS8VfBWcOcaXXrn+LLzvtqb+XG9T33rGBQ3+mb OTks9LFRi3tL88AmUeHtahBv+3+RBTPmSOospdoBLIXWqIVdd3+E6PSL1xaJNppoY46B FX/rBv8bTGUhcTnr1jmW1HoBGklv0u1tN2TS2GkmKSEo5J5yrOIPn3fKj85YIGU9Y4hY G8lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HYqxxXiV14D6A58Gw4d25+T/ktiHuabUrj5sliO8A0I=; b=EF3doexEsO87tzXy+tKc1U1JLvE2S+RSalaTeWTQIretIsGaW6kFkhaLLHq4mzgSI0 b4BlR+VDK76+gi6MG/JCOyvB9sncATDgacG/j6ZiS54c69/g/9A5nHDxFDrF0sll/NjP y8hvEqURfQibQ+jVZwmKhiOYRTCXMyIDQube5OOfhSR3tqV0eRUhGE+f3EaK4Sc1V/PX xuZSadwBxhFJ6o9cGUvpiV+PiGHNr0D4EUbTxshwknwnzdZ8BAijgpTgVWRwXdAyjWpz QqUEtjFUgN9+gfviprML/9P4exZpTbtA53Ue/ldCbZA4uIRNq0tf3tfaAEWp/kWmohu2 3+TA== X-Gm-Message-State: ACrzQf0M/h66njtrVxeuKP0ITAqCcLU7tKnd79nhQSYp0MuM+6YY/Xvy 7r1wG17aCJlEiFlAEnIvxcCRm2PoERiZhQ== X-Received: by 2002:a05:600c:1e87:b0:3c6:f1ff:40e4 with SMTP id be7-20020a05600c1e8700b003c6f1ff40e4mr17547693wmb.61.1666266738047; Thu, 20 Oct 2022 04:52:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o18-20020adfcf12000000b0022a297950cesm16250422wrj.23.2022.10.20.04.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD5C11FFB7; Thu, 20 Oct 2022 12:52:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Subject: [PATCH v3 09/26] semihosting/arm-compat-semi: Avoid using hardcoded /tmp Date: Thu, 20 Oct 2022 12:51:52 +0100 Message-Id: <20221020115209.1761864-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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, T_SPF_TEMPERROR=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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Use g_get_tmp_dir() to get the directory to use for temporary files. Signed-off-by: Bin Meng Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-2-bmeng.cn@gmail.com> Reviewed-by: Richard Henderson --- semihosting/arm-compat-semi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index bfea9e9337..62d8bae97f 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -503,7 +503,8 @@ void do_common_semihosting(CPUState *cs) GET_ARG(0); GET_ARG(1); GET_ARG(2); - len = asprintf(&s, "/tmp/qemu-%x%02x", getpid(), (int)arg1 & 0xff); + len = asprintf(&s, "%s/qemu-%x%02x", g_get_tmp_dir(), + getpid(), (int)arg1 & 0xff); if (len < 0) { common_semi_set_ret(cs, -1); break; From patchwork Thu Oct 20 11:51:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616730 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp238021pvb; Thu, 20 Oct 2022 05:56:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5cQKO3uu2k8yNWCKzX/HvbfCMgUvhQEZFCtFRgfd8Ax63dOaKbnetrkmVJJopbUhqapMwG X-Received: by 2002:a37:bc3:0:b0:6ee:7931:9e5a with SMTP id 186-20020a370bc3000000b006ee79319e5amr9032765qkl.105.1666270610362; Thu, 20 Oct 2022 05:56:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666270610; cv=none; d=google.com; s=arc-20160816; b=IenwuFKAAeBkopFH/4I/o/N8H0H6R+zid+7BACaDaFBHbdpbIs7gY0uwAbdiSBf99Z sMZfRmKjf4A05MsEMvFUQT6vyb1Uu1kZ29yJ46LznhuoAjapTMoIko8Zjq3U3CpMwn/1 GFsvf7RRLgcs6PlivGfq4KdK7ViZfmisJUvHmMmkfUHX1iH8lBVLQVBqaOLdx+5v0TZF jQg09ps/VyF9R7hIYS3VtATUyNNbP8LsuhSWpvWCkF6IoCUqR4fbOfwhJH1tXQFm2wG7 ZcihG1z5eeuw4sEyCVCiUYeZ56N/zg9DkMN3edLFMwaoHqus+lrByAMCoMtcMgNWjP0n 0Vsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0F9rxKn3WyeYR6Nw4DlRXjaGHdV7xjAKqhTqdoDJFbA=; b=fs5VYRCMbj0GFb72t8JsB0JaaphDnHjbjAuqp4V7nOA1Eu8n4DDRoh15L/lGxGeUrW CXE7a6eQq15tIeNxOli9vWJgXw4e7KdTHX4cIw4ns5zXzbCETeJlU4jLiKXI3o+TwS+X Jwf8UImIeX6z9MfSc8LO1zXKODhM4d6itmCP0XZjTFq96bzQdWmpKizxiYwA6E2ERqAy O2FPJxTgQsGf9tGflI3BSy4ugIiJA015uXKUYD/R+7dP13jxico0I4dJqGV/XKDS0+fL NkcZ83cBJsxrK4j6ZtovU8X6bUAXrm0aI3iqf8pPWAUA7tbx2PhVzEToAcX59HLLUxOo AkTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=do9bs56w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y68-20020a379647000000b006eeb2674274si9996246qkd.67.2022.10.20.05.56.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:56:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=do9bs56w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olV6P-0002WC-Fy for patch@linaro.org; Thu, 20 Oct 2022 08:56:49 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUdg-0003cg-NS for patch@linaro.org; Thu, 20 Oct 2022 08:27:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU67-0002e5-Be for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:37529) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU61-0000oc-Mh for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:27 -0400 Received: by mail-wr1-x430.google.com with SMTP id bv10so33914771wrb.4 for ; Thu, 20 Oct 2022 04:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0F9rxKn3WyeYR6Nw4DlRXjaGHdV7xjAKqhTqdoDJFbA=; b=do9bs56wi393U3SqN4g9206PdFt8zZTsrGAWM+mEAz7oRl5SnSXgIhgja5AE2RhB9+ fUTLIWTjpSwEtCXxCdvBPV3zte2Yc+hVklnidd7tvSwVDr/Vs9nvY2aerwCzJtkkyi2z nU2wHkVQtUOyV9pd+AbaKoVs26Eh2wVPuZB7V0+zX8DWYOEMlQwv7F+S+DJOXI0ihcjr xttpoL1VSoBXsuw7EJFT4sMJ3QlY2EODSjG7xeDveUa/ola//GGO3PpweKD66itw5Zd5 XOBuVHxxbvT7gAWZDqO/uUdrc0F2CNILaCcu3wCP9RAM6Ra244JVekHGpZGUbIKZZrtM JZMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0F9rxKn3WyeYR6Nw4DlRXjaGHdV7xjAKqhTqdoDJFbA=; b=42P8J6gbZiROw5VmqrMqHd2NmDzxaWHqykyyLdoSiAY3CRsUrq8GG+kVef0P5kROBj nP7nhf379CDILm35WGYQCda0ZEb52fh/PTeuv4oLksplivAnsnKIRJ9lG3P1GpgGp8+0 UPU4yA3Aba1NgGhK7bd5yXMLl+OFHY/Z5ecEkcGPu0JowGP10psJzFS+uxkeBpjXDiYq 3ZLvfDVPkHtp99lOo8sZ4kNb/m/z3URmMiCFADwvFoLCEw5kNj7VIUljwILnUZRPeKor kThlXu/ZHQ3zUed+BxyXBp8dNC9ZrqncYoL/iRptK3QHYzbm2Rxd45qEtKoXIFseiXJQ 7Drg== X-Gm-Message-State: ACrzQf0WGX3ooA/N/c5EgyBnZTxe+i97emMBhMi6w3rFQJ9KtVO1fnWw ygqmHuaGE6PT5ffZBes0MhQMXA== X-Received: by 2002:adf:e187:0:b0:234:6c1b:cf7e with SMTP id az7-20020adfe187000000b002346c1bcf7emr3932958wrb.395.1666266739831; Thu, 20 Oct 2022 04:52:19 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k16-20020a5d5190000000b00236488f62d6sm834812wrv.79.2022.10.20.04.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0227C1FFC1; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , Richard Henderson Subject: [PATCH v3 10/26] tcg: Avoid using hardcoded /tmp Date: Thu, 20 Oct 2022 12:51:53 +0100 Message-Id: <20221020115209.1761864-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Use g_get_tmp_dir() to get the directory to use for temporary files. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-3-bmeng.cn@gmail.com> Reviewed-by: Philippe Mathieu-Daudé --- tcg/tcg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 612a12f58f..84921b64f7 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -4729,7 +4729,8 @@ static void tcg_register_jit_int(const void *buf_ptr, size_t buf_size, /* Enable this block to be able to debug the ELF image file creation. One can use readelf, objdump, or other inspection utilities. */ { - FILE *f = fopen("/tmp/qemu.jit", "w+b"); + g_autofree char *jit = g_strdup_printf("%s/qemu.jit", g_get_tmp_dir()); + FILE *f = fopen(jit, "w+b"); if (f) { if (fwrite(img, img_size, 1, f) != img_size) { /* Avoid stupid unused return value warning for fwrite. */ From patchwork Thu Oct 20 11:51:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616759 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp282984pvb; Thu, 20 Oct 2022 07:05:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ukOlda+eAkq0JaRxJL09fCUCF3YP2hdKWaGUkENQzZ/RYueApx2BGCj1yTnIHDp7ZLpfV X-Received: by 2002:ac8:5907:0:b0:39a:e5c3:af86 with SMTP id 7-20020ac85907000000b0039ae5c3af86mr11506456qty.74.1666274700649; Thu, 20 Oct 2022 07:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666274700; cv=none; d=google.com; s=arc-20160816; b=I2B6qh10UXQGDUwj4U9gt3+o3sIhjt+dai2DUSJhsmvRfuD7NbPlqlMP3N7MHkCa+E +hLX3oaUZHiDO1CdN83BV3CyvTGsagT82pkcpENknIF0refK63GZPGCBE9I+AFrrL+id NXZdkap4nXahZQBxM7MePzC2ep4I1NHwV721lDi2q6CLu0IWy+1xlZ5LPcca291oWQfL whmJi6e58pQ5rZSUDndeazoGOKsRuizZT3duexIm6RR1kaPHFDMPnR0DWALZjDoPbEtq EfJpIFXnBzlOIjOw1H+uyUhPSoKNlNQOiK+pQ4KxDuvX1ibTL0lE1Qhk6x45F3Mz6xrj pWnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cRCAx/0T6uLHPeJ0IbWs8YzhrB6ddKjxKSX6xBBHKNY=; b=CzyTjHmgvzFb/G/PBVYLWJmFzG6azt9mJ8FEev4QKIVA/OVoqZx/4NI28Ja0lqSJFH 2EiMfnGfkBA9e1qTdpnXDBSLPxF2YNEetc64OKDfvD0ratwGfdSxvTaoSil5XQlgDMf+ aKf2sujAZvAgrT6fOAPAUtXEflJ6/B/DRAF2ci7nkGPw4TAZHF28Lyg7ADIRNH43fF3F kHCnb1CHjCtjOogHvElehrRC+XXcFc9NDO/eda4TzZkk4Ce1NbPW/TYJ3XmKbui3Akh7 ES5hDbbf+2m/I9nZ1flooQdUv0WT/JuB25ujgK1Cx3Wnk6pLtmYq9NU06+e7WSfnNJvv kf8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="nmN/ljEo"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 13-20020a05621420ad00b004b181af6156si10395540qvd.208.2022.10.20.07.05.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:05:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="nmN/ljEo"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWAM-0004sM-IK for patch@linaro.org; Thu, 20 Oct 2022 10:04:58 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVu2-0005aM-Su for patch@linaro.org; Thu, 20 Oct 2022 09:48:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU6F-0002fM-Lj for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:44 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:43815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU61-0000oh-ON for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:34 -0400 Received: by mail-wm1-x336.google.com with SMTP id bh7-20020a05600c3d0700b003c6fb3b2052so1982803wmb.2 for ; Thu, 20 Oct 2022 04:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cRCAx/0T6uLHPeJ0IbWs8YzhrB6ddKjxKSX6xBBHKNY=; b=nmN/ljEoDll7JN6kCEi8ytDbCR+Aa84ZrkkzdYKQDwwJKYUETtcyFa72sH7ntfiZcN EZ64o95UbgOcwd/TvT2ubEk6Ju0NoDMswxJ7JPPEe5M7mPnnPszYaw87n4Xwo3N6YBAC DLhU0Kr8JuK5LgbhpwUhFSMBtQr3/rK0Yn7pTzMJqPQlSn1LSwXYswiymhj7V/z7uxHj q1YkCWDjsCfVM2zgNukVra9l3HZYDVj88SdPOKyV9EB0DkBoO6OEH7LhL+onEI6wbJeW OXLavI1VdxRqydPgUIdrw5YXQnj+4UphSlSKB73absmgp7BpZnXZtpkbNXMCORXm4E5a 9KsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cRCAx/0T6uLHPeJ0IbWs8YzhrB6ddKjxKSX6xBBHKNY=; b=uMQgiioasjKczyI8ld68JhwabWE1W+vBATp9k99EoUxzS2ApGJLj6Y5HF3Hcf4ZR1D uDyiupKbcbFH4tYQyhjb06PJbe5UnyVHRtidhs76qAEoCB6FXOav9IR2jQuXNsTnG77d pP1SODEHABIWF9yV/9Geyj8GVwMwHPrFVCLHOWpS8mRLrIeas6m8Eb1s1V/cbkkM6yX7 OQ41Z65li3DHEcQhQTQrYe9D/O9tl/AHagZleMCR0rk58IEmBFGCJkUIpnEcWatclGGg iUHRONiMcP/Y2laHsij8fl1Ac9pi9YEqbTX8HMASkv1tHLWjiSMdaboNdbAAa6Bfy0aH srXA== X-Gm-Message-State: ACrzQf31y8s05/xGzVwQ9+SS1d46y24jJSHqsNMwmccA/sjAIna4x/5F MoaFSp6PjHzy7m4Orso7s0EIag== X-Received: by 2002:a05:600c:a4c:b0:3b4:fc1b:81 with SMTP id c12-20020a05600c0a4c00b003b4fc1b0081mr8846370wmq.125.1666266740214; Thu, 20 Oct 2022 04:52:20 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f2-20020adff582000000b0022cd0c8c696sm2374980wro.103.2022.10.20.04.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 189231FFC2; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Subject: [PATCH v3 11/26] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files Date: Thu, 20 Oct 2022 12:51:54 +0100 Message-Id: <20221020115209.1761864-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Replace the existing logic to get the directory for temporary files with g_get_tmp_dir(), which works for win32 too. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-4-bmeng.cn@gmail.com> --- util/qemu-sockets.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 83f4bd6fd2..0c41ca9e42 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -919,9 +919,8 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, if (saddr->path[0] || abstract) { path = saddr->path; } else { - const char *tmpdir = getenv("TMPDIR"); - tmpdir = tmpdir ? tmpdir : "/tmp"; - path = pathbuf = g_strdup_printf("%s/qemu-socket-XXXXXX", tmpdir); + path = pathbuf = g_strdup_printf("%s/qemu-socket-XXXXXX", + g_get_tmp_dir()); } pathlen = strlen(path); From patchwork Thu Oct 20 11:51:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616774 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp306833pvb; Thu, 20 Oct 2022 07:38:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54/a1cfW7jLJTWCd8I9S2cpJcASTzu/4rrDxrPfrXACrKF5g2rlHZW5vro9J72ibWtCYKh X-Received: by 2002:a05:620a:4611:b0:6ee:9e55:9d30 with SMTP id br17-20020a05620a461100b006ee9e559d30mr9309149qkb.210.1666276714745; Thu, 20 Oct 2022 07:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666276714; cv=none; d=google.com; s=arc-20160816; b=hNncBAmFNKk2dYY+qYorVxaTgPk9UA3Y/ndkOL7fmFegbu2IM0Qbp4shEQp2kU0wob bhzySdei4lrrB9pq6IxqnIPsbduarwkQOlR5r7M0X1Tq8rKjZ47D4jHwp6/xJdvMNbsV l9w5fIZOq1ZroAFFS9mnACS0PmTkMWZ7poHPy6nFbymJRsyuwumc3yL9am+MsV0liBIu cv2zh7Dy7kuiFiYWPm5neiyhS9Gu6dXipXR5OZnam7qzYCjJvUOc2ZpjYSn22E/vKfH6 gowUom8SLD15H5etlkVR0wETVnZ+znaEGHuQVb5qpg3Wi0Rt8VfacxrH9yXLYS0C2OCH Gz8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qw2G71vm/K5m60uyrOfgi4g/ctJMvoKCJ2gSL8OWBzc=; b=mTqSzewUU+PE/MpKTKmMiFdGIpXKlDcigb9vOLC1gAa69h71RI4ulW0oyP3wPoYbfK hqNgBKmaIvt56Ll3XG77jh8BY/uxu6w4bof+MmTIcmM7GBPuhERTgGdGCAwJiBCtJ519 gtz6QQAj+lnQ1D8r/MV245nrmC40ShyJ7KajejQ7x8ayMWJ8mD1vOpjwvjD7V0YYl1fN oJwYkAgoQid15PFBSRO63M+Mr4zms9K34uU0yrWoz/GjUKGwNL5tAs2U87DacKEJRXyO lAr3ZGH/MDXQRs+PCdF3EcILq0kaAsoQwIOldJASXjNM5EQ3p+T8mDhq8Ny4GshCBYYN tb6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ena/7V+H"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u14-20020a05620a430e00b006ebb965fea9si11041668qko.717.2022.10.20.07.38.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:38:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ena/7V+H"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWgn-0000FV-1i for patch@linaro.org; Thu, 20 Oct 2022 10:38:31 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWcO-00057S-N9 for patch@linaro.org; Thu, 20 Oct 2022 10:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU6G-0002fe-1Q for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:44 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU61-0000nG-U7 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:35 -0400 Received: by mail-wr1-x432.google.com with SMTP id j7so33998763wrr.3 for ; Thu, 20 Oct 2022 04:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qw2G71vm/K5m60uyrOfgi4g/ctJMvoKCJ2gSL8OWBzc=; b=Ena/7V+HLLVWXUkroQjV/zSjo+jQHiPNSVUH58v5utZLzSse1e3i6lWMH4kF1A0yER 5XxlWxQouPoALp4V/CDtIqyYQTvPI3rghOjPifarY73wE8vCFsdtLllXRi2iK17B8+hm Cs7Fta2L1D/FV6/lDvtymAJ/N9eRLgojWHjprjVvP4S9OQ5H4PA+NqtrWOy0t/lA9XB+ NBCXTfAty6hL5Y5QKYHYDsjsH1kWMCpcP0x/D7korXvGdd4bDPM4rCBoc7ArRsL3ICAj Sb/W11kYHwFRrF4P/xEIRfvi/419imhRp15Itnh5YPMVhFM9/Zy/Qz/1IEf3bn8hKIcZ H2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qw2G71vm/K5m60uyrOfgi4g/ctJMvoKCJ2gSL8OWBzc=; b=mxL3r+pHFFTO4i9sZ5DiOv9QTqBWeTbiquNpY+IsPDm1sOv+qDgrWNYm9JFlCEl5T7 o0BtGavqsftEQjR3wa4gjvoGVe98cdr0P9+IgQOLwPjZoG1r/6EqZuK1V4zp2wstT9RX JvqSv7sr1NpKCv2uwVqy0fLt7V3bX53eTSo8NKyOs0ubVkPL15gomQzlUBfd3WCBUDue jpudkLu7TOYPhWo7RZ/G2cDRUsbKDtT+FeVPyzJiqM8ApwzU5GY7fPQi38YX+zg2IMa+ HWujNRB2yEh4I+IJKdSchNvbavoex8sdRAXntSHpLOpOkk1AU+OBE2NUuuW0qizMprK7 oLGA== X-Gm-Message-State: ACrzQf3Cm8/y5wyW3DZFUWLv0Mul4is7YI1hkzwWhtqdmTzh35qCht0S 7q0UbXlFqh2KG0tmKvz3iTNJug== X-Received: by 2002:a5d:6745:0:b0:22f:ed4:65d7 with SMTP id l5-20020a5d6745000000b0022f0ed465d7mr8619934wrw.259.1666266741101; Thu, 20 Oct 2022 04:52:21 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g10-20020a5d554a000000b002364c77bcacsm179102wrw.38.2022.10.20.04.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2E9C61FFC3; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:vvfat) Subject: [PATCH v3 12/26] block/vvfat: Unify the mkdir() call Date: Thu, 20 Oct 2022 12:51:55 +0100 Message-Id: <20221020115209.1761864-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng There is a difference in the mkdir() call for win32 and non-win32 platforms, and currently is handled in the codes with #ifdefs. glib provides a portable g_mkdir() API and we can use it to unify the codes without #ifdefs. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-6-bmeng.cn@gmail.com> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Kevin Wolf --- block/vvfat.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index d6dd919683..723beef025 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include +#include #include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" @@ -2726,13 +2727,9 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s) mapping_t* mapping; int j, parent_path_len; -#ifdef __MINGW32__ - if (mkdir(commit->path)) + if (g_mkdir(commit->path, 0755)) { return -5; -#else - if (mkdir(commit->path, 0755)) - return -5; -#endif + } mapping = insert_mapping(s, commit->param.mkdir.cluster, commit->param.mkdir.cluster + 1); From patchwork Thu Oct 20 11:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616776 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp309366pvb; Thu, 20 Oct 2022 07:42:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6mHXuPUvKfFD3OdiDiWiPbTb1Urq2NpHUUAzKGw+p6xKEzzb9evIY0EsPh1Q8v5hss7C0y X-Received: by 2002:a05:620a:e93:b0:6ea:50e9:82a8 with SMTP id w19-20020a05620a0e9300b006ea50e982a8mr9516334qkm.642.1666276944554; Thu, 20 Oct 2022 07:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666276944; cv=none; d=google.com; s=arc-20160816; b=VGaoHShTq8CjcwcIVip44s01TbazcqcpQx2/28pwzNd3QX5yy8v4oryv5nM5a9dOT0 xq0WblA9YWiIVKhiBUuPYyBO8rFR0tN84mtwUp52Y9mEKgM23Qldjw3+LsmT+1F30iVS lfkLCCJlOXPhlbPLKjgdH4elPAQ+07gCDrST0rk5eE3W12AwqYI12ZQp387WNQnB54RU AqRtfHXJ5mfmeraRwCsQei1dkxJdxoXMprLwa68hB7zr17ONkoP4pGf2y07X+GCK44Tk p5rrmBC5NQEcu/BHy858ihW8TXRmyKIdYKyhcB4bq5/49rLq5NaZyxQxmc0B6dFFHhaU iIdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fQc1SBrI4p6uNk+295hOmy/KNXRMgePPxtVxT3Ps1H0=; b=kHUhCCqnzAsfyxSSEg6loub/z+M0qK73OlOn1zY+wk3M7IhldRlPfXqEo87WpulU9A deF8xI1kF4icHtSUDCHjA/DQ0n9mRhuvAmGIH4Gff9vYXcAcLXFHywwx/oiq199jR3EJ gwcIkpwJioJ5OV6ZWcB2RP/ddzI3nhTXU1LTjZAqcpJW+ZSzWtOtpU72DjRyb+XTNApQ EQFCPZaLasFQaX8s5YUUNq9U8juytvW/ncN6GlFVKhggspBblKt1Ew+lmHc0TEXYnCwn TsiASIb6ut+0BNRZ4Q+EqYAXax80Sm8JzQ1zo0tI9Fx1SckKQ013dGdDRR5n3NuZZcLt QxvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hnccSpQe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13-20020a05620a424d00b006bb81d694dfsi11112024qko.656.2022.10.20.07.42.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:42:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hnccSpQe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWkX-0004po-TM for patch@linaro.org; Thu, 20 Oct 2022 10:42:23 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWgU-00018A-Fl for patch@linaro.org; Thu, 20 Oct 2022 10:38:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU6A-0002ey-VF for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:44 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:34670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU64-0000pD-Ix for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: by mail-wm1-x331.google.com with SMTP id l14-20020a05600c1d0e00b003c6ecc94285so2244275wms.1 for ; Thu, 20 Oct 2022 04:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fQc1SBrI4p6uNk+295hOmy/KNXRMgePPxtVxT3Ps1H0=; b=hnccSpQeQ6wZkdD1D9Vc7uFt+DFjp1EUps8qmFy+3OceDeRgOMiKaW4ZVxu7254QKx DXDCkzQizkLz5K2yHx9sZnolp9FIHJPKF8vxxA8OsLKkkLEGOQYyv3CUSSy5Fwsvwbmv y3xZ4rvM1snLZerSzoGXygrDkrFmXdNw5YYhPQmYH6k18DW023foqIWx8p1hXlajUf2p 7DUOmjicoReopb2R3dXK+L/hAsq2RUz8RqMgQTLEp+2YzHUWUdSGZYRgS5EmGRnODgyA 98tyKOJkDQ8RLznH9I29CVSKuH0fC+4ufCDKxirnSKQPSobp6eiH1TvZfJOU8v3jrJbv Ni1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fQc1SBrI4p6uNk+295hOmy/KNXRMgePPxtVxT3Ps1H0=; b=dPAsLjYMR05EaKwMFhfHumcPrn5X5tKk8kcdc9JdGTcLCjwWR7+dMNuVK7vjVBBac9 S9fVigWWwvBP2bcIw4DAQsz3ucewlcRM4hoppW8r9u8E9wWVvW9qdxsyjE7U7XeRv7Z7 lvksIs97LlCh0PbjdiAOXeX+rJfHrwWXPbhzAYeJVdmZ91FcowTubywF5fgvKQRlrIoY KBnZ1YqJSUPkk7vPmEN6xd839re6EG7TOcQSnV/NXuSOTiKQz09oYgnjcB/zVEBlWDq3 W/5XAmqKwoC+TSHo0+NdYoE7yZPQuqkI2aB+B7C4whSmQuRmAg+sw7B7sIJ7CoP6aiIS UxLg== X-Gm-Message-State: ACrzQf29D1EzzNupw9+xEfk++0sS7EBkXMUorFHfEzjuVlYKpIjnSCd6 v8h+L6g0eE1pCwcLtTt49tTBwQ== X-Received: by 2002:a05:600c:4448:b0:3c6:fb65:2497 with SMTP id v8-20020a05600c444800b003c6fb652497mr11422428wmn.124.1666266741915; Thu, 20 Oct 2022 04:52:21 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v14-20020a05600c444e00b003c6f27d275dsm2919745wmn.33.2022.10.20.04.52.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 461461FFC4; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , Christian Schoenebeck , =?utf-8?q?Alex_Benn=C3=A9e?= , Greg Kurz Subject: [PATCH v3 13/26] fsdev/virtfs-proxy-helper: Use g_mkdir() Date: Thu, 20 Oct 2022 12:51:56 +0100 Message-Id: <20221020115209.1761864-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Use g_mkdir() to create a directory on all platforms. Signed-off-by: Bin Meng Reviewed-by: Christian Schoenebeck Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-7-bmeng.cn@gmail.com> --- fsdev/virtfs-proxy-helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 2dde27922f..5cafcd7703 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include #include #include #include @@ -639,7 +640,7 @@ static int do_create_others(int type, struct iovec *iovec) if (retval < 0) { goto err_out; } - retval = mkdir(path.data, mode); + retval = g_mkdir(path.data, mode); break; case T_SYMLINK: retval = proxy_unmarshal(iovec, offset, "ss", &oldpath, &path); From patchwork Thu Oct 20 11:51:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616718 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp225232pvb; Thu, 20 Oct 2022 05:33:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4l9I55fujJyRyHfetCTbS6+waqyIRgzQMDhCoRJuDuWt/G4k2PrVMSv0gozg1p2yPmvMH3 X-Received: by 2002:ae9:dd04:0:b0:6e0:ae86:b4 with SMTP id r4-20020ae9dd04000000b006e0ae8600b4mr9001303qkf.146.1666269184936; Thu, 20 Oct 2022 05:33:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666269184; cv=none; d=google.com; s=arc-20160816; b=A7Jj/VYKuRieB4Shn453KqCKNBNYDQ96bz+7fSO2E+GObWkGDaOfmtlVsmTx3BTs/3 4X7Vcd95PlBC4HqvKPeWtJVCp1Tql5TAasUQXjkE+h6U9id6bnodVdnHSFJuv5XGp9ZG RmsuZK0zYoA8+rT0qirPv4hULN3ApgkxJBnOWFaYN46aLVDcHsrjVXeT8q3jjatI0T2a ukPEGLUGOkHulw1CWYvfIKlvGm5UyqTDIxsKojlSuYoeyraEjp2O+eTBcsppkr90VFN6 htD1yXlHUcSBoKyCwbjbqzm6admY3em4y9WaCE3MnyIGOCO6e5fqmU/Gf8BwPO+CI91E Tucg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fCN3R4afVVo4Z95z0sef0bZEZD+cnjOSeEDcY2D2eDo=; b=ItqpTl7DyL+w/oVljzNt0hS1fMCF3MqAT0o+QcoBzJBGj2C3CJs9/X8l27hIZq49cQ eU8foekLsEA4iFLR3qHgIM4hkw6gWCcBRa+9T5ZrOoSyK4QZuPYcwdgjDis7PKu/vmCQ 5dXeeVx0Z8PRBgavwljbA5sQupYzFdiU4jYiW17ELaJky+O7yfQJbWZCB/gTa8tknkib iM8uGtwrS51zHps5dO1ywqgO0PavKCCWqsxbYLVAB1E19h/Y1ffBwiOjTmcEw9Txkjsj 9lsrsvP4lFLBx0LnRdK5/LwNP0AOO6hGC+VG0w8a+GxKOkFAMLxKr79F7MMiKPTtozmF NQiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kUTTVhWR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gs7-20020a056214226700b004b2f6f4bf82si9861618qvb.153.2022.10.20.05.33.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:33:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kUTTVhWR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUjQ-0001Z2-0N for patch@linaro.org; Thu, 20 Oct 2022 08:33:04 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUdo-0004O2-5g for patch@linaro.org; Thu, 20 Oct 2022 08:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU6B-0002f1-Ke for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:37 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU64-0000nz-JD for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:31 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n16-20020a05600c4f9000b003c17bf8ddecso2366030wmq.0 for ; Thu, 20 Oct 2022 04:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fCN3R4afVVo4Z95z0sef0bZEZD+cnjOSeEDcY2D2eDo=; b=kUTTVhWRgyWtzDk6P3qiFmK7pYBb3vUlPkiJZ9nPoUjGlxaUqz6CHHwNZn7VRXoIC6 qWJ7eE3gjv4uhqn0mQKFiylz1CbI4pKdmKDtCz3x4mGxIPk8n1EmwZXSHSPOF8HmA4FU 63Tc0U0dSsm/YL4FHs9QjAgVpLq1Dx9Pm8vFYRzR0UBCl3TK5a/fwoXJaa8J3lg//u7B fGLVCUOi74gJCJ66SE7zdmIMfezlhKQV9v9OYgEj+CeIgy//sOIGiv7J7j6P2dfLOu1q fwdXIrFWJoOtFBu1nUboOXZZfB81bNXLJD/eyf8edw+XbtKqn/vyNc1jn7IP5YN4G7N0 sMKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fCN3R4afVVo4Z95z0sef0bZEZD+cnjOSeEDcY2D2eDo=; b=qVX5jC1bObjVD/yiQCNXv4xjRjZfI15TwkcRnPRalafWbon77csWdwgEj+OKXYH4kX JOAdo0KgLoqwSeWiAbNXqayS8XtfeUxf0PNKCZ+p4CJ7gEvi6pQDBWMkfboTuKI579vC TTaJL1p8Gjcs4dm6A1p5at3tXRjRcHeLq9JlZn9L723zo5kSCYcZgxsyj2OwrjqoL6XM 6wXlxkBzj5XdGr9G9fwK2TTs8W2mSFSVHw3MyLd3v6HFafu1CWAGSHQKnFyTjQ3J/ePB mlIA051jheNfKBnA9D/W20KQYk4l7EchmpxHHmdmyxvyPTmRjCRgJ47SJPxh3pw/AXhY 7yRg== X-Gm-Message-State: ACrzQf3wU++l05e3Pm4Piz7j1XI6++lqXmunshRGHKFeYQEb2RglYUn4 pnwzTQEsUHRyEYgLRa4zYIYjTQ== X-Received: by 2002:a05:600c:4e52:b0:3b4:a828:1d84 with SMTP id e18-20020a05600c4e5200b003b4a8281d84mr28662683wmq.143.1666266742251; Thu, 20 Oct 2022 04:52:22 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f16-20020a056000129000b0022dc6e76bbdsm16213241wrx.46.2022.10.20.04.52.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5C3591FFC5; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 14/26] hw/usb: dev-mtp: Use g_mkdir() Date: Thu, 20 Oct 2022 12:51:57 +0100 Message-Id: <20221020115209.1761864-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Use g_mkdir() to create a directory on all platforms. Signed-off-by: Bin Meng Acked-by: Gerd Hoffmann Signed-off-by: Alex Bennée Message-Id: <20221006151927.2079583-8-bmeng.cn@gmail.com> --- hw/usb/dev-mtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 5831395cef..1cac1cd435 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include #include - +#include #include @@ -1622,7 +1622,7 @@ static void usb_mtp_write_data(MTPState *s, uint32_t handle) if (s->dataset.filename) { path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename); if (s->dataset.format == FMT_ASSOCIATION) { - ret = mkdir(path, mask); + ret = g_mkdir(path, mask); if (!ret) { usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, From patchwork Thu Oct 20 11:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616767 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp301067pvb; Thu, 20 Oct 2022 07:30:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ZeTybZtx1m+tMPwfTqiZJ1kZdUPslvymVD7tfreoqMP1Syjd/LwD/DKmZAIKA51qmOJEj X-Received: by 2002:a05:622a:4ca:b0:397:ccb4:5dc9 with SMTP id q10-20020a05622a04ca00b00397ccb45dc9mr11091450qtx.266.1666276218642; Thu, 20 Oct 2022 07:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666276218; cv=none; d=google.com; s=arc-20160816; b=aA3yIr6x5veZVnlDHmboFbNH+mIKJm56DHXAUgxZA9ny+ni1cjpNR3JnDta6JKcIOL Z36GpmTE2ICAEQI2wMLFEpauxNfhOXEorg3qjnnN/4g6DPhhmh5XhCg/cXNhFiqANAN1 54vei01GN01ZJkxCR+vUxMnWN1UYDwWBC5tYKY2SIDtbQwYIvcWv3/SI+OSOfgQKn11I Wv0KjasGp6yjD0mCfxdZ5lOu2UEwuqnidbxlMpO5ukOmJAnkAUIZWIeD1Z3OiT8XrVc4 aliGQaYSMQDkQogDCPwij+b+LnXizwRgecVryC1M1LnU6MAdl0ZmnU5xbQCZk6mJbokC snnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BsnTukbpFLVmrOVd5Rj83jH6OSi+bbFHS2pZXyWEQH8=; b=JJdgEhK0RhNFPIEMD8uGXZL/GuIm5OpjhB7jN0Y80KpdNAZYVJQIeaOB85z7T1lxB1 KbWcQWRYto64GnDg93zdRlUpSTKy1FtCAvEfejVoKvbBmHopKfZnlOnp9fvZvxJ3LCux 7z3H5tjwdxm/jxoLT92p+uwBQaGgpCqXPnsgVz9uQhd/kw1fJOjqH857lDRYWqgsFfrz q1q6fpPmB3J39JWelbPQhHsj8aWSVzv/5EtUwc4lkEOAsK7WHhOipVw9KkAxr2NZAsNF IoWJa643ASOrTP0+LRzmF5qH1NbzvJHHkRXpySjVX9NC6O+2t2HW+wLzTzQGQBVS8ELJ BqUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RbqQscMs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e20-20020ac84914000000b0039abfb4cabdsi10403843qtq.748.2022.10.20.07.30.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:30:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RbqQscMs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWYk-0005qp-BY for patch@linaro.org; Thu, 20 Oct 2022 10:30:15 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWVH-0005oB-V7 for patch@linaro.org; Thu, 20 Oct 2022 10:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDQ-0000bi-2F for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:44906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDN-00050s-8n for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id bg9-20020a05600c3c8900b003bf249616b0so1996589wmb.3 for ; Thu, 20 Oct 2022 04:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BsnTukbpFLVmrOVd5Rj83jH6OSi+bbFHS2pZXyWEQH8=; b=RbqQscMssqhba+R/TVBk22Q1pJ6Ci/xm3vr9cmHSWXuRWeHYDEQ8YyHzt1rXaNuKEV 4ihFX94ivc/gf7dp9G4Ro+onXpUpI+AXgLxBM4tYwtFqibSBbWf3Zm1Ge4CenRUH8s5B grmYLSi8DRefDXXbyLx87KcXxQqRkwd/Zp3FowmiakUCGUseQzoUfI8RD0NC928x8yQ4 m1W8gAv+UYF/9ZfQ1OkeBtYsF1seVOyZr1d1T6hZP+p+ETG/o3lvcNo+NTLh8kbiAyDY sbMB4Z2AdiVpTsQ+A4mcmzvMPCWYUBPCWipT/tMIHC93oU0A7wicaxFoAF6sOJZvW81p DM1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsnTukbpFLVmrOVd5Rj83jH6OSi+bbFHS2pZXyWEQH8=; b=WBg4ocqS56ozYP3hnjUBy1BsiDuZyqb1xjzVohraFTfXM4xaelkBlh4Efz0PZOoAsc If5WpMer7/SmGHXgY3bGHZi8zr3PYozhuoExlY6JHIuDhv03bIaDzfdEnE5orm6ti2Gy 1buaZnlB1dt2YHWRZCCJrEnx6PBNJbPxkU1R/rgQG7kXkAsTZWPPvHpEYkHQ8iud6Vwg UkF4b5a4QIQv/OVaEe0wuBZNYOJdVbAb1Ap6auZOPt7+WlwdHe5eevsUdGtm0cZAGC69 +7MCm/qVTUrW5LRdX3wMAUVKR8tMbZrAzwwyiNFf7lKlUS4XYnaAf538gWl1UJzVUyn2 N3gw== X-Gm-Message-State: ACrzQf2HhuIBCrpIs8F4TohatJ5z6SYidNLlnhomDqQwJJhpCnkRBPlT mTgNxE4R7VH20NQOD04SbWiFSQ== X-Received: by 2002:a05:600c:1c07:b0:3c6:cb22:8a93 with SMTP id j7-20020a05600c1c0700b003c6cb228a93mr30343202wms.45.1666267195915; Thu, 20 Oct 2022 04:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t15-20020a5d49cf000000b00230c9d427f9sm16467886wrs.53.2022.10.20.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 71B231FFC6; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 15/26] MAINTAINERS: add entries for the key build bits Date: Thu, 20 Oct 2022 12:51:58 +0100 Message-Id: <20221020115209.1761864-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Changes to the build files are a bit special in that they usually go through other maintainer trees. However considering the build system is the root of everything a developer is likely to do we should at least set it out in MAINTAINERS. I'm going to nominate Paolo for meson stuff given the conversion was his passion project. I'm happy to cast an eye over configure stuff considering a lot of the cross compile logic is in there anyway. Signed-off-by: Alex Bennée Cc: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth --- v2 - s/Odd Fixes/Maintained/ - nominate more reviewers --- MAINTAINERS | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e3d5b7e09c..6a6f4d62bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3764,6 +3764,30 @@ F: docs/about/deprecated.rst Build System ------------ +Meson +M: Paolo Bonzini +R: Marc-André Lureau +R: Daniel P. Berrange +R: Thomas Huth +R: Philippe Mathieu-Daudé +S: Maintained +F: meson.build +F: meson_options.txt +F: scripts/meson-buildoptions.* +F: scripts/check_sparse.py +F: scripts/entitlement.sh +F: scripts/symlink-install-tree.py +F: scripts/nsis.py + +TL Makefile and configure +M: Paolo Bonzini +R: Alex Bennée +S: Maintained +F: Makefile +F: configure +F: scripts/mtest2make.py +F: tests/Makefile.include + GIT submodules M: Daniel P. Berrange S: Odd Fixes From patchwork Thu Oct 20 11:51:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616796 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp381539pvb; Thu, 20 Oct 2022 09:28:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4FObBQvuRFjhx3ldzNoIOGjH9v4GaDC12XidMea/k2/C4gD/2C3nXvt8gCbmRuL30E+hGS X-Received: by 2002:ac8:5a45:0:b0:39b:ef52:ac1d with SMTP id o5-20020ac85a45000000b0039bef52ac1dmr11995088qta.419.1666283285208; Thu, 20 Oct 2022 09:28:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666283285; cv=none; d=google.com; s=arc-20160816; b=u3V64kXcgxMZltBTmixhkZdRPsF84XG6jm+jfuLcn7LeS4OYtuaQPjF/3jJ8fFBDct 2I+8SNB6C0+4M7szIGqDdHulIzO+ugg9WN6ROY/E+PIN1P5YYwm60QFA5s9UrgutlTUb i53qsQG7deIhoQ3m/xbb8tGdiiWZRpnMT2zuZw8DEfSsK2284PgWy0oqY1ulWhAMdDOb XKQ9XTry4sxkcPzC78dTdXqNlrbj5uHSejyARfKYOqRb6eE0xYvl+7V5syou5uHQtM9G +RH17xPOvuBA/5ymFfoU83SiqkBxNaMheciBp9i2nzlpIo5wYGMPdJNlvXsTrCh5Z37N tkzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SzAr/vuWvX+J4SSUaSRUOc+zGR29CAkOND/bkbQMiUQ=; b=Lt1jf+h2CgZH/+gTXt8xmobFBpjB6mJs9Dk+E8Pt+fZBn/DtbhEB27hIHgAKX3MPtM M+6gvsxcpznoa9LFoyAU8ZMU2w3UHS6HSYzzIVHJ/IDJuoQQpWhUk9QLVhuxrJQWwLKo lUwPgYsJpq+nANzjN9yl23NDt5tOhACJ7wDXhObukZYVBVS7dBFA7H2UL0nPW08jLuLc gXRx9WusXbSnoBjyFalJCVuNqW4rA3xvFmZzWnfECuAbWqVzjkh5OPyF2vi9neq/7Mai KPPaWfi+c0CT/p1ZG++9BAhTf7ApYQGfcqY1M8Q6Sg1kvpHNLS1VZvRB8sZTkoP/4eTp 7Pkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvwiiFMv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jv14-20020a05621429ee00b004ad62693cb5si10511059qvb.211.2022.10.20.09.28.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 09:28:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvwiiFMv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olYOp-0007Yx-Tz for patch@linaro.org; Thu, 20 Oct 2022 12:28:04 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olY6d-0002Bg-Tu for patch@linaro.org; Thu, 20 Oct 2022 12:09:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDQ-0000bj-7f for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDN-000503-RO for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:59 -0400 Received: by mail-wr1-x42e.google.com with SMTP id bk15so33980440wrb.13 for ; Thu, 20 Oct 2022 04:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SzAr/vuWvX+J4SSUaSRUOc+zGR29CAkOND/bkbQMiUQ=; b=mvwiiFMvQJxQobAJYz7KTLbaYctl3coppazsCf/2J29RTKJQxwSg4zeKFo9rkXqLEY V4EOyS+JQjMT+aJFRkYElbhRVRPXXv9N6niaT9av77uP05r6D1dBMCpSab6Vyzzqh2qo eRcE/rD5uU8aUY/hIleDERWfKpx0a0vfGQmRv9i5gwObxfCZYAqoOnOtlJSMD0xx1Y4I znNjL0g/4h1JO+MmLru3gk9sFpkPI900QNhm2V28tKRqAwNKKjl3OojIDeA2oJ3hepTW zUq9y1lNs6K6FAU373sJCXbfjXAXN58WESA8GJ9n0uXern54axI9aaHRpZtsO2XdV9PV yf7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SzAr/vuWvX+J4SSUaSRUOc+zGR29CAkOND/bkbQMiUQ=; b=lvL/fX7X8DFC5BaO+K2ehhk7yCEUkIuHCx7GeUwViX2U3fWlvSQFLmJ8NDGyqWOeSS ev6OcIt7CqGFC1dK0J7+wUCuuQnCkoMADQRZqVH3J0kUGHj8VLKpTwUea+PGUXwqjwKN tQGj1xK27cnwAxGfuv4JgyM10hC12BF2warkNYf61q/e9WlpoIpUWNzUoCA/giVpdF66 AmTYcOpLtepRKs1n4GI22Dfijh8AzuEVC5SErjhAzzFpeVZu4+DuCwrbtmpTIqPfeoP2 7PRxRrRPaCXlgy8JnSgLCLXURt7IA9qYSF6NKtdVedMPDvmeWfCysrps6vMZxTKbDnpa 0zxw== X-Gm-Message-State: ACrzQf10ObH/YaIm3vmmeJEDmxmWTqIdoBXYXiEbAbw8D3Ct8zPd2Dtj NPegncPn0zCdQJfLQs4OKRzSAg== X-Received: by 2002:adf:d4c3:0:b0:22e:326f:e8ef with SMTP id w3-20020adfd4c3000000b0022e326fe8efmr7817002wrk.242.1666267197006; Thu, 20 Oct 2022 04:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e9-20020a5d5009000000b0022e3d7c9887sm16091124wrt.101.2022.10.20.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 881651FFC7; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 16/26] MAINTAINERS: add features_to_c.sh to gdbstub files Date: Thu, 20 Oct 2022 12:51:59 +0100 Message-Id: <20221020115209.1761864-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6a6f4d62bd..0f4c50e8eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2693,6 +2693,7 @@ F: gdbstub/* F: include/exec/gdbstub.h F: gdb-xml/ F: tests/tcg/multiarch/gdbstub/ +F: scripts/feature_to_c.sh Memory API M: Paolo Bonzini From patchwork Thu Oct 20 11:52:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616750 Delivered-To: patch@linaro.org Received: by 2002:a17:906:1c0f:b0:78b:b85f:9498 with SMTP id k15csp347339ejg; Thu, 20 Oct 2022 06:50:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zlhgyAqSYwqJsmPphKbTP5Cu067cYUdIG+aAlqQOwk/Ohx7Jct11pl7Oy7ixbOUjAndop X-Received: by 2002:a37:aad7:0:b0:6ee:6835:8efa with SMTP id t206-20020a37aad7000000b006ee68358efamr9460944qke.140.1666273813253; Thu, 20 Oct 2022 06:50:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666273813; cv=none; d=google.com; s=arc-20160816; b=YkDLtOFX60kv9M5ILi1yJFcpYtO81KHYL9TwnqPJ1Ktoc4n55nchab8gzndktGwW/O dwjG7vRLlh9bzS2THunp++N6FQ6KnAgl0Fi/Dg2xcj5afJuu3Hb2YpMqxk2iwSnvpsNR 7AaHBFCL8mz4Jf7zS0I1OZD/+k1Ky5RNP+CEw8WX3k/8NDGekb+84MN3Uu5061IYTrYp CFiftOji06DOIji++PY1bMfft0YK32nuAix1JxNcrqQe2udowAzOtlKlJKywyEIRjNiO NIEhLafRd+6dtDrV0tUGaPTBWSZe3EttDlCGOJ6COx4AkRUlrqcsiGYefEtUNE3C5ud8 RdgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SUQ6aWo+0ebt3EjilzErJ9ygU5AofdO9dMDmTcEwi6Q=; b=FiBPN0z+zHG5eIE8xtdbQvcGGO4CnjS7q9XhcI4ZAElj9jCoM3046/2kvXM6ntOj2M ojcGr5yg9pDpUuGRrs6LqdcuF7y27Gm/K/0aOOBaSe/gVtw1lhbfV+XeRkkCGbNZCGsC n44gqUyueq73H0AqWPLtdryJSFefvATNfRwfl5gfAnokH/N+BDlQjvYX4ZTwuk9BwA6j 34XQyxIAE0E+LyIWJSOVlsgKd8TOSrtDhrhYlRbEbXgzU+8nXC/iVe6wav3z++ZC4yfg Rc0tMxOuUqWHSJtKf3sdwXmdkvLSIDWe0ClwIWAKTztuZbDcSbTrb8rY8oo/dfpA5+sk bXxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RcOx56Ek; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e8-20020a0562140d8800b004ad23215c37si10605226qve.472.2022.10.20.06.50.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 06:50:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RcOx56Ek; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVw2-0007D0-Aa for patch@linaro.org; Thu, 20 Oct 2022 09:50:10 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVgr-0005of-Nf for patch@linaro.org; Thu, 20 Oct 2022 09:34:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDO-0000Z4-AX for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:59 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDL-00050F-0j for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:57 -0400 Received: by mail-wr1-x431.google.com with SMTP id i9so837062wrv.5 for ; Thu, 20 Oct 2022 04:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SUQ6aWo+0ebt3EjilzErJ9ygU5AofdO9dMDmTcEwi6Q=; b=RcOx56Ek6IOVPbvla021kX5mILMjLI0Uj2ogIfv8o3r2wCbghQHqYWzyWI08rt/4lf eEUWTbQDWm3HJWBKcXqrUuoeUd8UlL7DH6ZBeaD/ba6a+xOSeHCx0V5P1h0C3gJ6lvKB UmeKgH/rzEvT739lWphy7BjK5tFpuK7Pyze5PxAlegLTFns79dntVGZ1ITxPmBGPvLda a5kDw3P7Pc8FoE4+lSJBvNtZnYdr61vW4IY7hD0uZz/81q/I3GnNVP2oLvbQ0/4IOi+r 5mgump15ljUiNCUmDpB6rFsxkpN4gnqdS4T6KT82KdFXBLsI8vPlL+Ihy55dprrHN+l8 gz8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SUQ6aWo+0ebt3EjilzErJ9ygU5AofdO9dMDmTcEwi6Q=; b=TbCuuCWjM0TYt3kFe3QPDDGAk/W/IGb99aEtVKrr+mCJFJNdDKI0FNFhpm/8OC8n0v yBpWXWopT9OZkmCMStiJb41VKNVKFbPQzp+3a1pHLkxt7qNPlV6uwfZa6+JB1FKSLqJt Uclag+CiFIUqsEfMVDrJ4JdWVFB+XzlA4T5mHpvEnhOJJwBXR2OzryL1SB2apBpmdq49 26d0dNqsgGaG//a8QGbCCWQUe+1NikQrL6WsyyfIDHE/EE/Ai3RzD4/ahE6Hi91FqwaX iRnb1Qqp7eemgra6tK5/qeg751+6vfaM1QG0Taok9ufYd0u8qO8I9EU1RaFp8u07Xzfz 05yA== X-Gm-Message-State: ACrzQf1SOH8v36dLK6Me5YPYJbXpjQ8uNRP3XRTRYx6ZVxGRZlu1XVsI CkVS35G+K1XwmVPiQZ7FGYqkXQyXFDvI2A== X-Received: by 2002:adf:d1cc:0:b0:22e:6359:f999 with SMTP id b12-20020adfd1cc000000b0022e6359f999mr8249360wrd.667.1666267192817; Thu, 20 Oct 2022 04:59:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u14-20020a05600c19ce00b003c7084d072csm2821169wmq.28.2022.10.20.04.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9D27F1FFC8; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 17/26] MAINTAINERS: fix-up for check-tcg Makefile changes Date: Thu, 20 Oct 2022 12:52:00 +0100 Message-Id: <20221020115209.1761864-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0f4c50e8eb..1b41daba88 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3727,8 +3727,7 @@ Guest Test Compilation Support M: Alex Bennée R: Philippe Mathieu-Daudé S: Maintained -F: tests/tcg/Makefile -F: tests/tcg/Makefile.include +F: tests/tcg/Makefile.target Integration Testing with the Avocado framework W: https://trello.com/b/6Qi1pxVn/avocado-qemu From patchwork Thu Oct 20 11:52:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616738 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp260755pvb; Thu, 20 Oct 2022 06:29:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+CyvNzga83/JzedzY+kGy7UFkcdEgvEw3jtap5/QGZQq45aHBCYv0Nz/wvBamTRWYIvFB X-Received: by 2002:a05:620a:6c8:b0:6e3:cef1:8e1d with SMTP id 8-20020a05620a06c800b006e3cef18e1dmr9065368qky.698.1666272586685; Thu, 20 Oct 2022 06:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666272586; cv=none; d=google.com; s=arc-20160816; b=aLG+dCIr4GDf8H0cjvZNIkJtXTk/ihqLCMzcarjl+WtfsikpEG3Yeqhdp2dz07Q0bl 809X9wu7fXD8QVgttSzqgm+2cob+AkcD/Q7CG5q3f/MKA6brjTUzFTFc0t+3SxOLHzpl uIm6mzj0uKcl3XCXbSE13zpIN7GrwMj7OBmwv+GL1j8qm/kJZgK6lrD66BmTXUsobj8H KRPmcJtSWf2Fne2sxQW/Kg9giu3hA/IVHPE1SQPsTQ/MC6R07UHErhNVVlTpBYVfanI3 6pzL2pTD6+XqN4o8G3PKmdB/Aljit+7gBZt9KUtUwFYloqHs0gD0Vo9BOF1CvpMJ1nwk NYMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HhtKHrwe8bfrPHZsmspzGeyOQdxHSYHZqbTkDpCte/4=; b=xZkjNtvgHQZb8ntfeOr7i3zcFo4JdCrllWLuVfj2ALGEu49MRkoOnrRL6KLCGV3Mrh WjJ/98zqObE1pl1a47c9sQfqhYtZluIJzmUJKaQhLlXQkNKi6x5INGB45VXoS702ZB5o JzYnfDJvlx0I5xVY3PqyVoNnnF7IHX1WbD1UlNzvpIWaeNEUACtqJAtuvlO5zLAjB0Gk G/mErGbLF0ogaPqZjqC24tTKc6Oz5hLgovEYePMEGlr7fp1a30IpHQiCD3B03AxRcYFT rJarcHptQkBX9Fon2fxGELo7Ige2PlvX9gjz5rRfDb4QCc/F+wGNCItPw1T3BJ9e6reQ Fqdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DeX3LE1X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z19-20020ac87cb3000000b00398b18d64b5si9689727qtv.738.2022.10.20.06.29.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 06:29:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DeX3LE1X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVcF-0000Uo-Fd for patch@linaro.org; Thu, 20 Oct 2022 09:29:43 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVOd-000677-Sg for patch@linaro.org; Thu, 20 Oct 2022 09:15:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olU6A-0002ez-VU for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:44 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olU64-0000nF-J6 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:52:30 -0400 Received: by mail-wr1-x432.google.com with SMTP id v1so4719359wrt.11 for ; Thu, 20 Oct 2022 04:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HhtKHrwe8bfrPHZsmspzGeyOQdxHSYHZqbTkDpCte/4=; b=DeX3LE1XlBcuDOJNgg9qdt9g7wgtszXmWKJZtAqa4sloxwDcpas/1FnwLhzCz5te0s cl1/Gwew8WwLne58KrLUflPZ/KxqI7bT0NNWTzhtPyGqPqbm0lpungNWYXDDaDdW0yAD eT9m2l9JKwET9v+KC19v+WDJY/PZ1LFqlGb59ZfoCej5Nlm5y9uYwCp9oJA+hKguuJee Rib+XZNrJF5IUvWaLS2Q4UpdgVBAIPwUEp6ZDHagAgFFrFvS6WfK1+dRhl2NWx5uhvSA CVSbCd9idHJDMAkAcJVjQRZMgs2YW/ek84o2drvV+stU6B4y3dUTbW1PZ1LE5X83AhS6 fFiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HhtKHrwe8bfrPHZsmspzGeyOQdxHSYHZqbTkDpCte/4=; b=1RyZt/3iHIFk3WOButuaiiSzXqQGaPbShg+qKGvMbOMPaPbp+jXaU2UZS+DXHnK1cu dTzz7IlElhuhOPgsntk1VJbpixZcE6Wzs/GX/vj8wT0AkD7lvWVU940+qzFCyMmT4K8h V3BBRsoQi00Gozk+crOo7ioZS776ZG7aaMt2F11tfBu7uQZSdF38RfISI+iTS8L3yJB6 hg4sc9XY9X58uyu3k9GRBe+YiL2hjP00YuUlt3OtRszp5WH+7dA8HT9P3D9Pru8H7ZdG Fo/UEoDb00U872yYDg7M5K+xH9eWo4tRyi2ktxjIrsfJ+VPx0qoeyFfNrZDTrPeB2AaR //PQ== X-Gm-Message-State: ACrzQf3q21LAlWD4W+ydFQfzocT7ebzxhWbTsQuZBKdxcB3YGJFX8iCE BWRGy8Z3OC0b+pBIBvK+HIbV8w== X-Received: by 2002:adf:fe42:0:b0:22e:48ee:aab9 with SMTP id m2-20020adffe42000000b0022e48eeaab9mr7917678wrs.501.1666266743284; Thu, 20 Oct 2022 04:52:23 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u14-20020a05600c19ce00b003c7084d072csm2802124wmq.28.2022.10.20.04.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:52:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B53951FFC9; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 18/26] tests/avocado: set -machine none for userfwd and vnc tests Date: Thu, 20 Oct 2022 12:52:01 +0100 Message-Id: <20221020115209.1761864-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These are exercising core QEMU features and don't actually run code. Not specifying a machine will fail when avocado chooses the native arch binary to run. Be explicit. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/info_usernet.py | 3 +++ tests/avocado/vnc.py | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index b862a47dba..fdc4d90c42 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -14,6 +14,9 @@ class InfoUsernet(QemuSystemTest): + """ + :avocado: tags=machine:none + """ def test_hostfwd(self): self.require_netdev('user') diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py index 187fd3febc..aeeefc70be 100644 --- a/tests/avocado/vnc.py +++ b/tests/avocado/vnc.py @@ -53,6 +53,7 @@ def find_free_ports(count: int) -> List[int]: class Vnc(QemuSystemTest): """ :avocado: tags=vnc,quick + :avocado: tags=machine:none """ def test_no_vnc(self): self.vm.add_args('-nodefaults', '-S') From patchwork Thu Oct 20 11:52:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616752 Delivered-To: patch@linaro.org Received: by 2002:a17:906:1c0f:b0:78b:b85f:9498 with SMTP id k15csp348594ejg; Thu, 20 Oct 2022 06:51:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM50Z+aNaLCG1c6Yw0gG73JUrsC0dqWgjyTaehhgXyPq2DHZzubq0vgT/tPxy9VE+jPJx8s7 X-Received: by 2002:a37:e118:0:b0:6ec:565e:f2d8 with SMTP id c24-20020a37e118000000b006ec565ef2d8mr9331179qkm.719.1666273902109; Thu, 20 Oct 2022 06:51:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666273902; cv=none; d=google.com; s=arc-20160816; b=VrsVK3/uW0xH9bLeqQ5vqziH+Q99p5a61elZLpyc4/RssusBgpPEaxgGzY4yA0HPnU UWtzVZF8kmaMJ8AdQ2Z5aGgQk7mNfHpqTsusR9wm0U6DFRAmEu3jIo1E6JuvxkgZWzKc hY31H9HaFPhVKnFqIWU/3IGoXhSiq9xlMwSkSsvNSj/RhXKuC9ft9CJe/D8ZsY+ZbqW5 ULKMgOP2zv8GnHxWT9dluGDCllvvG3R/0tAajL+ja/E1YSmZ68298XWckntZh3gdf8JQ 2W7q/PjL5W66vFosKjNGXrZSx0rzDJPWD2PWcVuLOVRsZRa4Ww8ZU0Px8Cev347tsTFS 9auw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=32dQNvuQE0WB5UgXj4/0Ow+Vp+DtTMBdaIfa03x7tow=; b=sqWwAFIF1MWHqBZjbnngnwgY+tXJxWlEPPoerhUCNZhyFEJpAOgIwma9apIK0f+PH6 XvVV3ZuHlElSj1xyIb6J6wgol+YjWyQHTLtK0iotY3LFm2CyMSw/t3ukusKyYWSI4lO0 4GiQlgUs/JlCi5GfZzzE+nt4CdFnfr+30700PtTU3Ol4BS7MbcFugU+8QCwpBLJ08FaV mZpXb/W9Xkq/Ai3vixEqzFcdQVa/sUfmm28JjM8RWyzkiFeJR19rW4EEqnzd99Z5BKDP O1pdSY05caTbWHPdQgfZ31ji6QxzbKToa6ajet4dxqBns0lnCuH2Ru082Jp4ORn7lRYp nm7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HYr751Jh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fw6-20020a056214238600b004a85378abb9si10436247qvb.425.2022.10.20.06.51.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 06:51:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HYr751Jh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVxU-00018G-GF for patch@linaro.org; Thu, 20 Oct 2022 09:51:40 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVau-0006TY-Ox for patch@linaro.org; Thu, 20 Oct 2022 09:28:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDQ-0000bk-3i for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:36655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDM-00050g-3I for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:59 -0400 Received: by mail-wr1-x431.google.com with SMTP id j7so34031208wrr.3 for ; Thu, 20 Oct 2022 04:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=32dQNvuQE0WB5UgXj4/0Ow+Vp+DtTMBdaIfa03x7tow=; b=HYr751Jhr6JamZPkBp11jC0J709v0eyykBTs7PHtEQgd/X7r5rbLU9Rk2gyr2N0wZw 6M8iEnD+dWMY1GXHbtyagc+Nki+4s0ZXCkZlElFMq4uSWHKlXLlHR7by2gGpHjLYxovd DdTcNGGBhG66WUfYPi3yRGXIcj2ge+aS4IytLi26ujMlITkWiSXkjNdRaqpx+5jC92zC S7D0kBZ9qJ5NrZdSXwtnZQ9H0HdtgSse9qdCHEpSF7AcAqAnD2L/0r1DA7YHjLDjsXbR LKa5StS7lbYOAr/AKMeMAX2SWwKs9wOFVlqntK8CJULXNrYH2W+8fVU4RJggsxv9tD+6 Dziw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=32dQNvuQE0WB5UgXj4/0Ow+Vp+DtTMBdaIfa03x7tow=; b=ETvwQA/Vze/dHTrb3UP3azsmPqNgvnRYqEkZdHD1BVOQ356fZs6/jq8JFT4HWV6Bk7 CVtOsB2EQGCWSG2tl9jnUNkjz9l9zpDrayMYrIw8QQMP1G99Z5MMqI7+qAq13SAOtlBq Mb58jofMosHTWiQKJr2Fi+BluuXoqws8JUxjcwmQorGQAbgJfMJuDqMmolFXDLvH0qv6 6gIWhE8XxkP2j7JbNRTb8LNW/gHZt0htUgMSO/TZqbXm8hKfr5TEGR8mmU7zDI+vt41W 5jbYSaSJ3nsKvYqNa1LJatlt5zFiyoDXgITDVWoYi3/RylKzr2qapmIN4mklYxiaxVx3 L0OA== X-Gm-Message-State: ACrzQf0tOVCeMk7fToul650O4JyLm9HLrpmptSrHPXqe1ZebaAN45rJo lz5THly4H7qQY2CmNQM4YQV8/A== X-Received: by 2002:adf:d215:0:b0:22e:479e:8cc1 with SMTP id j21-20020adfd215000000b0022e479e8cc1mr8836978wrh.39.1666267194806; Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b10-20020a5d550a000000b0022860e8ae7csm15881668wrv.77.2022.10.20.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC7E71FFBB; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Peter Maydell , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 19/26] tests/avocado: raspi2_initrd: Wait for guest shutdown message before stopping Date: Thu, 20 Oct 2022 12:52:02 +0100 Message-Id: <20221020115209.1761864-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The avocado test tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd finishes wiith exec_command(self, 'halt') # Wait for VM to shut down gracefully self.vm.wait() In theory this should be fine. In practice it runs into two bugs: * when the test calls self.vm.wait() Avocado closes the socket connection to the guest serial console immediately, so the avocado logs don't have the last part of the guest output: https://gitlab.com/qemu-project/qemu/-/issues/1265 * when the socket is closed, a bug in the QEMU socket chardev means that it loses any data that the guest UART has not yet consumed. This means that the guest doesn't always read the full 'halt' command string, so the test intermittently fails with a timeout: https://gitlab.com/qemu-project/qemu/-/issues/1264 Work around both of these by waiting for the guest to print the string that means it has completed the shutdown process. This fixes a very long standing intermittent failure in this test. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/636 Signed-off-by: Peter Maydell Signed-off-by: Alex Bennée Message-Id: <20221020102012.3015662-1-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- tests/avocado/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index ca9d09b0d7..eed4b49e6e 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -489,7 +489,7 @@ def test_arm_raspi2_initrd(self): 'BCM2835') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', '/soc/cprman@7e101000') - exec_command(self, 'halt') + exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System halted') # Wait for VM to shut down gracefully self.vm.wait() From patchwork Thu Oct 20 11:52:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616721 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp229347pvb; Thu, 20 Oct 2022 05:40:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM43xypmWXTTpU+8rbMrUFsy3BvnEx76FfXR5RdlPl/rNgmM2lS/hKG99BW5QHxWJCB3ZV1d X-Received: by 2002:a05:6214:20a3:b0:4b1:a691:1436 with SMTP id 3-20020a05621420a300b004b1a6911436mr10738791qvd.14.1666269634999; Thu, 20 Oct 2022 05:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666269634; cv=none; d=google.com; s=arc-20160816; b=fPevHe36WKcBPaCzSGxwjM7PiC23SKDfhluOKOQlM0Tbt2/H/Ug8WpunbxnJE1qtXH G9e5k/HEJL2eLka5K3mQKC0NILj7vseyFCD6n1owZY0sjlKDCJfjJVVp359055STXRQx JhM/4KSZdUHCbKgOPijR1XOt1qOgigGsciJDzLVYd74HfM4mydE9YTy9/9ao3vOe3o02 7nDEhD0YxX65BG6I55GnwjvqDUV2u0PeYZDKCrRfvf+bnf8SDCGemJX+XTuZU1XOG5sI bu9kYCj1nGf2dti0ic/faxAYYtRh5xzgOHP9yejNEpJejfedy5/aV9OT6p2qbdYH5XaE /1aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WjfZFuDfwZki0Motf5d0a8lYGhUl/fr0hF/I9a/jdfg=; b=f0dxQfOdJEeZ4ByDqwKgbumZoBgZtTUzG3rifzMLdhMEpFWlqo1IK3mQ0qIw65xh7U /SK2lE8z+ProGB30nQkfMaGZJWoSQrYncuteswQN9uqMmETADRSsx6ez3LWY5DVmLlSd BUEm6DfdRfIv7qXqB/iYfRI/Hr1x3xZG7eIeHQp+GOuIyNjUDDkoQlZBZIuou+QC7xI7 GVk/168diaIvlTYjOzsg1blvdUuSpCW9WZG1xBEqNnIC73Ydu2OdraB4GGLWfJEhp/xj H+ceJ3YhSEuwXf9EKTK+nMwA2l8642GW8XV64/EshmK++GBQrA+xVQPohuf1Yd0JpVvW CNXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="MHBuXt/M"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h11-20020a05620a284b00b006eb3a5ae78esi10567031qkp.157.2022.10.20.05.40.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:40:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="MHBuXt/M"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUqe-0007iP-9v for patch@linaro.org; Thu, 20 Oct 2022 08:40:33 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUk0-0005FV-5Z for patch@linaro.org; Thu, 20 Oct 2022 08:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDT-0000c5-TU for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:27 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:42774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDM-00050j-Ir for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:02 -0400 Received: by mail-wr1-x431.google.com with SMTP id bp11so34018855wrb.9 for ; Thu, 20 Oct 2022 04:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WjfZFuDfwZki0Motf5d0a8lYGhUl/fr0hF/I9a/jdfg=; b=MHBuXt/MG2BzTyt5bjkm9Os3FpD5dgAPeF9EoRxBHvDWyh7ASax9r5zj6lPozWIxV1 w+f89UCaJcM40SPDbq6idPEDYxDI0qgUYH/KTHqLdLyjqYSpzeWzmW6EwIT/Qopyd9BZ EwJNcZeyUC6Z2MbopFPqm9XRuSVqD6pC/AEjE5emakgk3U6MK5VBrjsxHcgzQVv7CTog wv4AZMK5MGHU+SN1tsiHxWwfxJ2QCIOs5xvXmyx/Ge9WN7eg5jihnX+zQZp0ebfVrb76 u+ZoQGj/pD8lVw5/0T1H0qOoGPR0oC/GRAbWGVToySWJw+AW9kQid1zEPACaN3aMME8t URgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WjfZFuDfwZki0Motf5d0a8lYGhUl/fr0hF/I9a/jdfg=; b=y8Cpaf6c1Hduk30jhbpBOYNcBmfVrmTq54hhYUL6RXQ7zUjVrxfjjJGN/UIaMKtR0W 9Gj9CgLnFx5nrHiZV1Yh3oihwisXLdGl6jPASsGaLbN9E/DbtmScX84et8jcEbRlYyYa N/3/IBZuOzekdMxaBR4BTVqgS/V0oO9rsRRLqXbdxkEOq0d/q1ckz4vr95rm6DsMH7+1 xq/5efNxzROlNrRh0nSGzrJsa8Rr6LPfiYSoYiFwTDdk70b/z34EHo+WBLle4RBVHfo+ 9f9uybZ3kUqVOAf+TxHrY79MsPeWxNUBHpEPH+fQzXk3XSLPEQQvaNod+L3+fBxIDtgL hIvw== X-Gm-Message-State: ACrzQf2Xk3x8HyEaoko2ys2HZwJvceLrsLr5uXDxAx3wJeXEOBza/3ll vabgCJHCpm6nLuC6Ucu1OdXvzw== X-Received: by 2002:adf:e195:0:b0:22f:6117:a932 with SMTP id az21-20020adfe195000000b0022f6117a932mr8523758wrb.572.1666267195151; Thu, 20 Oct 2022 04:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h8-20020a5d4308000000b0022cdb687bf9sm19963414wrq.0.2022.10.20.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E29761FFCA; Thu, 20 Oct 2022 12:52:11 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Yoshinori Sato , Magnus Damm , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 20/26] tests/avocado: disable sh4 rd2 tests on Gitlab Date: Thu, 20 Oct 2022 12:52:03 +0100 Message-Id: <20221020115209.1761864-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Running repeated invocations on a number of test boxes show a fairly high error rate: $ retry.py -n 100 -c -- ./tests/venv/bin/avocado run tests/avocado/boot_linux_console.py:BootLinuxConsole.test_sh4_r2d retry.py called with ['./tests/venv/bin/avocado', 'run', 'tests/avocado/boot_linux_console.py:BootLinuxConsole.test_sh4_r2d'] Results: Run, Ret, Pass/Fail, Time, Total Pass, Total Run ... Results summary: 0: 94 times (94.00%), avg time 2.254 (0.00 varience/0.04 deviation) 1: 3 times (3.00%), avg time 1.837 (0.02 varience/0.14 deviation) 8: 3 times (3.00%), avg time 91.288 (0.02 varience/0.15 deviation) Examining the logs they fall into various categories of un-handled unaligned access by user space and unexpected FPU usage by the kernel which ultimately lead to the failure to reach the login prompt. This could be bugs in the translator that only get hit occasionally or just a flaky kernel - its hard to tell. To avoid these failures gating CI lets skip on GitLab. Signed-off-by: Alex Bennée Cc: Thomas Huth Cc: Yoshinori Sato Cc: Magnus Damm Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux_console.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index eed4b49e6e..26eaf1a119 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -1175,6 +1175,10 @@ def test_ppc_mac99(self): self.vm.add_args('-M', 'graphics=off') self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + # This test has a 6-10% failure rate on various hosts that look + # like issues with a buggy kernel. As a result we don't want it + # gating releases on Gitlab. + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_sh4_r2d(self): """ :avocado: tags=arch:sh4 From patchwork Thu Oct 20 11:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616720 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp228155pvb; Thu, 20 Oct 2022 05:38:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7GtwmspP4nsYscdhBzbiMsvzoNwiC+pgy0WlCwBmrYKUYMuAmVMvp9InrSh1fLIBSPJSiI X-Received: by 2002:a05:622a:170a:b0:39c:e2ee:8e2f with SMTP id h10-20020a05622a170a00b0039ce2ee8e2fmr10926314qtk.148.1666269497378; Thu, 20 Oct 2022 05:38:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666269497; cv=none; d=google.com; s=arc-20160816; b=Rz6tveV25TUwZQjlOUr12TSaT/Aflwfg1NHEFNlek1DUdhp6lnGmhRaH313OmZUGfL +riUsbxbu9xkcvfcIAhAyp6E5JLiImc58ntAbymxVn4saJFvLTTmj2Mz23JJm7JAu0tr 2P92PvutC/2DbS9Kvl/HGGmtVcStaA5cgIVv/VEMVAI9cZZ4Qa5ugDuZfcDM3D0toQHb 4g9Rwq2mOuDopYcYjrybgP/nIvlxr3wrhvrI26amCHfwFTzrma56YH5j4gIDrqlalji5 455CimUX9Vw6eml9XnCCBp1pLWvpQ/PntJRWLYK+GOc/LWqepR/ypPq5YrXJ4deR02O5 y8Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1O0yduy7ttdhdCo/+WsHwgTbBgZqRMAaZeNoGq07XSg=; b=XEZjxpQ8E17jktXSZzW27tjIV5yKnjLr4wPM1og2KVcQp8Exx49eeb+4AtCrsDiQiq HwgaipOopiRdKAlJjCMurQTkAX4W80H4GeoywyjAps+e5heqZ3mVP792DG1Wu+K7bnJe z/AsZ/mt0UokPDRNfR5mJQaSOZFyleG/3rDVj1xG654b4klG/ixZcaXCY/wemOda9bB2 Dhey/PUdDNIQQMbgVaP589wjsAQsF3ZRV9diFuCyplaHHBaPvm/5YQSTpqjh24CSslSt bFScLlr2aJi9WKe/sBmRWbnhnoj8Z9xrw2TYy3P8wqUBpQHp3DcOXhKQx5eK7tXfTSdU xtdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JeO8dBl7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z12-20020ac87f8c000000b00399f4740695si11785364qtj.124.2022.10.20.05.38.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 05:38:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JeO8dBl7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUoR-0002lH-VJ for patch@linaro.org; Thu, 20 Oct 2022 08:38:16 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olUf0-0001dx-DV for patch@linaro.org; Thu, 20 Oct 2022 08:28:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDO-0000ZW-Gv for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:16 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDL-00050V-FF for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:58 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w18so34014874wro.7 for ; Thu, 20 Oct 2022 04:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1O0yduy7ttdhdCo/+WsHwgTbBgZqRMAaZeNoGq07XSg=; b=JeO8dBl7GXpiSHvGkZHeZwy8qcBN2yXHWIYgTbv5Z1yaXDY129ZK0UAKadGOkvuc98 Nyw9N8H715dyTTfcZF0eCQNIGWRG1P5d5zbOE21LAmyGCaIDcMUzSHp4BDlUFA7J+2Pf kjbTEliqBVsiynsgb+CWy7EIgsFIFg2HhtWLHK5roh3g4Do7Naa6p0D9kIOyiaNtq/EV 5ttBegjwtmoa2Rja6LxtxtfZQSIABt7xRkgA3tcG46CJ4m6qJla2dJfjuIZT3s+ni6Gf v9wudwLoCe1q+du7Z5T4eQSGYFn0L8ddz55dCntFMMbv+H8JmYFmWpkzPPwrRr+s1hD9 0UxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1O0yduy7ttdhdCo/+WsHwgTbBgZqRMAaZeNoGq07XSg=; b=iUfQfXRuz6O1DCDo924vHQASuKQGv7rYtKoSCl8SyDkJ2GLSdIqCNfMqPzrwyij+py qiSxYbbXPqnAY0t++mKU9onhoDW+BjpZDxFpaY+EN28HQVbhqRoMb35m9Olf97kvAzrU zr0QNp79+WXGC8jJwvfJix7VVKsdveys/JL+JBaAO9H4EWc7W2AL/BjRpywa0+oat9mi Seyybd3OIqjD2kX27vslWnHrz+TBkEQMLB/TaEW58IE56/OEHXVJ/DK1YHO1+omFV8En h8x4jRh6FuOdlUXutG2ELxbL5Ko6In+pKeygU/mtEMgiSZW6TGo0DFGASRUa/DEIP/4M 1fbw== X-Gm-Message-State: ACrzQf1H+fPeOy6Xq0PDuM7Px+b2+2+M23kmhnpIE8o2BbrZigWyult3 RORxgB5lqSg55B5GhA7YIeiJmYVXSiiROw== X-Received: by 2002:a5d:59a4:0:b0:230:eaa4:88d7 with SMTP id p4-20020a5d59a4000000b00230eaa488d7mr8661005wrr.35.1666267194035; Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r6-20020a05600c35c600b003a1980d55c4sm2857846wmq.47.2022.10.20.04.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 044F71FFCB; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Yoshinori Sato Subject: [PATCH v3 21/26] tests/tcg: re-enable linux-test for sh4 Date: Thu, 20 Oct 2022 12:52:04 +0100 Message-Id: <20221020115209.1761864-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This test was marked as broken due to bug #704 which was fixed by aee14c77f4 (linux-user: Rewrite do_getdents, do_getdents64). Local testing shows this is solid now so lets re-enable the test. Signed-off-by: Alex Bennée Cc: Yoshinori Sato Reviewed-by: Philippe Mathieu-Daudé --- tests/tcg/sh4/Makefile.target | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 35ebe6b4e3..32b019bdf1 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -13,12 +13,6 @@ run-signals: signals run-plugin-signals-with-%: $(call skip-test, $<, "BROKEN") -# This test is currently broken: https://gitlab.com/qemu-project/qemu/-/issues/704 -run-linux-test: linux-test - $(call skip-test, $<, "BROKEN") -run-plugin-linux-test-with-%: - $(call skip-test, $<, "BROKEN") - # This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 run-threadcount: $(call skip-test, $<, "BROKEN") From patchwork Thu Oct 20 11:52:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616794 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp358607pvb; Thu, 20 Oct 2022 08:53:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Il1sAzohAJdkQtRyGQxGVVJkoqhUxFGStKlnqtYTcKGSjbS9ZOh6lAjkPsirT/ximn7LG X-Received: by 2002:ac8:57c5:0:b0:39a:6512:6e3e with SMTP id w5-20020ac857c5000000b0039a65126e3emr11872155qta.334.1666281228653; Thu, 20 Oct 2022 08:53:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666281228; cv=none; d=google.com; s=arc-20160816; b=eB1qrwSOYvlAm1wyaNpoW8jWJg8uqsuB5tvEGkiUZa1QJlOGBPCtRXGv5eptq1BsPs 6yWxJvKnH52DKh+KKD3TdFg5D2mYGqfu1ZuBOROsuE1OCs6xugiwhRyO2/R1Br1aocOH peXFZXGDq8F0LJPR/U6TdZAaPupMI2ERiPGHaatE7g0T0BzXxlaKRRjsYLm9Vza1XPRM ceB1nKYpSeoO3MBLwJjnkXSx4ve2eD2/M2FL083eSWeCZf4yXsfR71czTQjj0pDSX51E cPu7zItXyh8M0Adr6NkxTbB3nhlbxtjM+Y2gnDpKMuh+fEqkt3ZQ9fnNulvUYOLgrhZQ 1BNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m7sr6GL5lJZB4yWjZF5gxqBspzZ6Uelo42T5ViAMf8s=; b=WQRcLFu/EZ0WepXZDrEjSPaZ8qhYercXpPq/PTi64DARrEjuo/JtUmfG1dG248fqmF yEIrSsTNzOUVE/oqNNHMC03rv7azWfj7H2DojTsGRjJGujH9q/orX7k9/6ZQZUWt/+fX P5/DjjgJPcgMdUF4nl2+yyVP/3LWYQbPEOGj4clWaQ3f/IWYVL0CWGQvwV74cJ3IEzhD bEdia/AynOFIOJZqXgWQ8U+R5pN0jYl4E/Xsc2njrY/eUFwh3W0NrDhY4lIUtFSw9oN+ +F0jIXmlr1D75mXwy79FlCN0iPQP+GO8SkwO23dgUYbRu2MV0BE4OsovxVd4cKJlhoj5 1j1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fYp5WT/A"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r13-20020ac87eed000000b00399601d7853si10090784qtc.60.2022.10.20.08.53.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 08:53:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fYp5WT/A"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXrf-0006y3-Hz for patch@linaro.org; Thu, 20 Oct 2022 11:53:47 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olXqd-0000BT-JZ for patch@linaro.org; Thu, 20 Oct 2022 11:52:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDP-0000bT-7s for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDL-00050K-0m for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:57 -0400 Received: by mail-wr1-x433.google.com with SMTP id f11so34013404wrm.6 for ; Thu, 20 Oct 2022 04:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m7sr6GL5lJZB4yWjZF5gxqBspzZ6Uelo42T5ViAMf8s=; b=fYp5WT/AkF5xJsmgCzENpVosfUTaVkm84oDXMMAnSgCM1cyVGw8+CMfF6SdZf/asWB fer1rU1YZtzr5/T6A0j+GsFIDXkWyTSglf/rQ3iq+vvDRqTNdsF1iaNeqqQPJ3TppxN0 R7olrWwPFtnuImSym3908hNkSmeNMugioLPw2AngBw5mj6A5zZxSnAVxKFHQKv7HchIS YCNDs9XmAM+DYFE5FPZ5CwqNIIvBAeyRdjnMnJzv9WTNweCGzUb/rPw+aMIv2ftddmjk KwXcFxAld/F66hgbvZecAq6FKWQIti6QdnoNXz9FgZ2+UuYRS1kTcbmPt58ph8dngpgu uATA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m7sr6GL5lJZB4yWjZF5gxqBspzZ6Uelo42T5ViAMf8s=; b=B5RzRw7lZFbqb3Vj9GEE/NCOWQx/Va62KLNMCUEC68Sc+FuPgpX7Brw5CVrSOen7qr qMSoSmGiqrH3Mi3qPJ8gcTRyH4EFxdpWzWGFhJQ5LrtjtX0QpEZOhYpJ5R6M3dWUoe8r bpuF417ZnLCFTK03/XC42HsGNwBmj1/uTsxE2+vPMFxdS0aoOWKhspKZwTGxrwjmrA/A PptdeofaWtl68IAeQAVv4xoBgNmqIH0YMFNYtiSNqTvNbgXmaznzqESef6YzGuQBVUVp 2AWltrIpxi5kcdGEQQsE6PjIifw/fkTD6d1mz+hG3abqTM/4oi3r/9IsD4GzXXb4HDYS wkbQ== X-Gm-Message-State: ACrzQf3px4gZViYbTggsrTFSEOuFF4tCzyMz9yQnBOpA96LPPT0sQ2CK V/WlA6cSB3SIifimtMeP6JEJOg== X-Received: by 2002:a05:6000:1c5:b0:22e:3c0b:5c8 with SMTP id t5-20020a05600001c500b0022e3c0b05c8mr8211291wrx.622.1666267193217; Thu, 20 Oct 2022 04:59:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m17-20020a7bca51000000b003c6237e867esm2711807wml.0.2022.10.20.04.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 18E531FFCC; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Yoshinori Sato Subject: [PATCH v3 22/26] tests/tcg: re-enable threadcount for sh4 Date: Thu, 20 Oct 2022 12:52:05 +0100 Message-Id: <20221020115209.1761864-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This test was marked as broken due to bug #856 which was fixed by ab419fd8a0 (target/sh4: Fix TB_FLAG_UNALIGN). Local testing shows this is solid now so lets re-enable the test. Signed-off-by: Alex Bennée Cc: Yoshinori Sato Reviewed-by: Philippe Mathieu-Daudé --- tests/tcg/sh4/Makefile.target | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 32b019bdf1..47c39a44b6 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -12,9 +12,3 @@ run-signals: signals $(call skip-test, $<, "BROKEN") run-plugin-signals-with-%: $(call skip-test, $<, "BROKEN") - -# This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 -run-threadcount: - $(call skip-test, $<, "BROKEN") -run-plugin-threadcount-with-%: - $(call skip-test, $<, "BROKEN") From patchwork Thu Oct 20 11:52:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616785 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp326593pvb; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VlaD6616CKthSFKYAFp1rQFe+546RdAzyrHknhqTCUZ8/jJ+KGgyvyf3boxKD0vYiFax8 X-Received: by 2002:a05:6000:1a45:b0:230:6ab2:ac9f with SMTP id t5-20020a0560001a4500b002306ab2ac9fmr8898881wry.278.1666278392656; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666278392; cv=none; d=google.com; s=arc-20160816; b=BKpEl0X80lySpeo4x62eaUBhrPR0UE4Z7evKnNoaqBSOTGhg4VXE+vXkV3Bwg22JmF gRGvCdLDCnyPdvOZY4CZ/p3CbpsNxioDRBKxNp9R5IJemxwViy+HAH3K8Yk+JRIz4oSC cyNt/32Mazib9pBfjFLa989BUTGxI5hUeMI01Ke+5H5bgHyBkdFjqrXPzLX10pa8b9NM mopva3gChUepBQEYOw9SPSlkedn/oqsQBg9uruEcUXyIcttfr2xJHXF87QwRfvTaFxrq hSNgNwK04eqtak9pbLtUBSvvCME+lSQFTqY1QMfJQ0Do5PlN8hCLZzYAlWOnJ5LZ7TMm RBxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=Lx8SCWNqJUjtAcTNr26zLZlVpQLbiTgOnI0tck3gfu2qNCq2GElMDCr/BySAXzqcV7 0iY4fhOBcNieQq8M6LF71IuT9LrBYlbPzN4Fw2H24k34J9jFzPId816HiaBwm/KZTVg5 iQjywk7Ko4hbkNG5NRUiyvPUFdm3IpUZqmEJjkYhYViYGXA+a31/wa3FjXFXkTbp+Gqn qiu4bsnSDo1wnvy1FV3zXd6S/tiYbwOl/5aGDNXw1HYC7CQc9D9lQ3HDAuuzYgj/3uam P3xNRscmkJ9y/t0apYncNaF8iNxKwXN+bIF/F+E+3+suAmay6FgS+GarAUAvaSntggq/ f2YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YPp4HJP/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o7-20020a05600c4fc700b003c6d21a194fsi2445692wmq.83.2022.10.20.08.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 08:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YPp4HJP/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX7t-0004Pe-Ge for patch@linaro.org; Thu, 20 Oct 2022 11:06:30 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX3q-0007tl-Oa for patch@linaro.org; Thu, 20 Oct 2022 11:02:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDc-0000en-AN for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDP-00051e-8J for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id v11so4746022wmd.1 for ; Thu, 20 Oct 2022 04:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=YPp4HJP/I/GfcRzoVGIlfVG5vyddKmNdirxW1UnYMrzpvCtWDGXIZweKLSR4uomCCH eiZwvaNUbLTz/EOe1Jt8ZLTvxQaFb00AbCAwjjVGQnLOVAr41TGn5mKD1HWuHQVQ6qtV Qo03NAF0QJ8THzjXS7qIkSg/AcEG9yyX1w8NuKUvqnRqVBWnBmB5L4iOepsjzeiaNSWq RSuKHan83Y4phTPR9otKVWkm1px7wb43+5QRBGYos8YqrIWLBolUogpOH8wpuJuzcWMG KaLfezoxN/6nGWLmYITs6pA2/xOtXxQt0byxsYWnbuy54Ho7mQDPNLOdbrAr3xfzdk1R YwTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KbOoYrird1nsW/pAmizRbF6VSzex5qKXgg6ypuV+afo=; b=KNRv+4frn4j9COfnTrv1q3nxtrZLKea6DlZkQ9I+6GuEXTzDkx6kgKBsxGR0ZVnYvn uVfwkx42ZQdgbczmHPVd0RN9yZ+BpRN7nvlmiYzzifm0RS2yMxBLTAlTQrExi8CNJa40 lzveZcUGMVYbb74AH1ysoDKy5dLXmt6tDxloOpXMMo+gN14g2Ag2rzb9pfnvDz2LOqRe rFS9BPl9hDhPWiiw3iUQ+VK1ZkqGNeqSx/hVBkZ6VeGfQYzQt7Wj2pUYSzIpQmiTtUGn RRDcT+cMHbAuXGbOZKwe82U9DXaK1DmMShHn2a9kl0axF4MwaQMqdKIoLRDNunhFJbAP J3eg== X-Gm-Message-State: ACrzQf1E0MHg/32fS6yb9QHcnVcVbhHR4Z6v6j5hFvGI3Gjmv0FE21lg 0O/0CHLX6vNhqvCwd6EvrBw7Eg== X-Received: by 2002:a05:600c:474a:b0:3c6:ff33:9a38 with SMTP id w10-20020a05600c474a00b003c6ff339a38mr8427419wmo.92.1666267197753; Thu, 20 Oct 2022 04:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p9-20020adfba89000000b0022a3a887ceasm16133788wrg.49.2022.10.20.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F4171FFCD; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , David Hildenbrand , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v3 23/26] target/s390x: don't use ld_code2 to probe next pc Date: Thu, 20 Oct 2022 12:52:06 +0100 Message-Id: <20221020115209.1761864-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This isn't an translator picking up an instruction so we shouldn't use the translator_lduw function which has side effects for plugins. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Acked-by: Ilya Leoshkevich --- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 1d2dddab1c..f4de8efe3a 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6612,7 +6612,7 @@ static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) static target_ulong get_next_pc(CPUS390XState *env, DisasContext *s, uint64_t pc) { - uint64_t insn = ld_code2(env, s, pc); + uint64_t insn = cpu_lduw_code(env, pc); return pc + get_ilen((insn >> 8) & 0xff); } From patchwork Thu Oct 20 11:52:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616742 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp266787pvb; Thu, 20 Oct 2022 06:39:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4KHlvdiYxIF/y8xoP04xoPtlyBEVl8T6Y9MTzRcJtHkEJEKwU9eXTropdUqeQJHQpnn7NE X-Received: by 2002:ac8:7d0b:0:b0:39d:90d:601b with SMTP id g11-20020ac87d0b000000b0039d090d601bmr4094770qtb.278.1666273142887; Thu, 20 Oct 2022 06:39:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666273142; cv=none; d=google.com; s=arc-20160816; b=MrEHVhHCHzfWGGAfF2myXD6KxeKWs8KjxeoAD84AjK9SHXDGLeL8+XJGJFKVWtQUpy f6rKViOcdQB3DbwpH5dpihDlToz5w21wcI6uvc+2ZNpueZ2VmJnM19ZYQRrp1gP59MGH xnomsNnfy/0S/SiEzEtssjaqmvGrFtlI4CWL/oEr/3huj61VehuNubUTMjU6nZ5wQKMK CuYpgtSRyu2XsDmSZWdHrdsLd0JEMdtPYnuHdktdMOPN/EqKDjnNmmEWrYl4hSbioSMB 8i3FxNLpWBHrBYxo9HC9+SoICFItsmxgIg0thh8UL2ywJ//6GD4zVx10ysjzUseD28BQ sV2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Iz+OO37Rc1Fpza5z6M/NPmMQWlASISSXaZ/UQ65BqzA=; b=bRqe1JTcFtVu+VdlDfHZyGnUFcyd6liQ1v8LkMxIa9RMvbRu1PbxQyDU8hbNha6OrA NIXYeAhjdARqFuBpygP3i9Gsy6mDEZ1uUn4I14NZHf/9vbDOODArE8+Jyr9DkK+/77w0 71rVINF4BKhJulzc1w0sdqF8bkzz95p0nj0t2ZSUvZi9C6jDNUJaoJ1n5JME2NYF3uUB CBa1uOI4TNIsI7AbaHz0QoO5xu6DnHLDnHk7wtxsgESYh/gYcwVp/3xRqAO7vSpuzVJe yOhiVMwGcEC9BeB1t9ol+lOGlG74FJen9ne6PtRiTVmWQKTJku0cYM80toQtSsJZd556 z1HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i1OPlnvA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q1-20020ac84101000000b0039cdd13ac58si9886992qtl.787.2022.10.20.06.39.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 06:39:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i1OPlnvA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVl8-0001KR-SF for patch@linaro.org; Thu, 20 Oct 2022 09:38:59 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olVYv-0004Lc-S2 for patch@linaro.org; Thu, 20 Oct 2022 09:26:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDM-0000Sf-P8 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:57 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDK-000502-Vt for qemu-devel@nongnu.org; Thu, 20 Oct 2022 07:59:56 -0400 Received: by mail-wr1-x433.google.com with SMTP id bp11so34018642wrb.9 for ; Thu, 20 Oct 2022 04:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Iz+OO37Rc1Fpza5z6M/NPmMQWlASISSXaZ/UQ65BqzA=; b=i1OPlnvA3C1ZeWlRWrXuuGzDBnDLV/geOskE7mfOnhY75FX1aNeaHWQ715790tFP8L kb7XrwsQ8xBnV7gboRMQ08OJaJvcnrVrVgb1p3D6TvgMOjCTiUJNmNHAnx7SvjfkSfX6 +XA6Wt3DOdbDUE7nxFKaB/aO8JS37d76NWcfO+B1dm8sZw2cDACrBuw30JPNwjmZRqaJ SjMjwqffxUjuveRHG0Gq/Y0FLuEACGr+DlnBw3l88qqvo6oJFYJwruKnXbu0QK1uzQgt ztRIMIlsezHhwDdRGcEzbXIi1s7OomDdkK4MjwzYVe8R8Wrk+pSicQxtrx+kU5I+eo8S 5BoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Iz+OO37Rc1Fpza5z6M/NPmMQWlASISSXaZ/UQ65BqzA=; b=r/T+A7plV/gSmA89j5iNw9VorADCfcqxjcxry2yJ6WRrXJcbq+cBAq5P83Z5OFgxIB EjG1qSBPzdtbqZHTP1GCs/FtXiAUNxmCKz/8y2A3ZZnKucYE7gs6oQOBjbGejznw1oTO vFemosvZBS2Bc07s39TZ5hsLJ1uhasftgwG7wV5Mo0K2Qeote2+G3PJ6C9SfCfofTsnp fO04Hm0iEJ+/9oOQQ+/FD7zDh8RTw0KCcGGO/mOvFtTkha+6h2wctZYSgxiMizxiVZnV 0ub8t9qp5Ltp4tPb+dCZ7uSFbg/n/GLkxUdJEDeCt4llZk6VI9NhRvHUQ5PNupFTPgUs RD2A== X-Gm-Message-State: ACrzQf2n4CibzueLvdZzsE8cbUK3TPYHkilHPjeX3/rKP9QXIWw+Gxmi Eu6Jhbi/LXPmNkMzuXtw+2lFLA== X-Received: by 2002:adf:f850:0:b0:22e:7ae8:a38f with SMTP id d16-20020adff850000000b0022e7ae8a38fmr8210769wrq.68.1666267192066; Thu, 20 Oct 2022 04:59:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r10-20020a5d52ca000000b0022e653f5abbsm16570118wrv.69.2022.10.20.04.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 45C341FFCE; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , David Hildenbrand , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v3 24/26] target/s390x: don't probe next pc for EXecuted insns Date: Thu, 20 Oct 2022 12:52:07 +0100 Message-Id: <20221020115209.1761864-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have finished the TB anyway so we can shortcut the other tests by checking dc->ex_value first. Signed-off-by: Alex Bennée Reviewed-by: David Hildenbrand Acked-by: Ilya Leoshkevich --- target/s390x/tcg/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index f4de8efe3a..95279e5dc3 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6624,9 +6624,9 @@ static void s390x_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) dc->base.is_jmp = translate_one(env, dc); if (dc->base.is_jmp == DISAS_NEXT) { - if (!is_same_page(dcbase, dc->base.pc_next) || - !is_same_page(dcbase, get_next_pc(env, dc, dc->base.pc_next)) || - dc->ex_value) { + if (dc->ex_value || + !is_same_page(dcbase, dc->base.pc_next) || + !is_same_page(dcbase, get_next_pc(env, dc, dc->base.pc_next))) { dc->base.is_jmp = DISAS_TOO_MANY; } } From patchwork Thu Oct 20 11:52:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616772 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp306240pvb; Thu, 20 Oct 2022 07:37:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4CcIDlPU8LGGcYS1jqB4CzTORrrKqT6Iu+dtkMJ7cP0JZc5GVnairzL7iUOpw/OINkAFtG X-Received: by 2002:a05:6214:260b:b0:4af:b18a:b30c with SMTP id gu11-20020a056214260b00b004afb18ab30cmr11385768qvb.116.1666276648024; Thu, 20 Oct 2022 07:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666276648; cv=none; d=google.com; s=arc-20160816; b=x5xcb4u/eFd7KbMSE40ipsJ/LIHbjssV13qW5QtYVZdyCn5IzsUXndkv30cWQ53Ua3 b3eHCqSx/hCGP4rizdnwa5ZSYWJ+GL9R8mzCi1Xemus8feqx9EnwyoDddO+iQ1tz0UIQ JGlJvXSYM4b6GlOlKR1EfLdt61sqIFPW3GHSqv13nMX8yc3IDM77hDhtmYBL/hxCuLWG ygiFuSUKxpECl9McXSKEUt8MWHO0/VBIodBgbpSgakFrtlYPXdY6wAxog780DyWwzMWW 1RAFE7fYK0gXUWrzJHBu/Q6LeqhCBnS+Kbk85GaPLOMu9vozsOt/cw4uIVkkBovn/okQ zxbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tWnNbpGNLR82FODc2Xo/7qx//MiZp6GbXbmOras6p+Y=; b=v13rQ0hxUXBIUwTDrBC5RI9/zaZdrVkIYGolId+0icRiahskywNBu2zZxShKXKVfUk NYETyxMl1iX0zX5fz5ZN0YKA7iNfIQYQIsAIY4ckKHU5hEWPTL3kBuaUMTpVHYO+oIqk j/JUH3TDJy5y1vWQaMxb9ex0mFrhVxB3KRui8VUKOF+RmqIC+V0/R7h2vLyXIdDs3eLN n8xsAPkveFCMXV6jA/R6EJAEjIVN/DY9yhSbqrGiv3By12Iez9yIEJkxzsULrptDjqXI BC3Z7OzO2AySJARLlLtbmLh078gqSYYfgD9yO9DON6l9yDcTVmswEFV80+UrPcDhhLrF RC2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDnZ4KP5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gy4-20020a056214242400b004b7c99958c6si422742qvb.150.2022.10.20.07.37.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 07:37:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fDnZ4KP5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWfW-0005u5-76 for patch@linaro.org; Thu, 20 Oct 2022 10:37:10 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olWVI-0006L5-0r for patch@linaro.org; Thu, 20 Oct 2022 10:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDS-0000by-0a for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:44902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDL-000500-0X for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:00 -0400 Received: by mail-wm1-x32e.google.com with SMTP id bg9-20020a05600c3c8900b003bf249616b0so1996447wmb.3 for ; Thu, 20 Oct 2022 04:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tWnNbpGNLR82FODc2Xo/7qx//MiZp6GbXbmOras6p+Y=; b=fDnZ4KP5nwwnMb/SsIla+XHr46+PvEFS77fNHRwCgx8X90/eWXxD1LKCeE+N1/Moxk IravUwsFvPjRbNSqjBHcbj5Fr4f6BmQfIilr1wezt8Mt8GLaZ5VDb9GJcVBibl290W/Q eTHvIV0gUSMlnZBcF6+/it+pnxuS02YEvve183VbQhIWrVRtYqS146xRdt79yCruqGfa MFnTa1ikUYAdZeh2i+mQjyBVkRhfS59liy741WMFPRVNJqkMvRwniV4MuiHGXB4ThEgG YVsdljrmSR3GEpSFxCwNB0HE3CxJwJ4U5tXik3rck3PZxtq1MV6usi7moifuXT1kgFdX ZOUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tWnNbpGNLR82FODc2Xo/7qx//MiZp6GbXbmOras6p+Y=; b=faoo6w6U5jIyIjhd7/XsT0hz/K1Qd4ORbvyNvu0UlOQnK7B/8LcjhmtOaBCqCrI0xu uqYp8aiX1RP3DiXhvJMBapPBV7lYAte94sUIo0Wll8WNZHvkNAIU8XT7rVlD677CDeY2 krs76jXFPSvfZifrAuAjjTKGgQd9gcyuSeqDc/ZBZeU+sK+9qUgzoqQZJ1eQOPqkVt41 +05sQXYgkGDR9ylen7usU/3/Pz1zGO0J1j5sIUUv89LSnGmgRjLBQUBoyerpExUjSfw+ hYIuFcPxOHlykN9SmhvTxT8YlNE9+sepJKQJmN8dtLU6Hed1vx1SZ6+sz6GNX5SLQwDi 1Vgw== X-Gm-Message-State: ACrzQf0bdbcBnught4Rka3UCPV+EerWs0yOWbuoXlYjsRhZZC7STT2/w vk86O+rZttq2ZqY29qpf4B9hsQ== X-Received: by 2002:a05:600c:5388:b0:3c5:4c1:a1f6 with SMTP id hg8-20020a05600c538800b003c504c1a1f6mr9114744wmb.11.1666267191769; Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j8-20020adfd208000000b00235da296623sm1562619wrh.31.2022.10.20.04.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5FFB91FFCF; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , David Hildenbrand , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v3 25/26] target/s390x: fake instruction loading when handling 'ex' Date: Thu, 20 Oct 2022 12:52:08 +0100 Message-Id: <20221020115209.1761864-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The s390x EXecute instruction is a bit weird as we synthesis the executed instruction from what we have stored in memory. This missed the plugin instrumentation. Work around this with a special helper to inform the rest of the translator about the instruction so things stay consistent. Signed-off-by: Alex Bennée Cc: Richard Henderson Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich --- v2 - s/w/b/ for translator_fake_ldb - add comment to extract_insn - reword commit message --- include/exec/translator.h | 17 +++++++++++++++++ target/s390x/tcg/translate.c | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/include/exec/translator.h b/include/exec/translator.h index 3b77f5f4aa..af2ff95cd5 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -211,6 +211,23 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db, return ret; } +/** + * translator_fake_ldb - fake instruction load + * @insn8: byte of instruction + * @pc: program counter of instruction + * + * This is a special case helper used where the instruction we are + * about to translate comes from somewhere else (e.g. being + * re-synthesised for s390x "ex"). It ensures we update other areas of + * the translator with details of the executed instruction. + */ + +static inline void translator_fake_ldb(uint8_t insn8, abi_ptr pc) +{ + plugin_insn_append(pc, &insn8, sizeof(insn8)); +} + + /* * Return whether addr is on the same page as where disassembly started. * Translators can use this to enforce the rule that only single-insn diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 95279e5dc3..8101f5f569 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6317,12 +6317,18 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) if (unlikely(s->ex_value)) { /* Drop the EX data now, so that it's clear on exception paths. */ TCGv_i64 zero = tcg_const_i64(0); + int i; tcg_gen_st_i64(zero, cpu_env, offsetof(CPUS390XState, ex_value)); tcg_temp_free_i64(zero); /* Extract the values saved by EXECUTE. */ insn = s->ex_value & 0xffffffffffff0000ull; ilen = s->ex_value & 0xf; + /* register insn bytes with translator so plugins work */ + for (i = 0; i < ilen; i++) { + uint8_t byte = extract64(insn, 56 - (i * 8), 8); + translator_fake_ldb(byte, pc + i); + } op = insn >> 56; } else { insn = ld_code2(env, s, pc); From patchwork Thu Oct 20 11:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 616784 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp326589pvb; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5gbTw51LO5UO+Yb4v/zemHXsIJ6ME0Z/78lxkmfxjVq56TgvvV16l/TFMW9WGu67nAAf7a X-Received: by 2002:a05:6214:20ed:b0:4b1:cace:31ed with SMTP id 13-20020a05621420ed00b004b1cace31edmr11866028qvk.58.1666278392284; Thu, 20 Oct 2022 08:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666278392; cv=none; d=google.com; s=arc-20160816; b=IFVSLQ5FZ1DgZlxPWcvDKN0mbAcgr7jpIDuVm3d9zbu4229sSB5LVby7wgEMflM2gd hklnd77Y7St22Y/0+F2GEuAotfmX4r3E7J2KyqCHwum2JuqWS5gsq3Bfum0DQw5p4OfZ uTziaLWpJ0Dv93B9+zpf5UNQy1yl1Vce8G4vcdbQ2vIOQR77CPPw1kcDr2Dx2SQZsdcV +L7/XFt0toxs9NoxfAvJWTpMi8g7TeQg3o9pGjYg0uac1PwyPSxmS5Jl/Xs9rKMDJAuF UwZjcKP6Uq0D4kX2dVI5j3loVVnx1mwVm8hBFsdnSXZc7VT+6GFyDW2fn8jTSgkDrtqh vjcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uhZG6uFO7/KPb47lY7UPH3MmoXpMaIKZscxb3RV9Z/I=; b=up415WMtstfIo6bRftAn3jS43oMfYSjNU0LoVUib3FilFOSbiLMuK6Zh7zolIz3BWu WaRQ50btNbAukRKCDBVD4F+7fVcvbLBoQ4rk+4dX0KWgNKrjbaXf9jqTSETfo7v5VN6A QGW1cswxM2i5oOrdtccYcu3YhMpplJSpWE/oRTeMvRpdmIcIBk35O2+9wyCQd69dVjua tMlU/2bcigsenmM+2B+qT/n/7mwoTesl9o2SXM5eBw/ba6459MtbICTszFs5wOTFJEIk GW6sY0R/mmwqPO6ZcGWboUIYFSi42GkZnUX9ifbOuZiBBMpCFptmDef/RbUKOojxPVBj Fm/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NRPUxiRT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s4-20020a0562140ca400b004b1b522cf0fsi11243214qvs.53.2022.10.20.08.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Oct 2022 08:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NRPUxiRT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX7t-0004Py-Dh for patch@linaro.org; Thu, 20 Oct 2022 11:06:29 -0400 Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olX1c-0000m7-SP for patch@linaro.org; Thu, 20 Oct 2022 11:00:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olUDS-0000bx-09 for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:19 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:34500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olUDO-00051A-5k for qemu-devel@nongnu.org; Thu, 20 Oct 2022 08:00:00 -0400 Received: by mail-wr1-x42a.google.com with SMTP id b4so33967229wrs.1 for ; Thu, 20 Oct 2022 04:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uhZG6uFO7/KPb47lY7UPH3MmoXpMaIKZscxb3RV9Z/I=; b=NRPUxiRTWQHVWpV7iHcXJw7DNuDsvFu8fHOPlBG0ccKkz63/+3weTHMguoiYEZIG8i NEsISItHdVwf0ebLFi79CGC3jehMXoNQyRIvj+hVb0Ao3HdwXNIf8CoRBTjZSluer8R8 /aIume2tMOzpJ6HBF3m8uYRaTdyu9IufqU1iQR52DTRN9YSIAUZFZfaCiYScGr9Dlk44 VlsN8DsO2ABwjT1RuLlkVt2N1PjxiJ/o0zxKXNg7QeoVqZV+Gf5PpsrequGYrVv5VBs/ /Y0amn+hxAlpLY3rndu2IGj5oW9FLklqSSI7uq6zAOjzEfQUNJK2zUXrcBz0SNHDW7U5 7xVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uhZG6uFO7/KPb47lY7UPH3MmoXpMaIKZscxb3RV9Z/I=; b=1ckwR6CuduJUtkeyZAzN8waPg6NaxZhJfNwv/LD5QheakOmqox5YbR2bsSIzQEzRhr Qw7MYaPF/6P/Tm24TSX/heLoiDt0vuMApgT1dpfVzNX8tuvvBVezldkdZhotK9g06fiQ xlTHXt+teK5fK95b0kt7f/xfTnAZJ4HYXfugmJTu6i1dK45ENrW+bDQSUkUvcxDEhgZG UNFkSzVMl0wzK957wua7Up28WEIUWQmZ2ZB2R+Y+/vW08ELYxh8+HkjUTlEGUmASDREd 3w5kehCc2pri0ZfiukukCYOC5/XWooVRdf05R6qt5ime2842SXhPo+qQdKDFTiQPfJqo 2nEg== X-Gm-Message-State: ACrzQf1L9hqIpX3YflespzWepW3+Q6v85VeQwE+4cqbGW42nc+B5AX91 n+NIhCN0YxJykuX+wGFjO33ToQ== X-Received: by 2002:a5d:558f:0:b0:22e:2fac:d550 with SMTP id i15-20020a5d558f000000b0022e2facd550mr8729655wrv.652.1666267196639; Thu, 20 Oct 2022 04:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i17-20020a5d6311000000b0022e035a4e93sm15920919wru.87.2022.10.20.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 768481FFD0; Thu, 20 Oct 2022 12:52:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 26/26] tests/tcg: include CONFIG_PLUGIN in config-host.mak Date: Thu, 20 Oct 2022 12:52:09 +0100 Message-Id: <20221020115209.1761864-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020115209.1761864-1-alex.bennee@linaro.org> References: <20221020115209.1761864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20221013131304.623740-1-pbonzini@redhat.com> Reviewed-by: Thomas Huth --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 8c2c4c1a04..4275f5419f 100755 --- a/configure +++ b/configure @@ -2486,6 +2486,9 @@ echo "HOST_CC=$host_cc" >> $config_host_mak if test -n "$gdb_bin"; then echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak fi +if test "$plugins" = "yes" ; then + echo "CONFIG_PLUGIN=y" >> $config_host_mak +fi tcg_tests_targets= for target in $target_list; do