From patchwork Thu Oct 27 18:36: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: 619222 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp514721pvb; Thu, 27 Oct 2022 12:27:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM62gFCJD924MIFQiT+kneea6DWBqpWnSo7QtYdF2a9bi68Z6Yb/hS18TA73qB5WSs3hLTbJ X-Received: by 2002:a0c:a98e:0:b0:4ac:929d:216f with SMTP id a14-20020a0ca98e000000b004ac929d216fmr43492653qvb.16.1666898826526; Thu, 27 Oct 2022 12:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898826; cv=none; d=google.com; s=arc-20160816; b=P539XEsKPtHU0smPYOmSzGRH1Bm8/tDzV7tYmcTa9tm4cyVnC4TxanEaXf88CM1Z/+ d9tVwRuMPyWcxi0R/a5L+ZYMGq3+6nhvf6QS7BB7sSYFgwZoDZ0/swYv32CH8CG4FtvP r+oRM6zCDpee/6i3CL9JSONMnZRO8K6OysV3t08SEfyRM3BVA+Q4L5BdWFEkHIPUeOoi 7PoD1pk5UDyFUuhKjOxilBKOHWCnbXjXfnrVb9qhOqor+A3xnvG9ueNfg/KpfBiTrVnF SelT5IxPvANtQsi7C5CJOJyqhVmMBLBQDUHAAEHXNQwLJOGK40sR7SrNzrExFjGtnw3o wKpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=x3MhZLZxrio97OlZeNB/75dfw9djEzQE18Dt849P+uaQyYaKGnZZNCVtX0DfJ8UzXJ XWXCbX3Qy1im7V9LSI7kh2cXwEb5lrUsTGkt28xb6jwnZUsqLb74tJKeQ/tW0nIzlVmM f2t6zo9RX/H/rhTIDp9vn0doPZMFDP0cEwTeQtHux3D7MAe8mn2jEk45OWOJuMtzGJQJ lcql3jb7yEL8eCRV3emSDxu8AfODIf6QNZAhC6Fw0CPtAn+pNsydYM08awVhqQ46dcBn oIM9mkSH+Uz6f5xp9HcOAlxlkX2rywxMKVj1Y7X7HE1/2ZefdTpFzhQrF8fCmQusEmUj 0i3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ovp56svi; 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 g12-20020a0562141ccc00b004ad71b0f585si1445053qvd.15.2022.10.27.12.27.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:27:06 -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=ovp56svi; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mK-0002O5-Bp; Thu, 27 Oct 2022 14:38:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kG-0001MK-Mq for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:49 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kB-0003KR-U9 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:48 -0400 Received: by mail-wr1-x434.google.com with SMTP id l14so3700135wrw.2 for ; Thu, 27 Oct 2022 11:36:43 -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=ovp56sviVwcDibLKXCGaUvKeMZB2pyY99uARSxYiC0/7YDfDAJEZDVT+8eu9A3lpyl 9POe3vjMrZtwR6oG4nn4Hqecn0C+kKswTr9tEnzGPBHT5Bx9vkRX8ITPVtPI3bCR7q4R 00D7OduDAyBqfHkrpyMIpuZwQTOuf9rbqy+6Yu41gAWgyMSQRPyn20lk2o5gtWhdiIt9 Jw6pSEQGQEuVLj/GeRVLH1rnFOOXrpsjylXiJoj+fhTjRd9poEHEBeiKTkpM3ZGnn7pC eXs32YwVJWlXqlXt6z0WiDvdqZ8hCMDYdQ9WTrg/5jYJgLBbg5UhhO6eyl0pk7dLQ3Ua 7ysg== 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=LOjs+Ai+JD7dX1DCtWqnql4lstDyxBsCB706ywM+8ES8VgyvbiGCFwdxZ2639OIDq9 JSqNc7NnaKxUR1dXW5vY44UByEMnnjV2cPXoAAUBaDwoCKqEUIWW8YZ73zgoCT4HBvkO n8XxtxIDE0qrG5V5Ce2c0huqgoJAU6l7yHJDHO54HxdXahJ8qX/upYXL92Tjpk8HC7ow HLVY4Np8S/rrz1E0drZKFXe3ARr2/HMTggFgC4Fx14jEXvV6DswTfNreGGqQ8JYGCNJr 4qBV8QrqbSnNYm+8EUFK4ocg3nbbjIvZoLkFN1HMlXJMboiFnTrciGH+wMKkyGyBTfkO YnaQ== X-Gm-Message-State: ACrzQf3dVPHN5j13bdFxCdj0mvqBdlPlbUAKqL4ccv+IYMTjOChIxhg9 k/RPHDzcJSMYVB6+ZvH3zhUrjw== X-Received: by 2002:a5d:6589:0:b0:236:52af:3b70 with SMTP id q9-20020a5d6589000000b0023652af3b70mr22197650wru.349.1666895800371; Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f6-20020a5d50c6000000b00236576c8eddsm1770579wrt.12.2022.10.27.11.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D8C21FFB8; Thu, 27 Oct 2022 19:36:37 +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 v4 01/30] tests/docker: update fedora-win[32|64]-cross with lcitool Date: Thu, 27 Oct 2022 19:36:07 +0100 Message-Id: <20221027183637.2772968-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 27 18:36: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: 619213 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508224pvb; Thu, 27 Oct 2022 12:14:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM49YX5jyJ2yhliMgj8xUAFy/0qBRjsjbHUFqMiH4zjzLhr70nJxpphvv1DoLBVVOy6m30Mu X-Received: by 2002:a05:6214:c67:b0:4b3:fe6c:9042 with SMTP id t7-20020a0562140c6700b004b3fe6c9042mr42559340qvj.76.1666898067116; Thu, 27 Oct 2022 12:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898067; cv=none; d=google.com; s=arc-20160816; b=SXA6Z/4RWwt9gps0HZtl75pUnrRryordzEVKU2GMfN/GjADtTiZPoyaAicTNCj3LQW 8CDDtB9XSRkCSlA6vPH/MlyWP0YoecGh537encEtBrPxe93+aEW8lZ/eFVstaZhkqwLD MpGRagr8vVnAdq+axwWVJ+4QwOoJdHXu6HGTvstwQrV//TSi5uuvPyXq49+cu7pKCWxU jxhPjHl+fGiEVLU8RAAvEWk2vB+7L7PS7F6yE/klVzJ40z3z3xFQ3QKB0M6xoyOjQUBP gzrctcDD86Rsjgw/XeO4vuQyazDPRYWQjNE313aL0n4aJnjmjPnKEA1i+jBG2c3bHLiU +eHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=rC6risOh2XBqXX++ZESZFIqJMAF2vgQkukDT/m64e+y5mGA+xvP2WqKei4da2vlIIE SYxsAWQuadiUKdy6HukCgEEs789/j+6eNJHxaHh5bkYSWAU7JotfAtOZ83FBP7/doLVf jiYgkBLvxGqJcDklLy7fu0eLaLi2+aqB4D5Jq7ol5J9mi50a4xytkzGW85yuRoZtp3Yr m9fOtaMMgfRcilKXwtvJrjvp4Phig2mVIv6gIMG9pgYdWJe+iMZ+doMwOsPOGpWkqcpl fRpIWVgRTfZefjLzU/XPrIbVQM6h8/w11sAU72/MuUVGbYofqsG8ohIMnHE0aE7kmMe4 /eTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pHOv8Uam; 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-20020ad45bcd000000b004b18caf88bbsi1389970qvt.360.2022.10.27.12.14.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:14:27 -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=pHOv8Uam; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7m6-0002KT-Dj; Thu, 27 Oct 2022 14:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kC-0001IY-GZ for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:46 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7k8-0003K2-Pr for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:43 -0400 Received: by mail-wm1-x334.google.com with SMTP id az22-20020a05600c601600b003c6b72797fdso1850935wmb.5 for ; Thu, 27 Oct 2022 11:36:40 -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=pHOv8Uamu6/sPu+bkKUNHuL6xrn/C9MaB7gjhEUJTjOuykWZQjvp/19p1eyTTrdSd1 ZDCk1Z1+vgnCEwXqpSjZQrtJgnGvtd+Zruy+NGSyPQ9votoLUZQC6xbqZQBgunOgSIcZ Nn6YidO3uPVV4xYtYImaAFCuhwigQza0DAbGorktQyj7A+51TpKhIBcboXvFtI8vaBqU Pc004JH+6HRacGneaoLaxE699s9QbmV7SYSwFXudoMNdwpRIvcIa4TYiNgvH+bAGMovG zm9zNVeYQRVUqj0ywQTg7SzEpKAV1dAxqHmdjfdiFgfvuMmeEwJJKacsKQLYIaKu80HG lXyA== 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=0vj1cBEbenyUWXwap7SSxBtwWBdM8tRP2cJMchK1pSFsikuLHyPegBrcdmGM+GjcI7 DIce9b57WQtqXeMBZZwyIaOiZZQRb1DWEWoeyDo51bpruAqFEVi7A61d4hWV51OegEL6 jOPJthGPKyRTjWdDJlEC/Lukpxp+x5U4nLCfLHPHmfKIcKtDbhhIP5J6sm9NSNAyJ1jm NFPXkdIeUjtBT6hA3B33A6fuWTOeJYjJuK8X5QV6Z/YnBpvUOkEeJN5Liw/R/z4707CN r5O0C7BG1fuuhSqzQWBB6A/gHV5znU0VeEa1hmXWD73c1KFsJzyDMJgJtY9NY27QjAbk CNjA== X-Gm-Message-State: ACrzQf1iaYORHzhprJgRLQqx4USmGVTSJyyu988U0qT1B6y9p0W2prkl d3ZMA/S+bIqMpHGQNq8OYinfFg== X-Received: by 2002:a7b:c047:0:b0:3b4:adc7:1ecb with SMTP id u7-20020a7bc047000000b003b4adc71ecbmr6907644wmc.144.1666895799012; Thu, 27 Oct 2022 11:36:39 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d13-20020adff84d000000b0023682011c1dsm1720871wrq.104.2022.10.27.11.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BB851FFBA; Thu, 27 Oct 2022 19:36:37 +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 v4 02/30] tests/docker: update test-mingw to run single build Date: Thu, 27 Oct 2022 19:36:08 +0100 Message-Id: <20221027183637.2772968-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 27 18:36: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: 619201 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496739pvb; Thu, 27 Oct 2022 11:53:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Y5NWewaB5wmNg/QYDYW5WHHwLN9mbHaymr1THdLtMFQhkxXV1fNEHixJHgW5c8iw++aLD X-Received: by 2002:a05:622a:350:b0:39a:286b:1b21 with SMTP id r16-20020a05622a035000b0039a286b1b21mr42157995qtw.427.1666896836955; Thu, 27 Oct 2022 11:53:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896836; cv=none; d=google.com; s=arc-20160816; b=BGfrWMH3lemBoSDWFqpTnkF0jSlIK9FLTtlPWrzGTofgZmGoqnNqLbuTt7hCmaUDXR DFNWS+LFb04nAn+9J4weBAOJtYMalOKIeV50Scd/R0PkYEKNSOHrE+DOv2jtZLd09bTV nK+tO/RbNl5VpEIZhNV94g750m/9FYmiPMleiIQQs279sDTcw899a9jyZRkFsX5DWmkc fBeMHBIND+qyUsQFbn+yWB0wlRKANArnvxTWCuGpzcAW4vcct/mDKxxmoD5I+FtbiHal u1QPfMU8KtSZ4vpBbpMftpXHB48B93w6uENV1tSXlfNKX8ImX20atTz1FRLnu3z5dx5Q xe+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=qXW/Tz2FYHj+TG6WaYeDViQAT3icz4raiac9ciYbCHA=; b=Hv3555gA8SASUKYQ8pWZ+C/KcMNeWnyo4aLMp+sOdnz2xwoMyANGU/ltDNvgVK51R1 km5F6ZBibde/ucNSL5gp4chOTmGfC6JalljrMUxA0c4uf8ldbQgderg2pUV8l9Ce08h/ xyKijexvnxv/PJ2nm6JA9OznKb+685+cBKiUMJ2lAaoJ4BJIrOw5x+M0vseII1H0Hvzu dMn5t23VgqPJgSkQP5EZ8PrjXJXZXRruQeuXixCWE6I+Ht1je56KFz7ap93IKTpwtf/q onZYvZlQapaAkIhu9RHaDz8GRLAzFi7Q3KIkm252A85p40TJ+148ihhi5tBxVYOwlCv6 KqXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yNli4DA+; 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 ESMTP id u4-20020a05622a17c400b00397ff27bcd9si850160qtk.569.2022.10.27.11.53.56 for ; Thu, 27 Oct 2022 11:53:56 -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=yNli4DA+; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mF-0002NY-ND; Thu, 27 Oct 2022 14:38:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kE-0001KG-8R for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:47 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kB-0003KQ-TO for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id b20-20020a05600c4e1400b003cc28585e2fso1866349wmq.1 for ; Thu, 27 Oct 2022 11:36:41 -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=qXW/Tz2FYHj+TG6WaYeDViQAT3icz4raiac9ciYbCHA=; b=yNli4DA+R+ExMNoA2PLnM0zQm5ljuYjkAN4rQczxeg32BUeBd31rt4a7lnea0qeFaI OOJM8xmoXHvDQRhpy7mp0emWrlsc9LOBwVDZRJjCGs17uR9Bhi0P+lP3I60hSN2zSVLR QzoqhUQVLJ4x23f6dTtzYCv2S723NA++ZguaKAGRVzYp1GS3cCxQu5yxPYJqkU8BI7PP iQYUT5UmqBr3mftgiDSC2NB21Bu3dpjEBnLGJDsyoFWF/Ye974V3IaVnrC4WBtkRkzAo e3qyUd6l6N+aUl7TQ4CMgIL5YwBnmRW/I6BrT0JeGzk5kRrkI6t8+Myn0oY4fD9db+1t Vb2g== 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=qXW/Tz2FYHj+TG6WaYeDViQAT3icz4raiac9ciYbCHA=; b=hN3+gty/V0C/6tP2zYXEK0YgySqJKtk62rfpHeHdV5wYPXPq5Jsy2H22B9okna3CQE YWW0wc6ikSYEmRvJ0RVk5db1/l9bgR3jlrsINLMIFWlstU2HCemwJBdnCW/mg40bRyr3 hGE9zL0UjAhKGCyrA9PwZXTQYtMMjj+9hzUPPKWL79Qz31J2VGI8ujkC4e0tH9bLOiDH LYEUEdYP6De1fFLAGKILZuh7F9VIazX3NGR8n9fCe6L/6SZ77EL/IBV6iPvd7U65zOr7 N8akBKMk6uMhs4m9pSOVf4T0Rab41BQiEmVYLVQUfVKivd1EY3899zQ1eH6CvZYgqFrU Bj/Q== X-Gm-Message-State: ACrzQf2p4D/IIz7t5kKMVklfUTBdAMx7mKzW6V4sqHXH8VuJaf+IsHfr lUpCBp+WO9nb/Um3ip/d6L/6kg== X-Received: by 2002:a7b:c40e:0:b0:3cf:497c:c515 with SMTP id k14-20020a7bc40e000000b003cf497cc515mr6936923wmi.41.1666895800805; Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bn8-20020a056000060800b002365921c9aesm1948879wrb.77.2022.10.27.11.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A19AE1FFBB; Thu, 27 Oct 2022 19:36:37 +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?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 03/30] tests/docker: Add flex/bison to `debian-all-test` Date: Thu, 27 Oct 2022 19:36:09 +0100 Message-Id: <20221027183637.2772968-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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_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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Thomas Huth Message-Id: <20221011173229.57909-1-anjo@rev.ng> --- 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 27 18:36:10 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: 619224 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp515132pvb; Thu, 27 Oct 2022 12:27:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5S6w2SZavfb2jv2+QrwpISphcvMzMWIFJ+J/he4bjwaYuVcd7A6YUiLeDzJwD0C1EnrTGw X-Received: by 2002:a37:9544:0:b0:6f8:7c2b:4a1f with SMTP id x65-20020a379544000000b006f87c2b4a1fmr9538207qkd.563.1666898875550; Thu, 27 Oct 2022 12:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898875; cv=none; d=google.com; s=arc-20160816; b=QsSd6HE4jtocD4KpkWsfFts9OG/ZS43S8AO5M1Xt2f2+H0lDB0aM5q/ineqOKmpQEP 1fhkVP5hh9OHX1Z1EeA0ayHwvJhuHQzHiEtIHYtG/G7ihyl3qXeIKNw/D/0um82XS8of HSMCEkeTQ5s+hPFMjHZ9LmfqAJfB18dln1uz4TIQnHo7+xt+87Tu95gZzuvtmLKgY9QS b9SDNlrkAmuC6IKyVPumVD5KXnAxuixaRwf5Kiri7Y5bNKtMNxCti/vPc9k95udgmT3W 55hH4Z5Brn+K0xXxUbAAZhiFG5kwkkorPZKfxcduPgiQa08zntgJ2dURcXZ2PppJ19pf fR/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=x2Q9F5jfw1PO13TKDdtZUG9sxZWS2VGpFFbrnf7gsiA=; b=CFKgiz4AG6GD5d7NNToi6ZAVJrVNIT+3SjgG8Q4x9gDKTRsRCqp7mWOUbk8CfMNqAX v5TprWNM1M2j90uGTejXprT6n51WeXHgtQ4qcM7OV8dsnKB16WW00aswavme3+lKtfht m2PjGRaRv7YEB9JTl2sbq6L/l2DM4Muj757ZDzt9dUJCPtHkKSBjdXhD1Av5BsPZ+PIA qJqEU+hjNRPa9whYTxDSr8Hji85be0ZlOQwRsuyk9dzxAwwKJXK8PskHevo12l0JlZsi kdCiQE3wJybImCqaAhUn/EuRkK1uQqakwFC85BLhWHX/kmc3tt/JvWnU5X0Grrz8eVo/ RKZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QdBFAJhj; 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 x20-20020ac87014000000b0039d03692c69si1356066qtm.476.2022.10.27.12.27.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:27:55 -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=QdBFAJhj; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mD-0002My-L0; Thu, 27 Oct 2022 14:38:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kE-0001KE-5a for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:47 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kA-0003KD-R1 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:44 -0400 Received: by mail-wr1-x42b.google.com with SMTP id a14so3689049wru.5 for ; Thu, 27 Oct 2022 11:36:40 -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=x2Q9F5jfw1PO13TKDdtZUG9sxZWS2VGpFFbrnf7gsiA=; b=QdBFAJhjRMSlKkrXHuSmdkm4yrDq80ocAvb4BDmQzBYrKC9/iS5zO5oJw83k90x+SS AC0eLLVKfbTmM4/73E8RBiObaq7WFh+kFQP5p8Rw78ss4KIpH0hFQ7pCTFyhj2bNyGAe 9/d0emDt3hyeCsGomMboFqEKAfa8kF8UW2VDqpjOakVtQ/slKc4IHEFzGhuv+AZfXkfT uWfPF1C3Zx0/KBC1lY9K+pZbA51ERMgEIVfSNsa74z7ZPaFsDLtFrUo1O00uAlF7Jzkl MkQD+GUlwyTnF1KL2T9R2v7b5BWpJA1YDklVgBEu8/t+CoyPLUaOTjqPGcfsPlaWoYaX eWtw== 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=x2Q9F5jfw1PO13TKDdtZUG9sxZWS2VGpFFbrnf7gsiA=; b=J8dW6odU/JT7+P+ff2Cxx7Wz5MDMXjhq345Vcu3k2xfZoQ+nas55L8YzyuBsHU8WxH T9Cs+4uxrsfnW7YgGrbjgbQu/hpZgd1PjSSnUTx+dd8vj0UCKUPxPxg0jpzl6kMhYnIk yeuwfYjHd/+t1+UopHstEgkcDxIdtTnc113dHf3jLPYap6ceoYovZJwqQzKcDZoG/2QD w5CMtifkLAcfoZqgdcXfuEZO+ZuHMHUr/w6TfgDqmbr9waprzDi/1+MFb/cDDcdnrTFE xs8ESXt+JaYGNAMq2Xey43TFMrvz8mcp9cU25ydol+znGnjdrcNOl6cWb5/lTMssqhWU MSBg== X-Gm-Message-State: ACrzQf3Ewjk6jEvO5psBHWpOoy+Jdg0u5M/QAJUtbBd0kElRhBX0ToNR CX1KD1gJr72FapMS9jw3uNWejA== X-Received: by 2002:a5d:5f03:0:b0:22f:8ad4:bd46 with SMTP id cl3-20020a5d5f03000000b0022f8ad4bd46mr31843262wrb.120.1666895799949; Thu, 27 Oct 2022 11:36:39 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c12-20020a5d63cc000000b00228daaa84aesm1737045wrw.25.2022.10.27.11.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B85331FFBC; Thu, 27 Oct 2022 19:36:37 +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 , Thomas Huth Subject: [PATCH v4 04/30] configure: don't enable cross compilers unless in target_list Date: Thu, 27 Oct 2022 19:36:10 +0100 Message-Id: <20221027183637.2772968-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org This avoids the unfortunate effect of always builds the pc-bios blobs for targets the user isn't interested in. Reviewed-by: Richard Henderson Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée --- 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 27 18:36:11 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: 619197 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp489708pvb; Thu, 27 Oct 2022 11:40:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4PTsKdWURG5i3I4l8ylqq2zJgdSKguGydx559H0JX4lv2scgxlONgnaVmZhgleDR+9ER77 X-Received: by 2002:a05:620a:2403:b0:6ee:c92c:c292 with SMTP id d3-20020a05620a240300b006eec92cc292mr35817537qkn.395.1666896044337; Thu, 27 Oct 2022 11:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896044; cv=none; d=google.com; s=arc-20160816; b=TWSWgCEMw3vsyfnPT6KpNZaV7kQgCygRmgenPVeh0mzWEFOQx07b/9Q+1ScI2DKgqn i4VN+tACV5WkJNHG/Nozm5IP/YKmH2CpUNb5rx8uaRYCwAesWlDpPNUeUZHrhdEfEPQA vBYpHEKRgOKCHpS2sOTxolEHYiFO1cQSqtC4Cm5QeQvxmQA1sGuy4cWLorHY5gb+qySF BF1YWK3c69nItFyesh0YBxPkMLSXhWR5tpux5dF2QSi2YQz4i+94OW4on6cDNcr7CE59 6K37Fxh4k4ySuw3S44cYyplri378MLguunX9Fwy2G1b0Er/O92VD7cJt0YHBPm0LZ/Ch jjJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=GnES94/DJeVFvfAsPrcBucSZj64IFR2JBDhsiBY7Dis=; b=hGGAdqeTfvt5JynYVS/96c2epZyHLmZcc14OOv+yqLjQmx/FDnLh3CIeVFdWEruOAe icJsLyr97vs3nRG2TZMI7a7KT0KHFV942eNMbsLJu/lHcOAQMNB+hSnXF7TodzQRccYe ZutEgUa9h2CV6MEhWqcp3SuHYjvV1ZZF5ZWu+WjUps+c24tJ2daV8XiX1JuvNqjWfr/1 3QCvt2Ziql3xicbntG8PxrK6mb/UeTLJj+Slfjt1FTv7efklX6rP54LSb9vi1aoJEYAi XSyrRNuwnsp0X0kFyFM11rE91sxqg1S5mtFcltQPpGDO8RNv5H8zs3wyV8qpYv4DTzz1 35rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mpacPcsz; 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 e15-20020a0562141d0f00b004bb7d1b570fsi1296062qvd.442.2022.10.27.11.40.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 11:40: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=mpacPcsz; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mP-0002ON-IQ; Thu, 27 Oct 2022 14:39:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kG-0001L0-Pr for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:49 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kD-0003Ka-Re for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:47 -0400 Received: by mail-wm1-x336.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso4816942wma.1 for ; Thu, 27 Oct 2022 11:36:43 -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=GnES94/DJeVFvfAsPrcBucSZj64IFR2JBDhsiBY7Dis=; b=mpacPcsz0mRaCu8ruJSD8UZANSJM+Zg5a6wPQ3FB5RFyrYIJd4/sIt8k0goOUS26gz LX6ErzLd/bt4+dpcduW+mVsyP2WwTvPMM36FnRQhcImIMfwDaFjLQw9BD4HsbRF6pwqj bhzJ0au3av13Et0DccgEL5fSxjnDKF/RzxO5GThOmZmobkt2VlO4CfdqdjvkOjgxZxak fk8fwtvo1oMPIr1QNP41Q87f2nXUaTMW9fL4L5Me/0Wpu3DvMjOqGgDeE0rEoeCkWysO RK00n+qFY69LyIxO20/hvIfDEM1L1qmDhpC+ntcLrJtfLf+zbwfhuMdfEfHL0vfEHiuX ZdGw== 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=GnES94/DJeVFvfAsPrcBucSZj64IFR2JBDhsiBY7Dis=; b=Ac5PzoMRNAzmxHOCu0E7syY8tdpG3q2YJnaVE2r1KudHntKo705//GlrwUfis2sirm OZoyH/dZFerc+yjcwgCaC3IOlgQE0cWVu1orX3yhjQhhelysVhjHJFh5ekh/7nhtXlbP xTfIyDMtuggO5KHDBBB5wyoUDXUg7J81y17VInas8b8XX/dPjZKECjc+DnKwfZTHf1fQ 3jU9QS8rwHTiwJQE/uI669EDIBhMrc75WYGylDC3SKhrRkZr4hWKQRyp9VHjMADkyQ4q qubHB+hLwGAaSD/Tb6qDBq3L6DEPAUVP2GkZITjI4ZxsBDkXyUtsPnScSuYbAnGPqanR q0Fg== X-Gm-Message-State: ACrzQf0SuS9ZhO4bQJfWyovXP6eayb5Q2NahTTPQ7RXq4hfS50d0FG3b 7Z3lJCD/9f0Lzrxkxs9O9u9IclHQ6qYuMg== X-Received: by 2002:a05:600c:4ec6:b0:3c6:c469:d295 with SMTP id g6-20020a05600c4ec600b003c6c469d295mr7008418wmq.117.1666895801782; Thu, 27 Oct 2022 11:36:41 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n4-20020a056000170400b002302dc43d77sm1915743wrc.115.2022.10.27.11.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CE9F91FFBD; Thu, 27 Oct 2022 19:36:37 +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 , Thomas Huth Subject: [PATCH v4 05/30] configure: fix the --enable-static --disable-pie case Date: Thu, 27 Oct 2022 19:36:11 +0100 Message-Id: <20221027183637.2772968-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org The previous tweak was incomplete as it missed a leg. Fixes: abafb64b6d (configure: explicitly set cflags for --disable-pie) Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- 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 27 18:36:12 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: 619215 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508393pvb; Thu, 27 Oct 2022 12:14:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM43YU6mYDZ8VSDNJqeA8fNXFre+IPX2ZzW35euo0NrvDT8zOYXtZ7vM7wHpD0VnqaO12NJz X-Received: by 2002:a05:620a:1a9c:b0:6ee:8edc:ab47 with SMTP id bl28-20020a05620a1a9c00b006ee8edcab47mr35836137qkb.575.1666898083731; Thu, 27 Oct 2022 12:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898083; cv=none; d=google.com; s=arc-20160816; b=xBD+VYOlkgKTNFm4cdvPF+9JH4oFbKofAgPvx/jBJbXG57JOq3W9mdK6x8rqFpVh1r xtGX0/9mJfO/fi+6PCBoOn7tMEbFqhZzPwk846T46q5VqsPlJr5Ovd205hrThkL6aEEk NbpEcYT3ud8Uv4YgZ/2+ziLTW3uTywyFLrk/2t8aLhQQQRacnfB/0H1hazO6vYXWQCln n8srGnmlRXL17QUjncmQvMO2peb1AeKdy6/1Qm9+FQDdAsRkMVH7u0Y9rXbCO95Bi3ey ZSOSl9PsRCBGj0RvjCKDp7i88Q91Dx3huGw+q8Slk9ckPLsl9LkDfvBOrhl8sP7kncJx c6hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=SSV2M2TaOkBz3H1pNIrEz9QmnZN3kQHHfUnFpNuFNFQ=; b=SyYYh/GodZJ2wG9M8VkyMK6R09pP7zmWlA1tTDyRK2w6VxDO/0oJkeNx16hQ54q6KK 8k7650QYLtSyKrkGb+hZVgMliykvVOawdpPKlwow2ttn7EMVVYSeFUu7BRyctDXoYid0 qb+K3CxaTVCL/yuzZQyeBuLVldKfDSO5k1Tl+jldCK9jhVtdKyCq2HeEJtluMwyW5gGc hTO5EwZwhRFmmt0ysfV+8ZGM86m53ZBUAGltzF50w/gk5NTg7z2X7q7gCQcgkW03/EdY DnpqQpnGxqsxV2/Hd+o4tiA1/b1smLN83FYT58lO3v+zKeGJ/hfc3duhQ4m1nvprtBEs KRDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IytWpcs5; 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 l19-20020a05622a175300b0039b0a041ab3si1611564qtk.342.2022.10.27.12.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:14:43 -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=IytWpcs5; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7nD-0002X0-Ra; Thu, 27 Oct 2022 14:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kN-0001Qb-30 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:55 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kD-0003Kk-Ts for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:54 -0400 Received: by mail-wm1-x32b.google.com with SMTP id i5-20020a1c3b05000000b003cf47dcd316so4808558wma.4 for ; Thu, 27 Oct 2022 11:36:43 -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=SSV2M2TaOkBz3H1pNIrEz9QmnZN3kQHHfUnFpNuFNFQ=; b=IytWpcs5g774MG4w1ubP9s2/GSeJUwkSVlutiuaub9cjb10gPNliADmrWvTbEF7Vd8 sS54fIJ4iX/WzyOnObVrSGT7QaZvykkdztG0dgh/jDmtuuSl9N7B0DCANq15AfdGV11y s5fqyzzXsmiPkZNrZdo1G1zHIfqoNrP+zNu4OidZsQo6PN/7yMtsbVBwesqGSMZZzVwS ksfNos2hUlc8+seIwNpgEHqFkKvpPY4knA+GigbeaTjWD2QwoZR6Gm8i7e1UhUk38qH6 J3LwJR24HBQnbSQl6/tynbcEhBqT7j9HQiE1lxYX5zb4hEexDPZb/vmi8dBeAg+pH079 gQlw== 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=SSV2M2TaOkBz3H1pNIrEz9QmnZN3kQHHfUnFpNuFNFQ=; b=VIjdLofngJ39wCOBtqjFDndwyRmgTaGrDPfmizw5id9L+Xyzs8EcavYhKzNnG7q6WC 65rEeSc7rNFVTvzrzxSC+0XPvc2PQpERf0zOOwH22SBCvR+AVJMG2gMTv3hO9jH5uFlp VDxSQPP2XWThjLKAv5m3+S4Zm5yoT5PUwutfOYpIe71SJfTgSDFhgm2bwitUTFwymvon rxCt71HGSjd/6Ngt7tLhwxAsGN2CJjyWltsLcs9rE7b7zFdqRm4rPAI5MXy/1MzV8kqV g3FZ51blVyf+2OSSO0VssKw0k8FKylGeNOyhtbQLIbIVzwg/84hrEMbNYx9ldMF1k6cn erwQ== X-Gm-Message-State: ACrzQf39VdVgtS5G/AOZR441/dZJWkqNqf4/VyUm7csvFAj7iAs0C2OW TfKJezhy5oP4jD596gvjFKEoWw== X-Received: by 2002:a1c:7c15:0:b0:3cf:5c5c:ab85 with SMTP id x21-20020a1c7c15000000b003cf5c5cab85mr50939wmc.175.1666895802823; Thu, 27 Oct 2022 11:36:42 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n19-20020a05600c4f9300b003b4c979e6bcsm5916117wmq.10.2022.10.27.11.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E4F791FFBE; Thu, 27 Oct 2022 19:36:37 +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 , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 06/30] tests/avocado: extend the timeout for x86_64 tcg tests Date: Thu, 27 Oct 2022 19:36:12 +0100 Message-Id: <20221027183637.2772968-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org These are timing out on gitlab. Acked-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- 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 27 18:36:13 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: 619211 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp507953pvb; Thu, 27 Oct 2022 12:13:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6sD2PkyAR8yANQvjKoWVwn/o+ujWGJuBKJ4IgJDFYDJqH7g4dRr2MnYsMPwKXvARedNkr1 X-Received: by 2002:a05:6214:2342:b0:473:e142:f758 with SMTP id hu2-20020a056214234200b00473e142f758mr43054580qvb.83.1666898034216; Thu, 27 Oct 2022 12:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898034; cv=none; d=google.com; s=arc-20160816; b=uv37d4CXiVNuDiW+F6hur/u6wzPCvyR7TeL1ZAgjNgJq6/IBbzwXJiguKc1thqNMkF wByNgVZnwLuiv9KNxg3ZMXqlLhM8NhDcAW4IyhVw0GWN/pMUU38XPueBEc49NJKK75VH TMTA8SVZ964J8jmKbRkzfOZR6genwSQolghzZUFAWPFLwsA6aMwVshId/IlxV7AXCjZI HvSB55sVs5ACFB2uxFWZlO7XZsxRypoJaC4JOuq+np1cj6/bLs1QsFdwTdjR3YK9FlD1 dCm2WotdyoY+DEJ/+uF7rWBqkSWtmAwLc0XCBKcrxDV2QODw16b3FHyn6La7pZZuWYPc mOug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=aSKoEKy838qRPHg6Chx0DQGUg+u8i2XhLvKie7+MNIE=; b=I6srBDa0ruWeEH0hvivrr7luro69YTxopIVYsLeXVBhRrrb/N2rpPmnmfoGAtAEUVa zrrTL++rGgrYwry8pZnRLZty7ZrvjIIXFmKeR5N/njAJvKBst4qGoVrTq5OkHZD6Z8lz yT5ZUU+hK3Elg5pDILQRhfg9dokZv5xBykYs2iuBQp7FhHKCfXX/po9gGYuVYrNGqTAm tWrxqzXBiQvx/8XT8wlBSJQ6UIPXZv/GUQeqsKlt/lLOrlim4H0O6XxAao8A9U5W2t2F 60bY/j8ZO0lHtgbPVClw6nQbZa5hVfvsPU5xXdY8OlkGLgtlM5BSy0MyZEGPRNrUlzCB +Edg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DPyX2USa; 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 s15-20020ac85ccf000000b0039b27a12e90si1331229qta.515.2022.10.27.12.13.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:13:54 -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=DPyX2USa; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mI-0002Ny-FE; Thu, 27 Oct 2022 14:38:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kF-0001L2-Tp for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:48 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kD-0003Kq-TD for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:47 -0400 Received: by mail-wr1-x434.google.com with SMTP id g12so3663053wrs.10 for ; Thu, 27 Oct 2022 11:36:44 -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=aSKoEKy838qRPHg6Chx0DQGUg+u8i2XhLvKie7+MNIE=; b=DPyX2USaVEKjtlZPefTcZexn0x0GhsFZFv/Y1/7y5TyNxWvc+KhWtnyixD5jcXidLp wQ2Yhff3al56W/+IoKIibFnql1dkLu7B62ebDQUQ65hd1DcSM/Bi92L7tlcNheyLKUCH dpt6WyypFixT1263LCFzI+GozWE5PTW+Aka3nl07U6odh28k8k3i5fkW9FsFywGd4W3G V8lxL3wE2kwHMlXo6h1KI8fK7mYYp0wfNkaxa4ZqTI8T/u5WmUVqiCe70TFp+Rg/Xfdx y78GWkubHM+qWP1OAJQaNKZJQfgSZMY+uFkgXOJ3YW/216ILVBWtiri55sivEnpQSVpE I2Uw== 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=aSKoEKy838qRPHg6Chx0DQGUg+u8i2XhLvKie7+MNIE=; b=oKJlaJ4n4jzXCX+DgZsI+0wWRXrB0++61DolLCQlp0cptYswSaXJqgJBVp4zUMmcZr /UxvnNnxJpIe9/Sb9SD8CEIlnVvp7tkekneYZtUy80/HdtZkKWvmlVTebp4wZvHXmADL QRK+Vffu2kjxzibcGLdj8icTiWRKX4QpDHRHMoniDmlrCbYYRtl+YY4cMtMdvmZBMOAn Hp8d0mehZKnSmpxokfljKAwYO6s3YJ0U0GvBQALuLFLrgVTpBsFX55eO63FDa9crdd1j S0dcWQrM0egEuG8gA4J5KohkCe6JhYaz24oZQvQurPVAoYMGMKHa5betpjsRdj2wn0He u1BQ== X-Gm-Message-State: ACrzQf1oOpA6+vuD7ideIj00t2XuxL5H1K9KSU2VvwdihwqxZmX57/nV fJH+BMN/xpIlFW+G9hB5KPXPfA== X-Received: by 2002:a05:6000:188c:b0:231:115e:9bd9 with SMTP id a12-20020a056000188c00b00231115e9bd9mr32852426wri.314.1666895803251; Thu, 27 Oct 2022 11:36:43 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o7-20020a5d6847000000b00236545edc91sm1787389wrw.76.2022.10.27.11.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 072011FFBF; Thu, 27 Oct 2022 19:36:38 +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 , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 07/30] tests/docker: Add flex/bison to `debian-hexagon-cross` Date: Thu, 27 Oct 2022 19:36:13 +0100 Message-Id: <20221027183637.2772968-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Thomas Huth Message-Id: <20221014223642.147845-1-anjo@rev.ng> Signed-off-by: Alex Bennée --- 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 27 18:36:14 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: 619227 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp521432pvb; Thu, 27 Oct 2022 12:40:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6L/TBLJhz6jkLyT3B/gQvlzXJCfBfH0EacPdP6bgGsP0KKZSHFpgDWlcFsNSVLERplbb2H X-Received: by 2002:a37:5c6:0:b0:6f9:be8a:b472 with SMTP id 189-20020a3705c6000000b006f9be8ab472mr5488658qkf.684.1666899622434; Thu, 27 Oct 2022 12:40:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666899622; cv=none; d=google.com; s=arc-20160816; b=iafFRXCaJcqLT0NgUTqTVO3h9O7EZaugX0SlA+nHKTXFlSFu/+tWFl54RI+r7a2pxz M9mbtAcSB21w9FCARcdc6DK/8YpuxElKwl2POnGXIcC74nCEgyXAhnm1SbD0s3hpTHVZ +YNu41vYhHZeQPMKtMk6Js0W9JG7jlWt/zXJV2CIMghvb+hHypTQdDowqEgOIhEiBC0o oPv7bkvNUGSgBOBAoAyp0oM3lRrGA02kIXhsqCW5AL+sjbbhqEqQa8z1/vYFzMiDFtGw Jbn89oa7ZPOxbF0Str9s0FzTtZgzfK14A289YOI30cBP8WXjod0FPF3EKtmDE/6NfjUq 9smQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=TRSnrXvuAauGNSIlB6KEv6y8D1osMrZOehCLLMTb5+8=; b=mwECE3Nh8fVUqGZydItuRSxAz7xSf2H9Q8ZdzMNBUI0h7b8eavjpv8RL/ru4T4ggk4 dgp3KrIAjzk2XCNBDCbh1YkzKMvtXO7jKmMboJiUNQ86ggMmQqzcUhFDtABQF7TDqGKT YilQQWmccKuvpDOMKCP0d+lVFuQxbVMGULPX9DHZHMCCVuu69Gg/W72L3/5ya7MH9vQV wZTKAIYJGguL0THY3ThMRM567TNKcEmNGUsA0uWlWlFHVXzz+sSl5rRTxeP8XesMmPhs zlv9klC0Mi5LHfivUU7eD+AwKIRJeJL3u+utBDb1cSgKoMBTNUJ28L6SyGsty4qv2idB mtSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wzG3Ka9j; 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 lt16-20020a056214571000b004af99e737c5si1252581qvb.33.2022.10.27.12.40.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:40: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=wzG3Ka9j; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mX-0002Om-46; Thu, 27 Oct 2022 14:39:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0001Mk-Bs for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:49 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kD-0003LD-Tz for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:48 -0400 Received: by mail-wm1-x334.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so1850502wmq.4 for ; Thu, 27 Oct 2022 11:36:44 -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=TRSnrXvuAauGNSIlB6KEv6y8D1osMrZOehCLLMTb5+8=; b=wzG3Ka9j6KY14FbTUNyj0aXjwfNtrDBJSJMHurqm8WmJkNltFztgEx3cL0ybipJQMO D+tSX+0DH/JthGfSMfvEeZs7Z8FLE+1QcfbkSdY0M7n4bMmcj9zQJwWd71jB26gjoIyT zFbZ7/6ETTKYniAgMFlwIBykqpTNFivWJE5S0BqF03WCskdWBnrS6XrsLbzVW27Jt3VA wjxhvEmu0ui3bgge3HAb9BeNBufvRd9RIPVbJymO5Wboh6Be3c2BbQoV4rX0NHhRJ5bf Xs7YXfSl1CNgKEF32d0dHH02zEkGgVH7ZKcSb6Vu++a29wXdmMui5dPSctyoess5mESG hzpg== 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=TRSnrXvuAauGNSIlB6KEv6y8D1osMrZOehCLLMTb5+8=; b=2x2AVDkeBJv9iDDomwLOMHXdu/+JlZ6ao6eb5NgJZNrp0LWNs6/HilaGBXL7ZuJU+8 +dXtTLtxBW4QO2zA7K2ptzQUeC8IvBLP9yr0xuUTaRLFARpVmKaXlyz/Wu7j65YLiKtw IWstDDLBDTt5zCvyz5NTDliT87oyGbAXxhYWAuIgWoALhoqiQe68P1yNc94ApLzt6XGw wOmB39h3dvnC9cJ0434z87g9+lm28MEE6rq7rC9LZMrApZ2vW3ILkDiE4oqcI9YODuPL uXc7czcJlC5ulp8UUmuerpt73rSTodzXBP3cfM5/CsWrE2cti7FlW9jvT9kElczN5tXT 8tCA== X-Gm-Message-State: ACrzQf01RBRtUKxeiaUWB0WIoUskKrFTw4KUpgaDBNcZ+Cbl2ijjVq6j ieu+lmreMqouyRRuRv8ENHVWOg== X-Received: by 2002:a05:600c:1c88:b0:3c6:d9a5:a083 with SMTP id k8-20020a05600c1c8800b003c6d9a5a083mr6867915wms.54.1666895804116; Thu, 27 Oct 2022 11:36:44 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h7-20020a5d4307000000b002366e3f1497sm1784015wrq.6.2022.10.27.11.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C15B1FFC0; Thu, 27 Oct 2022 19:36:38 +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 Subject: [PATCH v4 08/30] tests/tcg: use regular semihosting for nios2-softmmu Date: Thu, 27 Oct 2022 19:36:14 +0100 Message-Id: <20221027183637.2772968-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- 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 27 18:36:15 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: 619219 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp509491pvb; Thu, 27 Oct 2022 12:16:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7kP3G0FqMqCbPWdm3xrJz7u2eQy2TbY7eh+AlPmo5Jun8jEyzFiALOPutOryDMP9GRJjft X-Received: by 2002:a05:622a:64a:b0:39c:e12f:7c84 with SMTP id a10-20020a05622a064a00b0039ce12f7c84mr42237588qtb.530.1666898182101; Thu, 27 Oct 2022 12:16:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898182; cv=none; d=google.com; s=arc-20160816; b=U5mfaKOJmkK7JAijsnJMMkX6rqIgRhXDFW3+U1G0oNvQ/k2WuatF0og/tFlCBplgbd 3xHQc7FEntGfuNMxX75Qze268ySWUKn2oae1YaPnohVcJPBH8W5N0Xrm8GLyciux5e64 +DPGANg6cPBi8qq0XZ0+rm29vV9gNDGOq1gUAeX/oGVDYxGTmj2aucKBoZPC3IMObzQ+ 0o4Jz4GjOGXOfbee/LB+tuDFISxzMpnHDZxjm8ZDPm/UDpIQM5PGhz0enPp27Dx+lrZ5 TiYIp0qATwfT5eI1F/jxIiXjPGAAkc1zhqdHX5qDA8lBpjuiOMZHkcyHEdcBZvUC9Y3s Be2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=kyN/JXPSm96DkOnQJxVbK9SbWLvZmz7ZHh9iXoxP/MY=; b=Da4r9MDOJ9TQxVbTI2wwNfsUw7oejLOwnwkJQQ7nPUu/CzQ40bNO0pwhjPghvdNAeg r8XF1hn1RpKjcTod60IvCfKRqEdHpMAiXovXK3t5E/S1VU0NwIclDHLUS52Fa+9EYt+h Qhk7H08vS6yKhJV11ZUPe5oy95ULk3+OlAj2CpZGTOUJeXDWrHZbv6OcIKVPrT9l7ow7 SUf01eaE2Kes9kcIfJ7r8eQEmtELt/wwY+70WFKZKwzSDoGzD63oX14eeJrziaHoOmqL H1lphmFhbDTokfSjk2tXVr81fjxBZ+9L+vm1xbfYZE8POogiD3/E5DVKjtuPLLx5gA+D 9Akg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EX33OhJM; 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 p6-20020ad45f46000000b004b1d2231b0esi1407657qvg.171.2022.10.27.12.16.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:16: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=EX33OhJM; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mN-0002OF-3V; Thu, 27 Oct 2022 14:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0001Ml-Cp for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:49 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kE-0003LO-Iw for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:49 -0400 Received: by mail-wr1-x42e.google.com with SMTP id bs21so3687588wrb.4 for ; Thu, 27 Oct 2022 11:36:46 -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=kyN/JXPSm96DkOnQJxVbK9SbWLvZmz7ZHh9iXoxP/MY=; b=EX33OhJMpPa4lO94RuPeSLMmbG3QEpp3vV6Zm3KgBQVEdb1sTucP4wS7V4PEvSvkxJ Uwsco3xhPcwxxTcoQjPLqcYxfDLKjLQsfh3JBBao+aj8wRDsU+wqqJtjH44SkIvY8Nob SDLZRz6mexCqEiXraM+IBLw44+frYmiEAqzOu8uxJiDQy8xLSNNeK6LvGRngf6+0nJ6L NiQEvmN4Kc+Yl/0zEBWMYN7xKIiIPVJOXAPz5Z54dryJ+QSvYagZzwm9M17iHbEjM0ET /dT7A2NgiI76ZhFocBTQ+gCJwz+tHlK/FWazIKgo6ZIfkx9uDBDO4vWBnkfrP1FXGkbQ CDbQ== 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=kyN/JXPSm96DkOnQJxVbK9SbWLvZmz7ZHh9iXoxP/MY=; b=emziLdxTpyf763amd74lD9bGB2ooQNtTcQAYsESK99U8yaaZHLGuhXUybl+H16/02e o6wTMnxoNzjfbo53VHHk8hYqrRHQjkiHH6r7cVeMJ1KrNM2hWoqUz1nPnTiPafyYJpq/ M8sV/DvgfWjuXK+zeCkWamXxA+3gNgl34VBEsC+r/slvvoeEnD8sY6lbkU2rQqKXwdr/ qPnbblA2NFfqVWicFCzdastOPq12KttRXMg6Fa65U/AYWNG4+8OcbA+WKgW1BYgckp/A A+9fimSYWwhEZnfrcepbnvjL1omth9MWMuIgI3QOwop5Qzz3qerRMnmi4kSNc+N52SWs hp3g== X-Gm-Message-State: ACrzQf0R6Px1HvSuXBQn+uhWkC9sSH/HTz1dXD1NWlZ2bRUeljUwOdpW 1AeK4mdLloYUo+AhB+eiAvVBZcFvhZRKMQ== X-Received: by 2002:a5d:47aa:0:b0:236:79cc:6d5f with SMTP id 10-20020a5d47aa000000b0023679cc6d5fmr12425477wrb.391.1666895804900; Thu, 27 Oct 2022 11:36:44 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h2-20020adfe982000000b002322bff5b3bsm2142249wrm.54.2022.10.27.11.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 357DD1FFC1; Thu, 27 Oct 2022 19:36:38 +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, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v4 09/30] tests/tcg/nios2: Tweak 10m50-ghrd.ld Date: Thu, 27 Oct 2022 19:36:15 +0100 Message-Id: <20221027183637.2772968-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson More closely follow the default linker script for nios2. This magically fixes a problem resolving .got relocs from the toolchain's libgcc.a. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1258 Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221024035341.2971123-1-richard.henderson@linaro.org> --- tests/tcg/nios2/10m50-ghrd.ld | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/tcg/nios2/10m50-ghrd.ld b/tests/tcg/nios2/10m50-ghrd.ld index 7db0d59ad7..71cdda450c 100644 --- a/tests/tcg/nios2/10m50-ghrd.ld +++ b/tests/tcg/nios2/10m50-ghrd.ld @@ -44,11 +44,15 @@ SECTIONS .data : ALIGN(4) { *(.shdata) *(.data .data.* .gnu.linkonce.d.*) - . = ALIGN(4); - _gp = ABSOLUTE(. + 0x8000); - *(.got.plt) *(.got) - *(.lit8) - *(.lit4) + } >ram :RAM + + HIDDEN (_gp = ALIGN(16) + 0x7ff0); + PROVIDE_HIDDEN (gp = _gp); + .got : ALIGN(4) { + *(.got.plt) *(.igot.plt) *(.got) *(.igot) + } >ram :RAM + + .sdata : ALIGN(4) { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram :RAM From patchwork Thu Oct 27 18:36:16 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: 619206 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp504033pvb; Thu, 27 Oct 2022 12:06:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4f65Anc936IS/oPjXQZ4mlBYTN7DW1hIG8/e+QwbHugJzx8/6wN6+EMp4o766pAMtgL4zQ X-Received: by 2002:a05:622a:170a:b0:39c:e2ee:8e2f with SMTP id h10-20020a05622a170a00b0039ce2ee8e2fmr43551862qtk.148.1666897617444; Thu, 27 Oct 2022 12:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897617; cv=none; d=google.com; s=arc-20160816; b=AIE5Sbdnwg/BPVJsEuJ+CVSwyDGseyibOUrA0RRBUShbM3RmwSXiEx29blzPyr4fNB dL+598h/Tx/uiIeiXGm4nTvYiBsHDgBdSn3PfFXFGmNJNuARlxAvA8/NBJXFAWDbniOm k0rnfao9phgz9l12bHyaiLscN8Uhu5nYH1rvCfQVSb05ql0eWDuMGag7YdQfCfdj2HU2 EP1GtLHWhCr9IAfdWEEdsZFjy1X0uzkCO7KTM0f4j3/86ZDspgMpAGeenEZ0gdrwThGA 6HQ6Ge/ikyOFFLK8+cwFnw2QPYkllcEiU4wLLdMs7kSuqbwUtGydJnDdpPKklr1BIlpH WP0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=2E3Sx1MFwkAkShWDh4ro7HDDrVqIf4xAYuZL7Z9YHGw=; b=ORuTPuaqP+oNt5GGHhRLmdRaCeUHj/jxNSa8tVlfUdIbdY0FfpRMx/UmcSo1NWzoi3 FqFsWQqPBgi5HIvtVLshPcdBRz30XdMhozbFiVDIAaeUgl77o2DuRkglkDBZuvIrTE4K 0Rf12BySj3O1LeHw91aItoR2+th1MdiWM0h0vMM0hqdG1GhWS+2+gC9ez3Pv5mFFieQL ofrBBxOFChNfAMoUKYULky7LYuqpU98QSVl+7n7N/ZJG+XBOzs6RIrod4nfzw4V7Lfev o1YcI9YRB5QHcQqriPR5RTBIxwAgl+3ZS6nAedxiRO42F77zNR2CvcKKYj6Ypb8zxrp+ h/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fbbf0Snw; 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 ESMTP id u184-20020a3760c1000000b006eed85cab11si1372088qkb.147.2022.10.27.12.06.57 for ; Thu, 27 Oct 2022 12:06:57 -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=fbbf0Snw; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mS-0002Oa-7c; Thu, 27 Oct 2022 14:39:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0001Mf-8t for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:50 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kF-0003Le-91 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:48 -0400 Received: by mail-wr1-x42e.google.com with SMTP id bp11so3670594wrb.9 for ; Thu, 27 Oct 2022 11:36:46 -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=2E3Sx1MFwkAkShWDh4ro7HDDrVqIf4xAYuZL7Z9YHGw=; b=fbbf0SnwcDGnN1rhzBRAk+qc6TUOfr+gNBcucuX3V3EWpVmh1yFMW5uErLkrRkWr6J H0FskIm/rv+voyO7axY4UR4hT3qIymKbIhtaNF3j1QWvMZjrZ1nuknvmb0nrcoO9dtce 4AvYl7lPSKxFn6+16m4Y6A4WZZz/3/XrgP0QXqxZDPHQj1s3HumWOWsTX14Z18x/I++O jmPMbkv9WrnECA27XV8WH9kp/gr5BSqhv8RaofJ2cF4Z4zkYs0XZKSMzpV48J5iTrBQm vcgtZZNUNmQWAW9k6o6nLY+ZKvA793cFubj2ItZJRrFx7qz8rO3ugONSq1W/ewz3jQO2 pInQ== 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=2E3Sx1MFwkAkShWDh4ro7HDDrVqIf4xAYuZL7Z9YHGw=; b=vZNauXRwjyGm+7MsiIrtZ5NwyLZarQ4avMvT0Tny+iyUt0b9r+76hY0u8h+gOKKUiZ LX1gxN/+981p3Jx92av1KdtqXcBe7KhfAc00NFCKgBtK9w47xDOAmHckfdXb8jAVuxS1 7sM0dOxarFINPnpGd0O08Xl/SLawVqDQwWZtfF5GTr7dBW6MxdzclcjoKOI/7RHKqzie Nz+lx3zc/bKfESzsS+PmaRCf3rttTHY0XIlUQ5/ZIYLzKCSNvVdBd7VI4Zf4sn4aziuq 0YgLBqw5tnUqbeHdN/DjRw4B5kJUyPuQCf9ls7HctjVUVU6NBLQexWH6mMefZcDPmsjW sOhA== X-Gm-Message-State: ACrzQf2ydQ3IQBxq7gKFl+lDQbdLUh0aXqkeugW+Ewh3W8lNmZTkRplb PZGlazHQtRuA0s9DaVT1BKTHmg== X-Received: by 2002:adf:c582:0:b0:22b:3c72:6b81 with SMTP id m2-20020adfc582000000b0022b3c726b81mr33257106wrg.320.1666895805786; Thu, 27 Oct 2022 11:36:45 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bs1-20020a056000070100b002345cb2723esm1903064wrb.17.2022.10.27.11.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4C0111FFB7; Thu, 27 Oct 2022 19:36:38 +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?= , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson Subject: [PATCH v4 10/30] semihosting/arm-compat-semi: Avoid using hardcoded /tmp Date: Thu, 27 Oct 2022 19:36:16 +0100 Message-Id: <20221027183637.2772968-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20221006151927.2079583-2-bmeng.cn@gmail.com> --- 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 27 18:36:17 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: 619212 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508102pvb; Thu, 27 Oct 2022 12:14:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OzyUKiIkvOwRPTSBsgltXd97mrAKvKS9LGDyn4BNLRMEK2AiVyfoWnvMjP3u38jbN4PKC X-Received: by 2002:ac8:5fc6:0:b0:39c:8993:88f1 with SMTP id k6-20020ac85fc6000000b0039c899388f1mr43196246qta.24.1666898053843; Thu, 27 Oct 2022 12:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898053; cv=none; d=google.com; s=arc-20160816; b=JuARMovNch9V29SGXM44T84vbjMxgyV1bTvKdKxnaQxuf6IQLOCrsQnNrv+Tepc3Pc a/0ckmMeS0tQXr1jmHDPN7aNkKQySPZfguUdweH0zOao9o6KzPGHtRA1kgrcK9b3XtTm 9nova5hamck6g8puWSFV9M8QALFO17lzM5SHV2xxQlwSpcgEMmEyC60e5f4s4jpWF79g TCJbHhqZk/iOn0Pn+9sTS5gcWm+bA/UA3S9acvb/JBd2bb9h+2cJZb7eikY2VksEdXn2 SDIFukPSt61RtminzPZhnHID+DzMAnZu3ZJka1Z66wxsKU4MhxfTw/Pp1LuN7LGpnYyB lWlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=0ExeW++xg0n7g3T+frnIZ1mHHUk27//XLmFUk4Hi+NQ=; b=W6MPQhbPdltspp+d8yJE0oxhDFT508BVWcnII1ya8GucF9wfdk1l3wfA5Bh5xRufAO 2zhCzHq7oLNMfC9bfZ1ZOb8Y2ddR17+w9Ly98yFc+0dQrHrWMLB0bJz+XU6hD+eohwyR EHOimwbMImCm7YYpDs7IyHlOlSpe/FK45QikGbqUBB69xwtEcSOF3iioWWreer7fWvlm agxyBCA7v04JCX1BAmcte09qeCfKkgfaFECfW7gjeh1ITgWaeI6b+JwB4BMlkFQ4APsz Mgjdavn5acV2u/ebvQrn0vqiJBnf6BRnP91J8kX2ZBsAQU/n9osOtga8AXDmd15RkPFl 3A5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FfrzCAr3; 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 t12-20020a37ea0c000000b006ed5e888d12si1358346qkj.250.2022.10.27.12.14.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:14: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=FfrzCAr3; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7mq-0002R9-TT; Thu, 27 Oct 2022 14:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kJ-0001OS-T7 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:53 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0003Lm-3q for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so1873912wmb.0 for ; Thu, 27 Oct 2022 11:36:47 -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=0ExeW++xg0n7g3T+frnIZ1mHHUk27//XLmFUk4Hi+NQ=; b=FfrzCAr3ViZnkDkujoN1TrkPUlN4s03o5PjTNMtB2JZijbx7SWE0/JDlj5/7uSTj1g y7MGJr3+RjQvf4uPZLbQV/pDrRYeoFxek0FKt5pweqkl93X3YxFWaaUrEm2ZCL3fPIyL dWXwVCgq3VueSrfyD2Z1L0iT4BfC21ucuUjQndbdfVDk8MRIE15fVYCsRY9rKd4vbeC+ eLQ1GaoQqpABxmYCMFmxZ/+JnCSOya9U7zYjOk3wTPJxFsm2PEuDtKjCIJDLIkfUuuxK lJfJr/sZLt7bacrHx1+PKF1XUFkWaH6m00fk7akbQ21N3TmsnyIgUAUCq4cjPdZn+1gJ bsOA== 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=0ExeW++xg0n7g3T+frnIZ1mHHUk27//XLmFUk4Hi+NQ=; b=A6Mklomux1t/o1s/vFUx6eKFyyEXgFnVzrN+j77xGuEO9rLbkXHKHcQm7nzcl6mvTp OpeXygQSxMJYjh5JTUR1xuFqy28GGnljQWTiWsrNQj2mdm/ZnK0wiG2MtyxSHa0gZlRl S8gzfmt7I/ArIb1ctwyVfBit6OwHZQ1HFUfYYaGOieAfCwPh+92J/DYJM8bgoLJgiwru cubaRPAR9fFz+7f8mJj/0Psom4Y/RULGyVxSmcxRk7i7DiMq4gttVvjdJkN2hLuwfnb4 VCDUWyPUR1Z3t5BqtfD+V849/tux0HPLvtZCvylXBK/G+hUMUFlAZwp5h3RQmWrIgffP zYVA== X-Gm-Message-State: ACrzQf38yrjQ3ue2gN+H0JiBYN4+hH8/uf43ADe7mPElWvlfRSUeHiK0 NnjKOhBKgmGeXlUHvXpjeFwi7A== X-Received: by 2002:a1c:27c6:0:b0:3c2:e6df:c79b with SMTP id n189-20020a1c27c6000000b003c2e6dfc79bmr6715214wmn.14.1666895806672; Thu, 27 Oct 2022 11:36:46 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t5-20020a1c4605000000b003cf57329221sm984174wma.14.2022.10.27.11.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6248C1FFC2; Thu, 27 Oct 2022 19:36:38 +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?= , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Richard Henderson Subject: [PATCH v4 11/30] tcg: Avoid using hardcoded /tmp Date: Thu, 27 Oct 2022 19:36:17 +0100 Message-Id: <20221027183637.2772968-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-3-bmeng.cn@gmail.com> --- 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 27 18:36:18 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: 619199 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496369pvb; Thu, 27 Oct 2022 11:53:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wRjzQLQymiWpafbogoOuIfJ45rK1M2Qni2rHArP+TNhoKfNxZIQaE/K8XTjRDrP0k33/A X-Received: by 2002:ad4:5962:0:b0:4bb:6c2f:cbc2 with SMTP id eq2-20020ad45962000000b004bb6c2fcbc2mr20269618qvb.101.1666896789575; Thu, 27 Oct 2022 11:53:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896789; cv=none; d=google.com; s=arc-20160816; b=Z9n+k5hqFqoFHmsk0qDUykOQvScuRcnxIS5hMOSEd2cFICHG7XEospUzd3jNcGqvQY zRo/FlKiMEj6QNQdsGLmjJ+KHTQgUh07vy9GsFBx5eP/+g2o9ffRlfkqF3YiGkEYl6zq pJRP+L8+hmOR0v7GosrWENpiRbQCSBIjcVSf05HjEAd6szdKBzlKUeGBfxLG1iY3uACV ZLSgQB+ng+tmN6KJ8tvFkzq1IHTYac/zRHMz31cA6JJCqlEYdmpEbYgfQJ82WoIHMvyh hCYGQ1oh37+4aPaRXrhbYaKnZ9M4wU8e0PRdfoudnp6//sVRG3WTIfD0bk9YuMiSlOzH sgVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=QqBhpviWM7Tr3buMaeROL2/NOOiB4kCmWYZZ1xMVnXQ=; b=krigORhd1YB/+xGKVNSyQq9eKDzL8VDoIvhKjM6Bhqdr335iMBiqZ4mvrVoezcBBzZ EJfRrqTGBR3B8d2z8NEJP1Y3k6TbCWQ+M2BNxhu1Qx5z3xWXEqupf0pNzQYm0os+T0lJ NwHn8Rkmi4u2qdLj2wcPMKMhE7AVRHmbnGMl78MScQWkSRNAkY55Q3Mv3KDopL2Smz8T ndike9S5t2GMFi2vVA/Nh4/WNQcNJ2Z9mc/NOa5FUfjNUl9Csc7p7E+GTJUfpDYi/A5c eOZa3uNK+khOQuB3CeIUOgak2ww0ElIxSNv40nxmTB7QcuJKauG9wIkS7l1+BF3+3l7s 1+rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hZqAXAsp; 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 ESMTP id h16-20020a05622a171000b0039cc35b784csi1532572qtk.270.2022.10.27.11.53.09 for ; Thu, 27 Oct 2022 11:53:09 -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=hZqAXAsp; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7nP-0002ca-15; Thu, 27 Oct 2022 14:40:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kQ-0001SH-P1 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:58 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kG-0003Lq-VT for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id l14so3700526wrw.2 for ; Thu, 27 Oct 2022 11:36:48 -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=QqBhpviWM7Tr3buMaeROL2/NOOiB4kCmWYZZ1xMVnXQ=; b=hZqAXAspu5AASpvWJ4Rqhm/whojargirDT3WGIuMGL5+HRzj42T24oULSvG9AUqlBR yZ1QsgEH8v/ay8NtAXbKOOcD1nzKxQsrDRGDFDSynaKKEDK84RszOHc+hbhe2SOor3D+ JBguiqN1brTB46xEx8YPWKSSxhHqKTaEsCJC/T2OvDYZWXGo66d6SIPMMSWwwC3vJfzb WTiYGzgOrNV+fkbQi69+0ehmZafRC/M8Fm4bJrGES+1Fz6C9oZTMV0Rxmm33LVn4KFE5 3bxY54VSdSg2Byc0U0Dt7+dCeO+XJJaA44A2G8a6s+EVvdFjDN4A9ZV2YMrXIf33JTl1 XDKQ== 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=QqBhpviWM7Tr3buMaeROL2/NOOiB4kCmWYZZ1xMVnXQ=; b=EXmtSKlJ4n9jdY/s1G24JtM6IWz6TrpZ5t6+z0w3VlwNivhE0ot8J94UAwe2usMOwg N3eQJ0NSWroZTtU1y2JFBzuoA5ZJA33h+vGyWk7si1VwjpJqy2+G7GmP4G6gGgl3S/rR BgmEUculfcr4yq5OtaLNrmB7TgZAr5KxQc4pocMV3zrj4thunbpf4ShXoUQocNTxT0YG ajs1NoQ2RjndvG7HtLmjsyjq1jeewuV7p4IyhZr1VGGLz5Ghfm6b4agRoKOVB/XkQkY+ 48UZ7SUa0ktM4MNCtWOLhqFc0vdcmfLCx0OIhGnGdQVgKIyH0d+5uoWA49T6rksO3yEb 7+KA== X-Gm-Message-State: ACrzQf0fK7ahKvtkeYnZrzRk51IFRaY4jbHzCsQvaJt9uU0ULjJD6koK XgO9n+QfEc7hBf6tTm+xW9EsaQ== X-Received: by 2002:adf:9c87:0:b0:232:a0fb:ea5f with SMTP id d7-20020adf9c87000000b00232a0fbea5fmr33496741wre.473.1666895807004; Thu, 27 Oct 2022 11:36:47 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j26-20020a5d453a000000b0022cd96b3ba6sm1966196wra.90.2022.10.27.11.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7A0F51FFC3; Thu, 27 Oct 2022 19:36:38 +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?= , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH v4 12/30] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files Date: Thu, 27 Oct 2022 19:36:18 +0100 Message-Id: <20221027183637.2772968-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé 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 27 18:36:19 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: 619198 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496197pvb; Thu, 27 Oct 2022 11:52:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lb5h5aqBh0iw/bCwIFtRh4oVPpAv3cU2IV5CNLSvJbegelBXmAjs7e9kOSZeeBtSB+Mjm X-Received: by 2002:a05:620a:bc9:b0:6ef:417:d4fa with SMTP id s9-20020a05620a0bc900b006ef0417d4famr28126670qki.715.1666896769154; Thu, 27 Oct 2022 11:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896769; cv=none; d=google.com; s=arc-20160816; b=ML7vUwsz78ShRSG0yCQbm50l8d4EUMcYfCe2niZAdbBGqte/E8DteJxq05mIFkC5R9 6UKJXagjeLCnBrnZLmqocOY43H4TjSkN5Xszr9Cx5dMhUV+gx76l0KlMDqAS7Kh8sNYs rv4Wq2qjo9SVXDfH6D0AYgKWmEbo1Z9FqzMDOhpk+HqXD6vkXiv+EX4mIshHCTq7FmuO ZVF1CUFojYaNNRFs/t1cOP7peJPS8OmvzT080jbk+PczFDbTAMrspv4wERVDaNage4/o PKDbIrjTVt3ROsabRFhV1brwDiSPPjWNyNYGwGjFLFiVmjtbW0M9yt/eNIs+gc0TABtb Rhxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=aQZCvE50MfxR29zAAfQ8hh/Z0TMDIY0tBk1sFqzac2Mh7Mz5UJZbcNkwvK8EtFXrPD Q8QidYrqZceQlTZbvieeQ4oaysd9kzR9wizC221WKgVcO1iYZonmFVM33N8GHlMKa3Pd sLYDnN8RtnzJjjHR0oKKgGzZHO1+FYW/x8FMwH52JRpeMmJUE4gk0UklpbBER6n24Ju1 OAXb3xqBzmJ9ze5F0qrPfeqkFR3S6+vDIniEaEfsxRWslvmvUBpJ+Wb7m4Myo0+yY/00 i9ajMhsNM/Io6fcCVYwGQVp/CidErrVgAqV1MpxzHlvVdIf4ysQhApDMX/pCPQ56q51R 0GuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wmLL495c; 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 ESMTP id c9-20020ac81e89000000b003979d6bb76asi1428848qtm.31.2022.10.27.11.52.49 for ; Thu, 27 Oct 2022 11:52:49 -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=wmLL495c; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7nF-0002X1-0g; Thu, 27 Oct 2022 14:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kN-0001Ql-GG for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:55 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0003MH-EG for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:55 -0400 Received: by mail-wr1-x435.google.com with SMTP id z14so3674060wrn.7 for ; Thu, 27 Oct 2022 11:36:48 -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=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=wmLL495czepYmkyydFGd6Q9CqrIQLowE+DzTWKZyfiV8bctujX4+STGWczl0GSPKTy L/+Bh1lovsNQrskycn+Z25iv1fP5a0GcfAh0cpFWn5JT5y3W6kFNsPwg+bZDCn6LQt7l HrT+VmU/uSu3lGIrVxuj6rPbyvTqyQX4iyT9zdtZWtiNUBSXUCn8au9cXjPrR+FzYLO0 PBgVHaqzg57Xco47hoA6LBl4g7YjCPHcyj+atYQqFO6ZSsv1jGuzFgJEyGho1V/feZnu cCwOJmqzH3XCblfwpFVs48ilbZwIEXkYLi24w/o955+QB64v0v31XeMm2fwHv/VsucCI 9dmw== 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=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=2gqcZ8jwkHFUoUWIpgc5EYa3ORCmst69nBGE+hkNA3B+s+yJ6AS0Zx1D3BariaThhk wVsMS9rPi9DAr99FNjdzfOWz2ozQ1VGKxUczB+RF0RKsbHLzTfzyw9r4GMSTLqfvhHJw QEh4Qe+KLs5fbV7t3XyQLwSGv3k6pcYfCTy8IbdCxeUA8XGbNZQ60cAanqk1UoiMyGII krKYkypOg0trJ1C7Y3Fbp+reeSQiRcoJyOzpTnu8B2fJVIHCXgNav7dAwjwZK232FdoB AuvEwikMuCWCn0kCyxWN7/DWA0787qOCWONmB1uMm0nSvZiPPK0U8mLgbBSUldu/23wZ A0gw== X-Gm-Message-State: ACrzQf0jMt3F/cPvlxX+U59xabmVtmmpqV0kkT3vcUKxYdDRQqWw2xYe CdVQOdt6j6Y0KCLRk7zl6SPKNQ== X-Received: by 2002:adf:f04e:0:b0:236:5d8d:8a1e with SMTP id t14-20020adff04e000000b002365d8d8a1emr19821045wro.392.1666895807917; Thu, 27 Oct 2022 11:36:47 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n4-20020a056000170400b002302dc43d77sm1915829wrc.115.2022.10.27.11.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8FE221FFC4; Thu, 27 Oct 2022 19:36:38 +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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org (open list:vvfat) Subject: [PATCH v4 13/30] block/vvfat: Unify the mkdir() call Date: Thu, 27 Oct 2022 19:36:19 +0100 Message-Id: <20221027183637.2772968-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-6-bmeng.cn@gmail.com> --- 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 27 18:36:20 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: 619214 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508350pvb; Thu, 27 Oct 2022 12:14:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4KO2pxTtOL6htE2dzRKBgfJ2C1OcI9SH1mioqd0G8V5BvOvH70tPqTDgdG1AI2rwDEkQs/ X-Received: by 2002:a05:622a:48d:b0:39e:354e:b551 with SMTP id p13-20020a05622a048d00b0039e354eb551mr29069314qtx.240.1666898079896; Thu, 27 Oct 2022 12:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898079; cv=none; d=google.com; s=arc-20160816; b=xXu81piusVQyAlOO24rdeJf0wjIl3Z655HgEE3Vg1yHijeSsnNqB6899wAU0jSXNlm 04iaOwKt0TL4jhpEm5Pc9rnEzttNCJzGDzp+G1cUQ1+ywO1CP88Fz+RZVy4Vv9XdmfbH vMljUZ1v8cbJTjhaZqZqQq2X0WfQRKO0Kj/cSYWYodLd2AgPg3w1x8nhKz4F6eFUP8Gk jeenrXLpscfROQWjHrOG74FxKl3YNGYPM7WC75LSw4V5T8Q2+12xGXgIwI8FbQN31CLC 8ky0M62izV+mz/QMsAoCBYX+O7jedYfMlxgWCdLy+BL5tPl7KlRtHa2QVI8W48jkJs+S iRpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=MAiwImJdpLFkde/JPFpGgiQK7JvaUA3H/HJ/OAPQFdQ=; b=GRgaYbV4vqBUqeg6a4tljDs3XZ2/rl5OG3U/Xo97SPz7mBGOZKXzJdQBZYcSpcaxiU K9B9Q+MIcyFDBTi0y3dCzldLjaU7clQhlrcuQNd0LCbC8kOSAWUO2f/mSXdZIYUsyduN DZWqrDMZdCQv+3CnUw/QSr2vDv4VlyvZbMuTTAcElQ6QxaoVZP6QkSoN6K4tRMDQ0BD2 HaYtrveh+yocNVLVICy7W4xzK+PP3P1jHFryOexmqwbVsO1xdu5xZ6A9ol691qCIdEJW 6uO3NWky4QaQkcGfkTKBfudNKPJCPKtAJiJR9HrH36c1RwU5FMGh7rLZMdbiV2dvEId6 kM9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N4VG243l; 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 q5-20020ac84105000000b00393a55e31f5si1350974qtl.756.2022.10.27.12.14.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:14:39 -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=N4VG243l; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7n4-0002Uy-69; Thu, 27 Oct 2022 14:39:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kK-0001Oy-Ep for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:53 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0003MV-Rr for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:52 -0400 Received: by mail-wr1-x431.google.com with SMTP id k8so3710062wrh.1 for ; Thu, 27 Oct 2022 11:36:49 -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=MAiwImJdpLFkde/JPFpGgiQK7JvaUA3H/HJ/OAPQFdQ=; b=N4VG243lGGmBZy2+dYnysvDiOHY5bo0eHybyu3xZP3Y5w720Uki5JTsNxzuiXCbTDX KcIX8RpLb9KwDxd6ed0KD5YxbSW0pwFLJlKdgcs2fuAeAGsJmTKwviw69FFM1zad5vq6 lq2aGz9X5LU8VgNdF3nLhNtJw22Y4l0xyZbVj7EZc34kTquvh42rSC9kTcLQBvy7pWu/ xgAd+kBnbgu2gRm+wZrURi9qnveURIyORaBAN8zcnlSQ6K5Bek5L67V/Y69gnMNv27zD 8+qA29Z0wC1IFIOff5iY0QuaAc5UeM6SG27Q0nAjyQ/sbAz8Jdo2DV1FoWpkHVRQOJ9T 1Z+g== 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=MAiwImJdpLFkde/JPFpGgiQK7JvaUA3H/HJ/OAPQFdQ=; b=zb00ZpPBjousDXPD9JD30LAVeytNFj1SX823NxmPqEFT+6d4A7zUsACJyXR+/ArrSf Nm5Y5IeU2oJcM5RT33VW8Z+NYQkXfudnbkkJUt8VlL3yI0boSiCheo8nCMfbgarrynhu PiwAOWkPlazwU8m1rbrGpGg6g99eWq5GiBY0as7MwgD1A5OJg8OV3/7OIoRblFMS493V 6GC3n2EidCNU8Bk+SOLjl9WRAaI6LoicwLYTy9+jJB8Uj2vyXH9Qx227pi+OQ+y8//UJ 2V+ngyEyxAL+CALwJasKEfwAidVRj49iIHN8U61D3C0WDf3hrol2U1QinpZgcQzRee6y 8prA== X-Gm-Message-State: ACrzQf3NBapabudG8tcVqr6Qwae+zTkRlre3RjW/7ifXDf0/+9odwJHy ShgJHWvtiupoGm0scn5FHBK5Wg== X-Received: by 2002:a5d:564c:0:b0:236:6089:cc50 with SMTP id j12-20020a5d564c000000b002366089cc50mr18480773wrw.520.1666895808414; Thu, 27 Oct 2022 11:36:48 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j3-20020a05600c1c0300b003b4ff30e566sm10658299wms.3.2022.10.27.11.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A63B31FFC5; Thu, 27 Oct 2022 19:36:38 +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?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PATCH v4 14/30] hw/usb: dev-mtp: Use g_mkdir() Date: Thu, 27 Oct 2022 19:36:20 +0100 Message-Id: <20221027183637.2772968-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé 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 27 18:36:21 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: 619209 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp507403pvb; Thu, 27 Oct 2022 12:12:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM474+ILWmebLEXdvNpuMfKkqdZ2q+osx+tN6+3L5jlxztYrty1JgBocfqQe47+KcNQ8xBG0 X-Received: by 2002:a05:622a:1898:b0:39a:1184:43cc with SMTP id v24-20020a05622a189800b0039a118443ccmr42715730qtc.151.1666897973076; Thu, 27 Oct 2022 12:12:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897973; cv=none; d=google.com; s=arc-20160816; b=rC5ro50D2FQA3jXcuncdZKyQn8Vu7bQyyTRjRVTQl7RmULscdaI6BKWsoQjC977Ohb G7FmLZDw7TTH5oB6T0noIc63FpZqMpqcFZqhFB+1veMFT1Ihy5SIzAz/AL43ayPRNmN0 7Vv51ypIINvfjeYuauaMqJxUSSNvCtdbehlT+AnQWOKV3PvUxRUyC6j+s+RPSY9TLtUN 2bFlPtLmZypiV51G+6eRix4tfqu2InbmDBdUJP+p1AstJuDuNMoMHi8Xz6qObgY7mn3P sgI/hmo/SL2J8GhH2o+789GUXcOMmTp/OWxFBhB76z0gCYVGRjsZNtYbdgalZ9FzJ8+B jz4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=0fQMZVSuQkgsfIv+8SoB1HN8nakXZ1eazvaT9TDQCmA=; b=KUOikx7UoQig5W6K64TQCM6VuhvV5VM1ktUGDMj7tha9tcVwdhBR8k0bhR2QGxM3rD 7r1idGuH448N65+KTkPoxu5SzxA27pvFWQLaoLdU0l54rDonZJGq2FTUPO/DLl6oc9vZ Q+qHxS+cqAhYlOQvqh9E7xxpBA95eD0gbRL10ultB0zuL1iADN5HBO/KWKcBSmohB8vB VisfD7Ul2nW2YJCXUhbkFhA0C1ad+gFwmgINGZcu0kNxO5w4BOsPullgPNbAcCy7y3qZ HBUjM20jy0Z7fV2fJF2t0dcoDfMVfbvGLQ/ELMckjBwFlIAi9TdkhcE8uoh6qsXYJywH eNsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bl1M7fkw; 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 g4-20020ac870c4000000b0039cb986f233si1402614qtp.255.2022.10.27.12.12.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:12:53 -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=Bl1M7fkw; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tM-0005mq-3y; Thu, 27 Oct 2022 14:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sI-0005UO-G2 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:07 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sA-0004kz-Ly for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:05 -0400 Received: by mail-wr1-x431.google.com with SMTP id bk15so3682259wrb.13 for ; Thu, 27 Oct 2022 11:44: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=0fQMZVSuQkgsfIv+8SoB1HN8nakXZ1eazvaT9TDQCmA=; b=Bl1M7fkwWKMcvd9WGrJPdTeR3RprrPZmsXhDoSR0x79jiZ4XmHur+/Fw1V7eaeS01n tbJ/4649jRSI4slKyyk72fGfbRODJUtjXbsEEMBlw8foSpfkG4TOwP58vpK0nBXVfP5o /F2VQrt6K7bSQ69ES0+8sC6LOE40h9F4TgZLtYI6AEMmjQT0p1p3EmtViTGrSuYGLBIV RcjIm9ilssr7QU6G0BE5HwfUukEoGX5r1IRndzMyWUShiiyGRaa42f0boccEGN3f5JwB yz+Vccv004Lo1zM3A7oBH5sCP8Pp/r9iGe8vM8Zj1805FCVtQVAtM1iNvsEwN58Gm3yJ xn3w== 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=0fQMZVSuQkgsfIv+8SoB1HN8nakXZ1eazvaT9TDQCmA=; b=Gq1gFt40WkcZ0AbIqnb7q3j+KGzcyv4qKDZCP3a0b2fp4uDB26fkMhtMvfhMErSknn wdP8ZjRMaSyL83uredgkM4zm7HDzUXeXxR5LA9ujux5XCbx37fHUPVdeZrqEYtfC0b9E ggx016MJyCGPqiRbYkXSvn1YlWa8ss3R1nCsoMZQmMXOf6ADiZEkJCAscPNQNCzPitXP VL0AD/wXTpmZv7Ovdc+fss0eiwQ/TGK4SNxs9pNPxenMR+8wTrPjmV7opN3134Mf10wT 4qnHzzEsCHNLjtZUl27BjeTmbwb6en7xgrzJZapnZ1RyhF/ucFBdHFB42cthN9kLW3sw oeqw== X-Gm-Message-State: ACrzQf3Ggq0tjO7HfwYKsRezSop2WZGlkjyCiY9nreemDvGgXiGaw3DE zvM+4FKmcudSIjrxMGqdanhQDA== X-Received: by 2002:a5d:6a90:0:b0:236:4835:ca94 with SMTP id s16-20020a5d6a90000000b002364835ca94mr25278889wru.187.1666896297180; Thu, 27 Oct 2022 11:44:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j36-20020a05600c1c2400b003c6c2ff7f25sm2464944wms.15.2022.10.27.11.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB9A11FFC6; Thu, 27 Oct 2022 19:36:38 +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 Subject: [PATCH v4 15/30] MAINTAINERS: add entries for the key build bits Date: Thu, 27 Oct 2022 19:36:21 +0100 Message-Id: <20221027183637.2772968-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Acked-by: Thomas Huth Cc: Paolo Bonzini --- v2 - s/Odd Fixes/Maintained/ - nominate more reviewers v3 - moved nsis.py to win build section - moved entitlement.sh to Darwin section - added Thomas as another reviewer - a-b tag --- MAINTAINERS | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 32e495e165..f72f02d661 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -548,12 +548,14 @@ F: */*win32* F: include/*/*win32* X: qga/*win32* F: qemu.nsi +F: scripts/nsis.py Darwin (macOS, iOS) M: Philippe Mathieu-Daudé S: Odd Fixes F: .gitlab-ci.d/cirrus/macos-* F: */*.m +F: scripts/entitlement.sh Alpha Machines -------------- @@ -3764,6 +3766,29 @@ 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/symlink-install-tree.py + +Top Level Makefile and configure +M: Paolo Bonzini +R: Alex Bennée +R: Thomas Huth +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 27 18:36:22 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: 619218 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp509060pvb; Thu, 27 Oct 2022 12:15:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6m1CKpYf6Lvn1CKzhSAWP4Q2ZWZV4NSUqYcA+1gnhqKWgMvgBEehKJp58JdhNjD1JA/Q7V X-Received: by 2002:a05:622a:15cd:b0:39d:1b71:efc6 with SMTP id d13-20020a05622a15cd00b0039d1b71efc6mr30808709qty.225.1666898143363; Thu, 27 Oct 2022 12:15:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898143; cv=none; d=google.com; s=arc-20160816; b=mL+np0T1r0gcRep17UMESZvliAsgxMOaXIhMzLxVZZeAIPLK4dcbB42XrIlTLK4Ju6 dSP2U0BovD6iuAbhMdK7WQT2fQpDzhCJpxCFNtuUDpB0YHQdI8+oEzLilvrJVeeXUutn ToxYND/nOvRlFozePl8Pz3nJKH63wEXQD9sDg0eTi9jDHBAZVjieiyrie/IXNl3rI6Z2 Z1XoTjmeQzthTxOJ8d0QYXnqXlCYRyueUrnHri+IKH4bMiUfRLo4AIuBWFxFEfBjcYiu RwboDhD4wkyTwt02FnGpbED2v0BNmoQJx3X3Aol03AI7u7Q+byOaKXSAzRX/MGPiYM1F oHVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=1aG1xVErKESKleoE/OSV+q8fYxMoqJp+CHoFu5AxaIU=; b=RM9H0/3c5DB6Ze10hZNJ5ud39EA9ntiPCrB6WgTrdIbojk086Kgj0hO0O1sWADEz4j ZN/hWQoafgE2eI0+6vX1tvcSvgTa+UTSyIFwNa5mltTZ3gR66OHnF0ORlpKTEvPj2pkU WWtXVxmUTx9MaRXmSKBsd3g2rRU3PrazpZhOJOJlU4yG4y9v3NlXnZIL/eVb6i3L0z0d dhJlZQLNuaKASG0pA+oF0K2/kxh9wvuqJSOv3Kksz2M7qKrpxWagsZV4aE0Tcts40l24 gqvgQM8HEG6R6LyENVPIYGSVbkIn6qgQDZTC9JyqLQCMnO5OxoreHLo1Jx2q4Rclx/z1 mhMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vBXlkmWl; 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 z125-20020a37b083000000b006f9df56a34bsi1332741qke.569.2022.10.27.12.15.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:15:43 -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=vBXlkmWl; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7sw-0005dz-Pd; Thu, 27 Oct 2022 14:45:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sC-0005SY-8k for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:03 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s7-0004ja-Ks for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:59 -0400 Received: by mail-wm1-x330.google.com with SMTP id m29-20020a05600c3b1d00b003c6bf423c71so4857489wms.0 for ; Thu, 27 Oct 2022 11:44: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=1aG1xVErKESKleoE/OSV+q8fYxMoqJp+CHoFu5AxaIU=; b=vBXlkmWlFmkm9hVAPhfC1lycGrFBfxRvBh90D9FG1s+PSVGeqGt/odLSOV9PM6TctX mND22dJ9J6D+SCSaws2cOrkFKMqLNPkGX2hJNm2uFXHDPltF5M0z2LAXP665rRuiVnOS S1vmm7A/o3PZQQqWujTCwgQsYhdvpB3WApe1IlrucOKNQdJMnmUooNwJrd99DZkZvXSZ 9rDWRvwNTmBrNuvYMTl/hrWZNPCbDQ+dfGnLk3g2UuO8KkYnfS1c6dyE669qCo9hYiEe vTv92tgWjKfYVSXQQ+1CnCkiOfciQyCHlR/GtR/0wlonrv4RYFxhDcX/Mo/eg7C5nW7H sj3w== 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=1aG1xVErKESKleoE/OSV+q8fYxMoqJp+CHoFu5AxaIU=; b=qybx/5dXED+eL7NaUbcePvUb/dyjiuoK0MZRpnAyj5jD21iDu8mxb0pYdG0EkkDPRv jo+yR8Goc/RTCT8JY+Bz9X++FQ7TLWWNLCceJuh4wr0bQ6V3YTnCMBYhzMyItv1ooW8N rGtjguk6webd0TRj61CO8/QqK71BfMl7pcjnRiyqiAHs0dNMqGH9pvTvOmtKjYCI43w5 P3ZwMBmb+TYj8SB8QEKG0/5X1ScU2i8xu4uAM/S7XkMcbEYfV15qBKaEh6A1sjRURPp/ LiaeJLUEIZBNQjktYlpb4qC1H/SaP6czkFFfSf9U/13P0gbsBC3CFE0H3FF9tTm6eOgS ATLA== X-Gm-Message-State: ACrzQf28DamkyN6klhJy79s7qHXFDgmK2Zy1BubUIemIORM/4nB179QD 9USeOSR7qg0kIIjdGRDFELGPu7n/uuETTw== X-Received: by 2002:a7b:c30c:0:b0:3c6:f26a:590f with SMTP id k12-20020a7bc30c000000b003c6f26a590fmr6969772wmj.205.1666896294280; Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p28-20020a05600c1d9c00b003cf55844453sm1792352wms.22.2022.10.27.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D0CD01FFC7; Thu, 27 Oct 2022 19:36:38 +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?= , Richard Henderson Subject: [PATCH v4 16/30] MAINTAINERS: add features_to_c.sh to gdbstub files Date: Thu, 27 Oct 2022 19:36:22 +0100 Message-Id: <20221027183637.2772968-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index f72f02d661..f0a6a588e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2695,6 +2695,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 27 18:36:23 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: 619223 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp514882pvb; Thu, 27 Oct 2022 12:27:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57GZ9DrjGCCvbo7Hxz6oi24LufarplQK4ybSeVDDSXqo14aDu262AE6XVwvhNsKi2zcCHQ X-Received: by 2002:a0c:8eca:0:b0:4b8:84db:72d6 with SMTP id y10-20020a0c8eca000000b004b884db72d6mr33805049qvb.49.1666898846374; Thu, 27 Oct 2022 12:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898846; cv=none; d=google.com; s=arc-20160816; b=YGQR2D/day4u/TkbzeBmL5KoBEdAYtocutwFfDVfwxCAEs9wsKIvfc/HzTcTsjBiQg uBzEZPdZ4lyejYQP8L5ruWUs8EIIg4uY8XBqLpCsbPi+Tf9f91C51MtjT0mZRnJHI6SO YlT2RPGEN5/EVsG6J2Pd3mRPrKO0jvP6bn2TokXyXnwqvpKEfn5MTt3PDGZYx48rK6nX RCKOtdnv6ATFmowzEZp1kd+25Tr9fsjLFDOrcrJXFz38KsxtSGtMgXQB1qTZYjyFccmW XApYc2pnBI1OuDzVULV0km2u1Bc6pkAcoKM0Zw4/E16YAYIWmAZHkBXv7EtyO8M7w6ky eOcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=7UM2/sPchh948TxL5qcqzQ2Kv4REO/Oc6KzY1H86hlU=; b=Ly1UgdNoBIIZprD2YkqXcS3dsuiWuzWRUXRyN9NphY45uRMwmLsYQf2vd7WdGBmb/X j3tVHW8qft8z/AD3/KYNyW4CMB51lvBJ2M8qIQWgONmVrp7ef3anT5DJ/T/TK1kiqxbs xM7utUjO7a3OdHVLwLDxL5/2FIJVTuiBFyFT2fopWJ9IUFf99Y7IRWgUIoKURzb8n2Vq RIqcnQi4FKn6aQ/PraQJQz6T96/3DwwamksJaec11wU3vDq4T3QzmT9nCKxuz4dQCUK0 2AYG/67EwTWN2QUaRaG7gsU4Es2YxVz/2vF5N5mypbiPUkbIzRtB8mFutmiYjHjKrBmo oNGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vIpuNlYY; 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 c10-20020ad45aea000000b004aaa9557d7fsi1512695qvh.556.2022.10.27.12.27.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:27:26 -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=vIpuNlYY; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tE-0005kO-Cb; Thu, 27 Oct 2022 14:46:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sC-0005SZ-9Q for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:03 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s9-0004jf-9r for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:59 -0400 Received: by mail-wr1-x430.google.com with SMTP id bk15so3682152wrb.13 for ; Thu, 27 Oct 2022 11:44: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=7UM2/sPchh948TxL5qcqzQ2Kv4REO/Oc6KzY1H86hlU=; b=vIpuNlYYBvYJUh9tNrDl6DbtWY8m9y0//NwqYHRiqopCUkTD5Uvsj/cCajdmixIsQX lZKi9i9mF1BdxQKpzOgpcw8BCAz9Ah+/iWH/oSEKxnHLLYLmv2ox/u37TqEKvWF/J00o 9MTY+ZGvbFg/bnCO2wBstH5xT+Hgxt1/aAOsif984cYvWo3AdUaldI35GJ+eORxDOFjL KopIPFNLEfmggKjHQbTEyHE79FEMp3X9d4x7mByeHSK+J9pOvVzmfwv84gSjkcUmAabe Lh1+tF9zTuTf4gEbzzba30KPMPBBrxg71HKXABREUPKSGFx5W/dmso2UCO17JTJzpqwv Ji7Q== 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=7UM2/sPchh948TxL5qcqzQ2Kv4REO/Oc6KzY1H86hlU=; b=mpZhpQCgd0170mCHRx72+X02XUoyCZpapPi0UziWb9WSKMcyr+mZMKq2U4sHmaTV9z m78Qq8UEgkiKkNAH08gHcORE63/FwdynGNpgr3TciDX/j6eXdTJFLXhj3+Zjo/ihafEP xwBTe4VS/t2wNrqGR/G8jg0HS8QRmSz13/Fald4HtWdk7ipKdkUYG8uPzhxqLFxC2Gbv hD4/i/mPhJqY5+sXRaV+cy2eNnZO74YUPzzSfrtJBR2eeWi94fuGqhGdM1UwaxKgW8v/ 0ZGVFfP6kjAr/lth2Me1UWoA4TO0UoErt6RnIrxotI8tbLrPDhNZvIpVJclsXrsxnjCc x9eQ== X-Gm-Message-State: ACrzQf0aljifMjd0S2MxoI2keH9rorphGo/gRmMpjw+Ky1Ch5LBKXhsp jwLOsA0NvoAfLjHq+Iv9qthxZg== X-Received: by 2002:a5d:648c:0:b0:22e:63be:be09 with SMTP id o12-20020a5d648c000000b0022e63bebe09mr32451230wri.159.1666896295564; Thu, 27 Oct 2022 11:44:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k3-20020a05600c1c8300b003c6b7f5567csm8901439wms.0.2022.10.27.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E60FF1FFC8; Thu, 27 Oct 2022 19:36:38 +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 Subject: [PATCH v4 17/30] MAINTAINERS: fix-up for check-tcg Makefile changes Date: Thu, 27 Oct 2022 19:36:23 +0100 Message-Id: <20221027183637.2772968-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixes: fc76c56d3f ("tests/tcg: cleanup Makefile inclusions") Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f0a6a588e8..3f353b56a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3729,8 +3729,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 27 18:36:24 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: 619208 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp507392pvb; Thu, 27 Oct 2022 12:12:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5VNvb/jjPooX4F8ClIJF80UMRIBcdPgRI1xtF/pvO/BPZZe7r3SGSe1WSfoggBBb+at0ND X-Received: by 2002:a05:620a:254e:b0:6c7:855c:6eb with SMTP id s14-20020a05620a254e00b006c7855c06ebmr36771547qko.39.1666897972300; Thu, 27 Oct 2022 12:12:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897972; cv=none; d=google.com; s=arc-20160816; b=G6GyOktZ2jO83Pj/L0GcSKS8yUSycyFu287ANOWhaAkJ07k0l4ZXUJBUU0MW7nNTj7 CSL+QmOALKD/xtQOMrQ1gMySAk7HUQG8ThUo/37mUayisRGfPOvI/lvEBwP49iVRN8KX mMHbRK2vfzeRzCnVjNZinSlLG/dSn6PTATJ9qb8jvgP7U+9tQtrHSI/g3Bwwn3g1rY1d crhjM3D3RjspIyzlhePFeCEQTb78WTpLLi93jvzwDjshK5aD01yjPHHEMJpyCfw88Jrr P2Ma3hYeJeAfHE8LBAWQ7MUZVn4u/MPZag2vF/jyrc7YkSEXODBaItLmI3c6ra2V/rfv /rBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=tCjfONgEu+tvaIvxZWmJK94kg2ccUmGB7XoiF2hazEQ=; b=yX/AlxwJFo8J9BHoaVQAohs0EB6HhM3WdxTGeyCM9L9E86Gn+Tgbz9CDI/vDaP5qWC CLjsUeTjWx8eP0+DBpeQalIQBmL+JxLT18MpRzkrqNGg3YV6u9AJ7aR6E4MQ73QHZxwV I8NCkI3YNAQKDLQ+gU+Jen5crSDvp1uNQ4FK9wQVZeHjV3h7yDXlRZzEVMiO0QSQ2xDD I/Fvgl6GZJ9jaGdAzYrk/UhrV7CLGbhmobDrDTkoGUJ2tSC24bOjeaTalUuhQTjNQyv9 YgQZZXmT5cQXUF5EsT4mvQucGz5R9c4ccMa0Y/wWwMK+sYlzfq0gjPFH64nvgNAaFcNr 6xmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kmfzOckw; 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 y13-20020ac8708d000000b0039713c3c6afsi1355036qto.299.2022.10.27.12.12.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:12:52 -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=kmfzOckw; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tU-0005sC-8w; Thu, 27 Oct 2022 14:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sK-0005V4-ID for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:10 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s5-0004jJ-K3 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:07 -0400 Received: by mail-wm1-x32b.google.com with SMTP id bg9-20020a05600c3c8900b003bf249616b0so1867898wmb.3 for ; Thu, 27 Oct 2022 11:44: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=tCjfONgEu+tvaIvxZWmJK94kg2ccUmGB7XoiF2hazEQ=; b=kmfzOckwUEN114WLrbuw85WVaYP5/S6fzrxzTDoVltQD5TV2nz0YMmqBECRcclAw8Q Od2AXjloDmyMdyJCwkaofRt8zXvFPnjEVieCh25usJYd/35xp3VbILAxhIOS5QcauXyN XpOXuSJ3kqC3j9lOOmsk/7P9YuIq1mQB78W2s6pwJ+63l5agH3ZMWw9XgqiLpMZFLkti QZtj8DIYfn/MAJOAzK970gClnOO3E5F46f4i4z47+fVO79+9yHFarjumWyp3hJdMju0z HTVojKo0a7nKIcA9dbDyFMWOeq2mAtOCZAnxgTNAipLwVGEyRNxeQRuEal+h+arGtQGu CF2Q== 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=tCjfONgEu+tvaIvxZWmJK94kg2ccUmGB7XoiF2hazEQ=; b=Qm7Xi811Z/MHTbuO+HukPhuLbQRADlUiT531iyTwdUok/oVBl91vvLDFCeWw7QNPUD xQJ8N3rx4kYH7yvJlfC96E5OL565tSCuruqj//q/2Syq/6x4oF8frmFZyRC0gLDqA7YI QrOYIRF1iZnkD9cL7vPrUr9AqyEBjwcbqOjNodygS+h0Vz0euH1hlYd2NRU1Gttj/gw1 +iiBdbdConrl1ySPR8H/ohFYrzwKVl37ijt27v9AghdXslUZVQaUvXLfEIhJb5Cr2K52 PDxmFXWMpxavkCXHtCDReVgvTyJBV7bBbiExeltXq1+m+OFVHTfk3oxM2AUqVLpvM+QA 0kuA== X-Gm-Message-State: ACrzQf2xW8RSvv/kYSzObSsQx5/Ql6ZDAoZj9dWyfYnNmXsw7YGA0a+J JmZaGwSFN9LS14yA5vIAf9bS+g== X-Received: by 2002:a1c:2743:0:b0:3b3:f017:f23a with SMTP id n64-20020a1c2743000000b003b3f017f23amr7236377wmn.137.1666896292162; Thu, 27 Oct 2022 11:44:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n41-20020a05600c3ba900b003b4a699ce8esm6424668wms.6.2022.10.27.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0BB6C1FFC9; Thu, 27 Oct 2022 19:36:39 +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 v4 18/30] tests/avocado: set -machine none for userfwd and vnc tests Date: Thu, 27 Oct 2022 19:36:24 +0100 Message-Id: <20221027183637.2772968-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- 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 27 18:36:25 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: 619217 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508860pvb; Thu, 27 Oct 2022 12:15:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM75iPaBkXEp2h/guGJSox3qzb1K+3fqJXGcajAUxB3QZg2BDjUP7ZKNUzjxlMnXgmu4rdGr X-Received: by 2002:a05:622a:155:b0:39c:dd12:3d10 with SMTP id v21-20020a05622a015500b0039cdd123d10mr41082408qtw.202.1666898126107; Thu, 27 Oct 2022 12:15:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898126; cv=none; d=google.com; s=arc-20160816; b=GiR9wJHGrnNzBGrOQV5Qowsx+2pso3ehCGS6XPveDV/ZGoeDVwj/0SQK2IeTif8MMy Lewr9GPZLHAQ3EIGgG/EC30LAbMvt4jouLu3kU6x+RETw3+CSqjC6SG3++wE5fyrxzjp 9H+5cWe1du2lKgjiYXVIjam7UdVM1Fyp/GPs42kASEv7Fs8P9ZB2KP+ytTGtuoT9XMfM rf075htrwWmb6wusl21enHQGh+HewHx//tvndZhNtb/tgcDgi4AmYnD9nCpyu5uYh+G+ KuarpoCZpHfxC1Vjy0gKMz2TdQCSqWB+mWEQfngq9XeGXLkaYk31o8xz/aZasbmDaF1n 6hkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=+MUx8tu/rSHErPzSyKT8A82g1ji64kTn3Kr9KzrS0Qo=; b=qAOaXW18IwuYamSqGb99XCLqh6nrzjrVdR60TbPSxqOex8scFkiXY2VJ26VfPFiIRw aXxDZB17D5t58f2wWNQcVIgxL18KJlcTSzoqapo6s0cmLCQgogRO5bChHtBjS1klqjm0 73tLPVny2ol807dRVthV40F1Bx5u0MgoFFZY/7OG0nU5gnzXDGkkqTcP4YH9QwWCZlRA OcLuL6rrGV2gQD7I9f2fpNbhkclq489+Xt4sUn8sdBY2/YrqO6t3ZpsyIUsccdty7mdc oBVy2We9HMjh9aAV5+wKOyvGTLLtNHHv/1PdBRhvH+Dw27bYtiK+wiWjT1BkREUPegMO P9/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V31VVniP; 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 a9-20020ac86109000000b0039cce908bd5si1205328qtm.74.2022.10.27.12.15.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:15:26 -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=V31VVniP; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo82t-0001cY-6U; Thu, 27 Oct 2022 14:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo82G-000059-C0 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:27 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo81n-0006AM-KY for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:23 -0400 Received: by mail-wr1-x436.google.com with SMTP id k8so3777607wrh.1 for ; Thu, 27 Oct 2022 11:54: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=+MUx8tu/rSHErPzSyKT8A82g1ji64kTn3Kr9KzrS0Qo=; b=V31VVniP9/h+TPAj1GY6ndRreRTWw9TtoY3WFnnIkfENog3Nkqs6jx0g27npvOe8H7 X+w8OLu/SQjGY60HK+yBj9RZj6dRsP2++Blgny1UNyxER8KahXlWIvfGb1JLstiOYhw/ ZmT2C63sMrshlbxPrsSM+/usScRyS78uiCH/1ee4K7xaZPwhExGjCa4vEmoJXcGKTl+0 K555HWm03gvx/ne08EWlmIw+fhCgRC3HHKoN7qX5n2+gzy2o5F8MWuI8vqMat0U+8wON IMFcSuskPs8PE2O8/9LXTth8M8wNOv1xK5bBlYKd2Acx7V2E+078Ankji5Gm/hCghc43 ZCxw== 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=+MUx8tu/rSHErPzSyKT8A82g1ji64kTn3Kr9KzrS0Qo=; b=125vIlsXBCF3MTGxLnomBRxVa3mR7/ASROO8qGK23mwN0K3iinwMyD6RNnRRzj2vI/ ZrMDEa4irUnrtZQKRgrFZnuPUK+iFJkzwkRZVu/tpFNjdkN1uyHaEW8KNHCCicAfxr4K LcPe6wIXQFUtw7sRVNjW7bVWmR8XCjLXYFgMJrnYuy+eZoWPn2DxB4rijvorA4mRawwQ Clb1z/4C3BNqvxGUgdJukTbYweT0yyLDZCX/m2BOwEvpi2fJfsppPCzyUykKVK3UIpEj ZwbC1eOUsi+1/3TNHPNLO/keqQcC180lWhJe2iS5CmDbhO2ICXbPTZkXZFqKx/1Zd7MR zx/A== X-Gm-Message-State: ACrzQf3VjBCmwJGpoVjcq6tAglWEyc+inPMnBlDanuLH3iVCfSQVrwrG SbRGTr61NeseIGHdechZfGKGVA== X-Received: by 2002:adf:eb41:0:b0:22e:fb16:cc43 with SMTP id u1-20020adfeb41000000b0022efb16cc43mr31508652wrn.489.1666896893055; Thu, 27 Oct 2022 11:54:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j31-20020a05600c1c1f00b003c701c12a17sm5609606wms.12.2022.10.27.11.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:54:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21F9C1FFBA; Thu, 27 Oct 2022 19:36:39 +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?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 19/30] tests/avocado: raspi2_initrd: Wait for guest shutdown message before stopping Date: Thu, 27 Oct 2022 19:36:25 +0100 Message-Id: <20221027183637.2772968-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The avocado test tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd finishes with 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 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20221020102012.3015662-1-peter.maydell@linaro.org> --- 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 27 18:36:26 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: 619220 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp509896pvb; Thu, 27 Oct 2022 12:17:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5C2g0G+IC0ZAVpkpE3LO0CeCFh6pWuI02vUyEtJIRUciCvae6+tKwEuexaZW3xpqTauOHq X-Received: by 2002:ad4:5b8b:0:b0:4bb:a86e:d7b4 with SMTP id 11-20020ad45b8b000000b004bba86ed7b4mr2390527qvp.108.1666898228380; Thu, 27 Oct 2022 12:17:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898228; cv=none; d=google.com; s=arc-20160816; b=oq6glKxsKZ1TQdmTtfhihbdQEbesctxKga5RYD0fuCyUXeLZKmRcEj8U30tZZLipx9 HxXyhqIanVc1l19JlHRK1NtLB/frXypdPdnWVYeMx74Zh4kjj1sKBdHmuhTg5n11Ekh1 oZPuEHLzgCb+JrW1aw43+J/CshYiOt6MfecDxcDuwo+Sq0O2BHMyKQamhwP48SsqeFcM 2XTBjFgLG2hrA4+o0PwvQz21ahjDAREpl7eMZILuNd3wbvZ90mJg8FV1hAdDXRtglOvX 2mzPSOPPk9AsqFzqfkR79P0OEjRMoDcHsqLvnLw7/WjDieznSZ5rv32wZ9p3+yOTPl8h i8tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=ZL65v0q08abuMcd8/dJR1pUqsCkfFRqsKtdLqAeDaiw=; b=Im1SEkHvi0BLkB126E3q83XZv5HC3D/455JKKPDCT4Qpa2dnezkUVVy2YnDiO39WS/ gCyfEZrUy9pkjHhaPMAlYaATWD1EHT6mF11QBG/OyJ2SeuRaC4c8dZa+yXNpiM4dgwG2 Csp2GjUWkxvtHFXkVQWKYz9lOayX90S/3Azg3/l/zJ9IH9bBkOWqmt9oNaMArE/9W1yz rz3I3EiBGZMBiGfjlaupRGwGW4WmvGvgbTDXtF+dhgm76G++l2rDHOu2tBgyV6+lMS9T XaH8kEmIdiLC8wTu16JGYzH0zuCTyGEmxDjJm2IpOMDL/5YUbn6ZtOh4k461A/InPuUc 0wrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qiJ+/yvc"; 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 o12-20020ac872cc000000b0039cb84b2f4csi626171qtp.763.2022.10.27.12.17.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:17:08 -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="qiJ+/yvc"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7si-0005ao-AZ; Thu, 27 Oct 2022 14:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sC-0005SG-1J for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:03 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s6-0004jP-BZ for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:59 -0400 Received: by mail-wm1-x329.google.com with SMTP id n14so1581935wmq.3 for ; Thu, 27 Oct 2022 11:44: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=ZL65v0q08abuMcd8/dJR1pUqsCkfFRqsKtdLqAeDaiw=; b=qiJ+/yvctHt/wwB0cDMAsn79ysduxf0i4rVsh9GCRjFzl/RvNmvwBwIRZ97VrXY05t /ZCid/GvtUnub0pI73k6lLNpiqRUkt3ViwSkY1RjhuWfkdvgZ3+Ev+vZqtpvsgsi9nJl T592Iv083BoO3+p80NQwIPo/XaXFnDo8c1Tl+kZkR3prACfPZFGn7M6xxUOnIEbtdLhA v2pCGwfUBmBmW6DeKXGy+C626L4Qu7ZcBUPvJr+viP5y4UMZ1Pt0GgpXRlanVtp9LDHa FW4oRvzxyWwgXtjz4YI8hZi+cjfjLh7DGeURNqH+0SJ7hlkSj+02F+PPbQIHOcruomms cQEg== 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=ZL65v0q08abuMcd8/dJR1pUqsCkfFRqsKtdLqAeDaiw=; b=rF7xivfgzX5/EFRD2bzsWLm+eXxlnzTN17enjAV+INqm41wrs3ecqr2TR7DObRqrgl Tsp4O5cGWdtR0tTeSNATQHiArs7gvrpOhsudBgWfjDOAG283h378+cLtzZGa9SpKG4K7 G7iOZ4rkx5UyAfTYlaEVtGQJ68jxiJOK5/5o6PU1cOcvxkkKLNl4Y5iGhkvgCx9iXK4s vkLKMqWTsD5JWSZBuKtmKRHU35WFge2iLi5pusEdOsmO7/dbFm2w+GChHzdRuA++SOo4 JxuixoVKYWU8ipoi6+dMbYLqPDa2+NK9FS+ahgV7q/Sujoq0m3QWOSg6pKec7hA23weF fMmw== X-Gm-Message-State: ACrzQf3W5LfXxbf7UdWO41RJEoOiNqjfE/F7DWSHTh/hRwztyfbnBzDa cvODRFNne459HKeAhmP85OIcqw== X-Received: by 2002:a05:600c:19ca:b0:3c6:ee5a:45fd with SMTP id u10-20020a05600c19ca00b003c6ee5a45fdmr6952156wmq.106.1666896292975; Thu, 27 Oct 2022 11:44:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e4-20020a5d5004000000b0023655e51c33sm1748613wrt.4.2022.10.27.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3986D1FFCA; Thu, 27 Oct 2022 19:36:39 +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 , Yoshinori Sato , Magnus Damm , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 20/30] tests/avocado: disable sh4 rd2 tests on Gitlab Date: Thu, 27 Oct 2022 19:36:26 +0100 Message-Id: <20221027183637.2772968-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Thomas Huth Cc: Yoshinori Sato Cc: Magnus Damm --- v2 - add import for skipIf --- tests/avocado/boot_linux_console.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index eed4b49e6e..4c9d551f47 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -15,6 +15,7 @@ from avocado import skip from avocado import skipUnless +from avocado import skipIf from avocado_qemu import QemuSystemTest from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern @@ -1175,6 +1176,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 27 18:36:27 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: 619200 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496538pvb; Thu, 27 Oct 2022 11:53:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4VrZPVC0x2CdfqtOynTKKMijdSmA/XtS6SyRbVq/gNfSevyiXzFraGVC0rn0QnoODEw8Ja X-Received: by 2002:a05:6214:d47:b0:4bb:614c:da68 with SMTP id 7-20020a0562140d4700b004bb614cda68mr23635281qvr.72.1666896811419; Thu, 27 Oct 2022 11:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896811; cv=none; d=google.com; s=arc-20160816; b=OAzcvvAQWioqvoTJ0JUgV6AjZSFyMCzi/FQMJQ3uImegpa8OYA8NKQLFEEkjjmKx65 9QQFLWL3Pmr8e5bzg4nrdirqkRGC0bf3NsOQx0OTDzp2zbGgfwzOqVFNs+8LAtPE2N5u woDzziRUSoKCGfy7mqj6Ew6sLkmQ5faipVY4xHjHRfoObp5TgG9stBlv23uxCP5SJ430 c42t+kX63km/RfVRcfxvcr24T/hROuhyDZwR8dmL+bYgl7aApYTW25aHIwm/kNkRmTJr b4WVcHWtZAmQ8xRSoDJZjVGusty6xevC4jjgu+uGP1dM9b9lTFcBYs4kmbx+CYm1EObr xwsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=nz3u3EOxgjJf9Wiqq8Dvc92321GdoFjnj2g5e+GRydk=; b=F3BB4rToaDDJkXzooWKYuW2gLKVzv91zariHDrD1hPArs9DuYDE+pn1v2AVtLtguW6 LlgdxeIMMHX/bVYdtGQ++u6KOTJTB7ihC+9q+sqsUtvhFI38O1BguQ+e3f3tI2yNSnmX 4xEtrd522Su/6T25ej3qyuAjqQA4pSIjxjJlh2YQIXqlAVbwBUvfNhZAVX65018dasy7 xGoZ0gap+Nmvg8C6EGtSd7vCNNPt0yi1aJ/pPeCV8dPkZWVMqDfIydXBKGI666AAW2NJ 2Jb57B5itebVsed9PYXdveVgH6PFzWXMusDSuUzcjVkdISlKkTpkbR7k8DVpu9s0l1xm obWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gdmPqbmJ; 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 ESMTP id 5-20020a05621420c500b004baf07cda19si1543592qve.110.2022.10.27.11.53.31 for ; Thu, 27 Oct 2022 11:53:31 -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=gdmPqbmJ; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7n7-0002VO-TE; Thu, 27 Oct 2022 14:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7kL-0001Pe-OF for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:54 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kJ-0003Mo-He for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:53 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5so1577064wmo.1 for ; Thu, 27 Oct 2022 11:36:50 -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=nz3u3EOxgjJf9Wiqq8Dvc92321GdoFjnj2g5e+GRydk=; b=gdmPqbmJsvjcmgkUJrxyZZpPYOG7AvtrXNA4oQDi+mWccclbOgrDYD6A0Zmz3srRKo wJTbCpwT5H+EBhWnF5Gqm5gteFrnd3XygUmalcUVSM39mxspDSLYD1ZRob99CgHfskd0 ZBcmXO1qXEtt6fYwEBuQG1xpX9QcH9EoZ21SvDfU2MO/wo5fU777mqFxF/CAqcgEYnFa uwfxTd9brjxHi/mX6JcAKbGd2agkST1P3kQFyo982K4Pyd5PTpgYQKxL1kMZD+6sU2qN qaqFzweQne9AN3j8i0cIUlCn7oasMI0D9jZ6sK1JoXhjeMPnCtKB+kR8gVd6LRUiW0ZB muRQ== 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=nz3u3EOxgjJf9Wiqq8Dvc92321GdoFjnj2g5e+GRydk=; b=omK9bNnfmHl/wWm60hTaGesZt0UXy8/Twbs8VvqLmQMDu8fwkY3bOZuOpsxkQ1qkKC I6VK+7HpDlzO+i1DbZ3eTjbkLJ8y0vHH1NXwLAVKqWtQ7mYWyu+/6wOU1fyzF6sNUxXJ nBRgRL/kwEPvfChFPVe6W5cEsu6HfjsGg8IKH40CRnMa4t/t5bXhhubvIcG5sf57CE2P UziHi/P9JWGIgyJ+KfbyDkeF0j1hIH6shVEIlpQI17rjMlXXvmRVASHMKs5Ji06sX2EN e3qaZBxIRduUwBjGbu8p4+GLyhRJb3L8Sjh1APoOwYUBQGg1+qj9q37mQt93lvZkmhGt HeDA== X-Gm-Message-State: ACrzQf38WzK2lQXfzp7/gM5XskRDKW8RX9sMHKyOV8xAfeDJtncY3sLQ lkCCJJ7+JPxFt3FePPr/zPpZUQ== X-Received: by 2002:a7b:ca51:0:b0:3cf:4969:9be6 with SMTP id m17-20020a7bca51000000b003cf49699be6mr7004846wml.24.1666895809276; Thu, 27 Oct 2022 11:36:49 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y16-20020adfd090000000b0022ae401e9e0sm1676360wrh.78.2022.10.27.11.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4EE111FFCB; Thu, 27 Oct 2022 19:36:39 +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?= , Yoshinori Sato Subject: [PATCH v4 21/30] tests/tcg: re-enable linux-test for sh4 Date: Thu, 27 Oct 2022 19:36:27 +0100 Message-Id: <20221027183637.2772968-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Yoshinori Sato --- 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 27 18:36:28 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: 619203 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp502518pvb; Thu, 27 Oct 2022 12:04:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YKi6ukvL9crBgqEt0fQf0lr4fa3VRUXx9jWbRD3I//q+bGZzwIPTdfSw4DwzGDjVzohfX X-Received: by 2002:ab0:59a8:0:b0:3cd:aa28:aacd with SMTP id g37-20020ab059a8000000b003cdaa28aacdmr28839835uad.123.1666897471924; Thu, 27 Oct 2022 12:04:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897471; cv=none; d=google.com; s=arc-20160816; b=jaBvAFlMSpVuDDjTnsoxY4XKKFX38rors+W9HM3YL2La6/35tLshI46oN3/bxzUMQt R0gUPFm6rdzei4UY8gvc3NmGtQAOuOksy5nIouaZ2YtU7CfZ9/IagzO29G5DObJq8Gx8 DQtZgXavCwcLKvM54NhaTCp7cevRFr6Z/jktafqAaiA6IHAv81pduAtLklyHVMhbnL25 +DE0u0nEmkc7A9XWcKDTP2FNf/Uxv/7bBD01hO0Wx5RmsjRSS8wiqTcJXsGKQKvt2qw3 JsgaCr3BKaUD/hYdP6DxlNx/mtOF0I3oC3Pslozll4sN+09kowWxaZlZgY64yvA8DEYQ TD+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=cs5TmjKcezt3JkgcMGANiOUnBXiwoc0FTsC3HKa90do=; b=ZcmK7cb7gZXlVkyagvKH245WABzlKvhUSq8Ik752CzkymOcv696PsE3TNdRoiSS4Uw sKKKcu16Ue1LIY0pDTKABp6l2xrVzZ8UyVs7RJIBmTnP6DxMaNGjjKsIny1sIHr0ECro X65HxsIq3B89hKRI7Tu8ldaHBQ7fCWbsiy7Wwk75aDwZFg2NVPqbHeHQBsjKGcph5coS SEj3MMiTv1BW574YsZ9zImXxADrrDdhs8qkJYTK9rq+E8wznKT+ssDfsvLflsQMrBwtM Gu6WnTklLS4w54Ng1rxBgezo8X+Pi+8EGdd5pXmJ3AtC6qwRf2wXMTooUW9jik3JaK9n PEuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jeZSkZ/P"; 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 ESMTP id v25-20020ab036b9000000b0040e48aec5b1si469259uat.190.2022.10.27.12.04.31 for ; Thu, 27 Oct 2022 12:04:31 -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="jeZSkZ/P"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7sR-0005Vm-1u; Thu, 27 Oct 2022 14:45:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sA-0005S4-Pd for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:59 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s5-0004jG-De for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:58 -0400 Received: by mail-wm1-x329.google.com with SMTP id c7-20020a05600c0ac700b003c6cad86f38so4830579wmr.2 for ; Thu, 27 Oct 2022 11:44: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=cs5TmjKcezt3JkgcMGANiOUnBXiwoc0FTsC3HKa90do=; b=jeZSkZ/P+mWWloCmi2504APHgOP+BT4zV3GcbigWb7KYflO+172AFQVCXoAIYusLQc TkeF+8dvDXkAy16BOPkcB05LO8DzsjCgCe7K34jB0tvQiWQlY7I/3juRjHKHWkKqBVTI Lb2z8D/UV4LmfsMAo7tvwt1uSjoz5UcZx9hyTf9pDJ9fXYQQ3grvEON0ts1ev3c6ImBN xvSmVnAIsIuY+ZYO5Ex6cMnULVqz7IfPz9zsezJ3sRqtoWzzIFj0p668qv1Tk9VOnARI txv7P3jvSW6DgWKS7HizWiyBpHtvm8VHbx/ecmj5LmUVT5NRxqYmhkdadzY3XxArROFE T4kw== 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=cs5TmjKcezt3JkgcMGANiOUnBXiwoc0FTsC3HKa90do=; b=XRaN6cvMrzgWRkzj6gBbdQXtGsxgOuH/mwBBSCOB6wBlE2JttxuxRbatueqMQKabXT 6qS7wgjCSaxJF0CmAmjB9lG9ATOYq5276KTTEqiT3YYbXR50yBFb0OQyE0JRTBF0xCty EZGjGH+pOAt/1Ee4An8dWlx1yTG3wjus4UNLJ/Ts6DiaeDy0lATzPIIOq9PyyN2Qvdwb 7Ixtbe2s6XUH7fi5wMdtM63pTnZDgn9cFcGRHvPYjjTC1JR/mXgpklmtvtMdLjIQ5ynx wlDAtFiphgeWnmmHvU5C3Q6oW2PQouYiDVJTX18t75YaKm7t8IT94KrquR+8yTzEFZxR gKTA== X-Gm-Message-State: ACrzQf2GzFl7QPcM65ZfkJCNl56ppzqXNkn5vYtGwmkC7t76qYycnXFd nRnsgkOTF5TLzZitlqpfjV7tcw== X-Received: by 2002:a05:600c:3d13:b0:3cf:4d63:243d with SMTP id bh19-20020a05600c3d1300b003cf4d63243dmr5976892wmb.24.1666896291812; Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j21-20020a05600c42d500b003b492753826sm2083113wme.43.2022.10.27.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 641831FFCC; Thu, 27 Oct 2022 19:36:39 +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?= , Yoshinori Sato Subject: [PATCH v4 22/30] tests/tcg: re-enable threadcount for sh4 Date: Thu, 27 Oct 2022 19:36:28 +0100 Message-Id: <20221027183637.2772968-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Yoshinori Sato --- 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 27 18:36:29 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: 619221 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp514004pvb; Thu, 27 Oct 2022 12:25:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6t6U8Fvx9faVpgOjd/nW2rt+JyL0SbBozCn6YS5YMWbUGY9L7bdUnbmb09jvAvenc/iLvp X-Received: by 2002:a05:620a:1a9c:b0:6ee:8edc:ab47 with SMTP id bl28-20020a05620a1a9c00b006ee8edcab47mr35877351qkb.575.1666898728130; Thu, 27 Oct 2022 12:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898728; cv=none; d=google.com; s=arc-20160816; b=K/9udf4wXPgnkN1ViMPNL2Dss1YNm4UXUMx6Ane/l7/pN1kuUBhnwUit49zMuCIdjT fTYM6y/2t7j8EXV6Hyq5nn/rT+pQxGn/gKYwp8Uz+kQY0iZ0vHyRxF6R23lXJO17/Fgu bhBV6+yXUGJ9DV5Wytwnv1J3MCkod18C6Bq/iSBmdKxGzP+hLYlDP0Am0r5hD940ok47 WGftdiYDGcd29rscpQb8jRGgbfWnxLdrJlNEiwqT6Cl0/eBI2ncDgdMHCYVoYpSMGnF+ XCz/UutMB9ABgFiSr3D0Z1g3WEhYWXgKfScX0rCvpLuSt0pxNsX5mjbE+cE1XXG8/GbN DYNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=I48suNbQikYuH9s7TValK9nQ2am/zXtj+ooNNaowJ8+ZLvEo1zFCSiB04nQjUlq2gQ WeCJK73zT6J9SRarqWWgkMZU9zu68NHgwucyQqj0y03/ZX7y0pTHvMcaq+15xMfI8zUF HnhOIBUY9p9WOaTUGCOUjNQqYJxwv8PfDzo+h8sjqDijScc2//2/K1DchpFmtxjgkRrL f2JJOhvT6GIHHM+gjUcc2rMx7MRASQjxDvoquYfghu27cPO+7AY3KDEiCnKZqF7LBok6 elgvxnMuhplCgFA4NqZX1GkJ/OWtMb4PT+Hfh7zvGiz1DF1OW8P2wlTzCO+BFNx/Xi6K kS3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CkoQF7g6; 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 l19-20020a05622a175300b0039b0a041ab3si1629912qtk.342.2022.10.27.12.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:25: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=CkoQF7g6; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7t7-0005is-LP; Thu, 27 Oct 2022 14:45:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sI-0005UM-8R for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sD-0004lY-SL for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id w14so3703936wru.8 for ; Thu, 27 Oct 2022 11:45:00 -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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=CkoQF7g6quPYh38UuSk7pk9dXlQLtVIMLdHILdg6ZG8gnFWLBtJRBkp0lNmcLtnedS C/+sslcZ20FgXLhwo2bd2npNjD1Oep9pERAueHmh5OpFqokvg3rz4eYH4ZxjefEaro/s +OaqraK6+7QmHu84z5SIViSnVc5PQ8usNO/AwC3vys0V/JJSS2ewuxH+X46BgeU6a5mW kXcvvpTtmL4Tv64TNa/FbSfcFjqw6zbE2M8i12w32C1RVQLV67zd7Bgin5yyROQd3vEo TNkrZCGEufIm/aDSuj+BETad0vMIZvu2iaU2PMmcemPpvkfMOQ9TSoROb+xhDgvYAz6S QuRQ== 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=XBKvcXH7eko7TPHV3oI1LuhtL6vJkLmpUuV3hPcT42o=; b=dCh+h/sN+mMAECOzmJgwgqsjA/45DXP4/k1VNzErMoVMa/y3I4Ifhx3N3WTzjqkODT ebqpMF3WgaP50ozoudpCVX4hZJ9AQvJbHQmVmXaFkT6cW19xIZGYr7lvNm/ldwCINSRj Oj19NpqB0T8ktPOkLF1tR9qKog2fhAqKnEgm9eRtOjQoiMch0QEJtzzz4tNt4d9CxWrk B6OIrFvJJ+R5lvGEuQWhz7LLoTLIfUqbajmruRLAUqWOKgnKnuWYhOUFCvI7VbBmDByv t2PvzhB+n5zfnsJVlqm8yIXQTs6TSPEbTfLDa+PL2yri+O/JVJ/or6H/vfu+1fRLOLNN Xk5g== X-Gm-Message-State: ACrzQf1uMg1cVfpQFfhBMJXlviA7xsFeKwBXuyeq+N4zxjkKMPUv/lgd SZmgON7kS47UIKaGGY4gKdA+/Q== X-Received: by 2002:a05:6000:2ae:b0:231:86ac:979a with SMTP id l14-20020a05600002ae00b0023186ac979amr32750342wry.611.1666896299626; Thu, 27 Oct 2022 11:44:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f15-20020a05600c154f00b003b4a68645e9sm6132496wmg.34.2022.10.27.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 796C21FFCD; Thu, 27 Oct 2022 19:36:39 +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?= , David Hildenbrand , Richard Henderson , Ilya Leoshkevich , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v4 23/30] target/s390x: don't use ld_code2 to probe next pc Date: Thu, 27 Oct 2022 19:36:29 +0100 Message-Id: <20221027183637.2772968-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org This isn't an translator picking up an instruction so we shouldn't use the translator_lduw function which has side effects for plugins. Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich Signed-off-by: Alex Bennée --- 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 5798928473..9df7f9e693 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 27 18:36:30 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: 619226 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp515712pvb; Thu, 27 Oct 2022 12:29:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6rTrc7LJfoQSoTVhBJO/MIVMf8s5eIqLp8msFSgA8JCgTBVvR4+lnvZV/A/F26FP3CV+2p X-Received: by 2002:a37:9584:0:b0:6ec:55b9:b8da with SMTP id x126-20020a379584000000b006ec55b9b8damr36723243qkd.735.1666898951363; Thu, 27 Oct 2022 12:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898951; cv=none; d=google.com; s=arc-20160816; b=EoDTvLmpRx3uFM5hONzGi9F2EIERRLUpkxhtl/C/5l4YtbKpaUeR4Y57Vj1USvSdgU BoxGM3nXxMW1eTbvkZRuX7VbnXq4VxBTPy8FL4s86P5HhUGB6t4UoxWH/XwgAimylMGF gaKecsceD00E7btnNZlwkkQxl9wxG1IFPcX1t5gZNB5TmqW2sraLiXpDdABp4VU2rfBQ sXMCao3NoMpKpgA0R9Y1KDjbPBn9iZJzaEcrz2gPgXJN6kyq5fyQDmwVGMDYAHhy6aIS n58pDlGUqZdGkBTIqSv2kKoeyqe9uYmVbMI07JkrQcLyQPsU3P/+vQ0wqHH3TDcUO0Fs SOyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=7Q3YCOQ/uatq/vj7coPL1TuVcy0GWDngH2i5ai2OFfY=; b=QrzUf213zWN9GWTn8kP6sCA4iAGJQf5G6WMEXscuQRnYTCPReYR6bP816skR3wJCJA W3t3DHOEb5zD+R57odln2vKREgFmSGWe3AkXtPQZDsuW0HonHoPmTBZ5QDfBP2E1kaCP P7EnjkBuPJC96y/uuoZj9zrcfrHfRkd7M9M/MAc4MfOamyhOiHPiKfDvobJKC7/ZQ7uL rb7KYul4yNeHRaG73F2NqJGBFAgZF00UJ9Wl2t+1FqKgUSiAIiWyOdRnC0YfqzHLDcZL d1UnT2uy0sPnDVx4eG01Gate7x0D0B85Wa3NbUsx8reJ7n9p39eopTb81ZIUYn4iRIAu VUzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I7hlB2IZ; 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 x9-20020a05620a14a900b006f9c38c1e4csi1291726qkj.289.2022.10.27.12.29.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:29:11 -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=I7hlB2IZ; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo82N-0008WR-7o; Thu, 27 Oct 2022 14:55:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo823-0008VB-81 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:11 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo81m-0006A3-D8 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:10 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w14so3741077wru.8 for ; Thu, 27 Oct 2022 11:54: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=7Q3YCOQ/uatq/vj7coPL1TuVcy0GWDngH2i5ai2OFfY=; b=I7hlB2IZcpJRTrfOvVziq6StBilTSYSLefTTGh/FztEd539tyd/hbZQ8QjPEOAdA1W +ZYQhTqjsax/w4napLZr9C10nwBTtex0Ljo7b9PgVCXHXOA/4Er2MUzFB4YM9098UwOR kfugyxQwhGc76311DwKO3SJWbFdhvcP1pLMYRqgRPLg0aZ18IDtY2xFzFzE+px9Emvp3 XobIL6UCIFgtmy7wS5VQEIaafBZeFyLOjcfb/V3Z/cAcPbxUWH5r/AeAqwwoSjliDn4o mhW/sFcmFJlEL8Gi8+5ng5MdF6YKFT19fpdikS8ygF7md4KcE7NLSNY70R1bMesDbFVo 6e2Q== 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=7Q3YCOQ/uatq/vj7coPL1TuVcy0GWDngH2i5ai2OFfY=; b=siGfF7CinPm2CypMTXpKYSsgthkmlSk93JUTZpoCE0l2em3bWlQuMVWiCI6w9oJjqo T5WpIcnzZzzdphSjMj37E8yPAph8CXWrtJPyH58rBHPblbb9tjQkjBBGHzDKGM4cnMVT 1oDPYRsaSUtkW8LEMEnoKiAYFHzlmR1InnYEcn6s45NHL9XPzv0vyjcTPFzoKVoThD+Y kG0PdCyQZVE11slzhS1/D2Z13hlQEndX+on+7j6ZWfB6KQDLC4Qo72ePgG8Cz36ggVPS a50iGCDCZCVVDBmxSbYrrVCQ098sZo5TLz6hVFlcdqQsf+rPTGDVo/jbOFO5Wrj4Ggp6 zP3g== X-Gm-Message-State: ACrzQf3kGoD6z4gdVfMp4GIWDk3nixpvpjQQ3Q7Ydtfk5SuCawENDBzE 484pBl2Zo5B+lUAVA/VtxY9u5g== X-Received: by 2002:a5d:4e0d:0:b0:230:4e21:cb1e with SMTP id p13-20020a5d4e0d000000b002304e21cb1emr32325877wrt.232.1666896891804; Thu, 27 Oct 2022 11:54:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p6-20020a05600c418600b003c6b874a0dfsm2479446wmh.14.2022.10.27.11.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:54:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F4481FFCE; Thu, 27 Oct 2022 19:36:39 +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?= , David Hildenbrand , Richard Henderson , Ilya Leoshkevich , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v4 24/30] target/s390x: don't probe next pc for EXecuted insns Date: Thu, 27 Oct 2022 19:36:30 +0100 Message-Id: <20221027183637.2772968-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org We have finished the TB anyway so we can shortcut the other tests by checking dc->ex_value first. Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich Signed-off-by: Alex Bennée --- 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 9df7f9e693..f4122db434 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 27 18:36:31 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: 619216 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp508483pvb; Thu, 27 Oct 2022 12:14:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4R6+aj6RYHRm5Z/2gpKo3AFXra1kAPPbpLxnA1ImSb0Dz6L4a7Jol6aG9cQnWDv0fjhZbV X-Received: by 2002:a05:622a:1896:b0:39c:e1be:9eda with SMTP id v22-20020a05622a189600b0039ce1be9edamr43341463qtc.652.1666898092896; Thu, 27 Oct 2022 12:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898092; cv=none; d=google.com; s=arc-20160816; b=Cpuai9UBVeCBdzea6ozUrXDiSZq94Da8sIEgDPENqMGz513FNJpmpPbaqxSChsnPbj zWxCJc8AgVVFP8dVN3SQlaN8n7TRk0pHGI71sR5MIAwt3rC8s6Ta5jldofRQLC3ws2NI uQRZNmmuwE86V7H1beyZncwsqID1Kuc6qdYvAyCWic39wqPNx+bvXZqmpB/cT9a1qi3l AXKbDnefrwvmxStraEPYKD+jZa55qaRcN4iDCaXGTvMFN7wDa68iMKcQtao9IQvmJ35N qGTW7gim2QV0F1oXSEcq2j+q1zi5Jr8JWa8qeGnb+arvlz9DTImZS6NQ/kPyzSt0U1Yo cLgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=E0JRA0mnvT+Ez0S9FJevL8/17rYA8U8Yr0I5DkAbcVE=; b=P4te4NcZVagoI4w+s/9pt1zbNWiUvKv9lsmQGgFMRCIwL8MfKbjrC5DzEq/PBaJ0my gS2H2BVAh62MC3fLJJFg2J0ATS5/3SJ7pPZWVJSH0CsAj1jRWsom2hMifMw0v8co4AQD cFxqKi6Pi89yo7EqXG5V4bITrj5clGsoXbo6xqUt/A8Wpjt/EanzoRQZtATSfx9GDvLn QfmcgEbAUzCjQrmaec5BWNuDM0ELYKAUyHevJUJ8OngeaMhmYIrFBD/coS4vuzoEaQ56 6YKhEoOMxZwAjN5ArluTxa1QyzrlhHnEbgZmfxQebIhwpSABDUu9Qhv/RvOGaCeFIK6P Ofgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="lMm4/Urp"; 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 s12-20020a05620a29cc00b006ce3f38956csi1575240qkp.282.2022.10.27.12.14.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:14:52 -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="lMm4/Urp"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7t4-0005iI-QQ; Thu, 27 Oct 2022 14:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sG-0005Tm-PB for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:06 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sA-0004kv-8s for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:04 -0400 Received: by mail-wr1-x434.google.com with SMTP id bk15so3682232wrb.13 for ; Thu, 27 Oct 2022 11:44: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=E0JRA0mnvT+Ez0S9FJevL8/17rYA8U8Yr0I5DkAbcVE=; b=lMm4/Urp5RBwBT1JJs4ncg6T+zhiacB3douZhbEVwEhUMDTWzwHOFPpbEpJjN4UqoZ SuQFEsZwupuXdrcW8RbQNckc0e6VY9jpjJyTBL31LgoC7IDB19dDaNxb5ZYWrTKH9rkB 8zxviSJ/a3lDishfFj/TwUTgeX9AZKQ7my+A+ebvMoVYmov6TugapIbzjLKREIm2iEvk DOoA3Mo+sDcA9XrWKJU8I7PnfEFCiaRpg2NOBXc69dsdS/WSM+BfG04uN4lEAiUn5MLD Dq8o0Wj/814W/abem5FpwldYHtseee29D7NenCFS7K7c8W1WWDXaPF1bAQY1J2g5yO/9 3YJw== 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=E0JRA0mnvT+Ez0S9FJevL8/17rYA8U8Yr0I5DkAbcVE=; b=CkNhhfFP9XLGEupmWa5xaCFfePTDqUyMM78htBZ1ybn9tc2h+4K6KputBE1Kc8AMOG ZSD4OuIfiWeM0wRm/o1BrKi1Ch9C4JFxSaMcWZ1XY840sMp8pT5n8pqyCjIu05Bck4E4 kbaG/oVt0LgUUbg5A/MNKPK8TJFvLHQLi0A2R7GDlrrWASjf+xyho5py01IeNQcWDH0x UrWnt5SVw4odsR/BVwRxucyUowBeXrvL1zRgNSOiVkCfqjzOgePj4a2YpcAu4iqCLYjS cHDAmPNxKVgWdsvqTFWZQGBI3XjJ1hhmKx9ls/2koTrMJB/4IQ4NbJfM6229ZD9DykTW anJA== X-Gm-Message-State: ACrzQf3vxtPZaeloysxKNGg3tTar7obIl5KR1HTRyYdQnjGe8oXIFuHX Y+ZuYwt+RD3ZdQMAwCdx2xrz0g== X-Received: by 2002:a05:6000:2a4:b0:22e:35ef:cc22 with SMTP id l4-20020a05600002a400b0022e35efcc22mr33438352wry.268.1666896296792; Thu, 27 Oct 2022 11:44:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e30-20020a5d595e000000b002366d1cc198sm1742209wri.41.2022.10.27.11.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A811B1FFCF; Thu, 27 Oct 2022 19:36:39 +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?= , David Hildenbrand , Ilya Leoshkevich , Richard Henderson , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v4 25/30] target/s390x: fake instruction loading when handling 'ex' Date: Thu, 27 Oct 2022 19:36:31 +0100 Message-Id: <20221027183637.2772968-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org 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. Reviewed-by: David Hildenbrand Acked-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Cc: Richard Henderson --- 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 f4122db434..03efccdf9f 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 27 18:36:32 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: 619210 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp507840pvb; Thu, 27 Oct 2022 12:13:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wHVIY9P+yOajPHoPFoUTNQKU2fmO+AHA0nr//FJu6FhowGmadB9XMGOh83/s4MievDSdg X-Received: by 2002:a05:622a:608:b0:398:959b:b758 with SMTP id z8-20020a05622a060800b00398959bb758mr43006760qta.553.1666898023026; Thu, 27 Oct 2022 12:13:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898023; cv=none; d=google.com; s=arc-20160816; b=g7eyu7jkLh3AZxhKeADdFAsonRNj/MwRiumcsCgN4SrQCjnyP+LoJDlvzkgN/HqldT ryhqBjXkMIFODk9IEZEVE7bt+VYJkVqG4ewDmnLGCZI22AFNCyDlnqJeXhwQEGGetqT0 FjiYiLVWnKgefftv3p6rODcJYPIEBnxMUDGxXyNAxRhg17KjdsMW2m874QgOhWvLlg9o YyAJutmWk4VP3UA1ahS7wM2f5rS8I6zZ+vTvf0HZNQR8pARVDVG7MK3847Ab8hS3Vrgd J9OAVyfDsIKMvkFOPd9Svh0cQQA8MWdyddfQA3x7GoMYhKjDYPV197+5zlIJjaW62Nyc Kd3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=eDFljKF/otcR+25TigkQADh5RjLJttaZLv8a2KQTsBc=; b=GgDEO7M27kmddovXtpzlh/PfZiUBZGCaPtB52PTNwbxuG8ZkWhB8rq1Dz4ElouRc9G jH56LYrTprYlX+vmXQJQmfM90i/dFq9xZ+aXNLzdlV/Kzh+Gm18ASdQZCyVAfRaeSKMD KU3lVr7E1srjtAn5Xjl5dijbCT946xDMGBCdXmskg7Ksqmyg6OmvYHuMv3lmYedKVwv3 sHkA3/pqisrtsTFbyJu11e8Yqv3DPKtXeOkUy1XVJ2FQ8+TpreX+GsCZN3sRFeD/V0Tu FbI8eUI91LAbIDKVZjbq6bEjaSG1GKgZ3Uv4HTBDadf1IXPa/gXcllM5kioMAV7P6qiV tzrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bgykwncw; 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 dv15-20020ad44eef000000b004b185fbfdadsi1380583qvb.448.2022.10.27.12.13.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:13:43 -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=Bgykwncw; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7t1-0005ff-3p; Thu, 27 Oct 2022 14:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sD-0005Sj-F8 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:04 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s9-0004kJ-Bs for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id w14so3703680wru.8 for ; Thu, 27 Oct 2022 11:44: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=eDFljKF/otcR+25TigkQADh5RjLJttaZLv8a2KQTsBc=; b=BgykwncweUWzTciqoE2BYbbm3ULs7XYJJRbtYBFHndFjCF9cW7wnEmT1PivtLRtfx1 wrd1Y+IrcW18Y/BOs0lUnBlNWh8+Z2DYVWdceAutXPxqxw+TLC9RKf4yDj+u/zusu5Qx fYxUNamJFFhZnFtjmKP37vV+/5fN9q5wcmR4HvhPXFbqcGv7/sI05k+KgYJKpOALDf1f OH3eJmhiD4ZivchKgPtfRXn03iSxGDbmUvHXAOM5vk1eHxr46mTNxrWbwvzxxAs+vtg1 MEPAyow4NhUdmp5bBwMAaD52f1GosikKNxNBflCd0i1qWbTS241bcu3UgarjQeP/vchf 0WBA== 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=eDFljKF/otcR+25TigkQADh5RjLJttaZLv8a2KQTsBc=; b=rvFDOCZr3LjiFeMUmzxSQHAw992XbALEcLMnnKlwPO7B7E+sKpdX+ch0Bcwips7Ydk dtXgtp32R028J1HB7VPhqiZTTeWo+PzBNNsNQy2+DHVjNTKHzOumqJzDQpv2KPO4niGM hMQQANKQVnLKjkJox9vXXDDaGum/vwTPCzZqaDnKz876snr8xIa+FZqdfwZ+MXk6mPXp rZqOWyiojFxK2tYMbwNwZaNlJMEJi8UUjM9oaKgfEcZu6ODZHlT2CQ8Yz1peCEMtMZdK d7sLWgqaq+lkPKMcWYtqSbHLeEFaEFKWxza6iGdUpH62J+71bKh2zDdcVh/Z5QEb8chj vMUw== X-Gm-Message-State: ACrzQf3JeWR6FUwRPJLwQDuwTWoxvz655gP+X31vi20yXI7X7Q8pcedV Ob3P5cZT8lRJ67aqwgOvahk8Ng== X-Received: by 2002:a05:6000:50a:b0:225:210c:a7e4 with SMTP id a10-20020a056000050a00b00225210ca7e4mr32693167wrf.704.1666896295947; Thu, 27 Oct 2022 11:44:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bp23-20020a5d5a97000000b00236740c6e6fsm1861067wrb.100.2022.10.27.11.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF7971FFD0; Thu, 27 Oct 2022 19:36:39 +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 Subject: [PATCH v4 26/30] tests/tcg: include CONFIG_PLUGIN in config-host.mak Date: Thu, 27 Oct 2022 19:36:32 +0100 Message-Id: <20221027183637.2772968-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221013131304.623740-1-pbonzini@redhat.com> --- 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 From patchwork Thu Oct 27 18:36:33 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: 619205 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp504021pvb; Thu, 27 Oct 2022 12:06:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6yo7t7fRy4RKf2ykOTqbJfkCP+dDupPLBLvJC04r4a7J2a8F+BIjBtpp9ermIN37s0nd1t X-Received: by 2002:a05:6214:1c4a:b0:4bb:64a3:727a with SMTP id if10-20020a0562141c4a00b004bb64a3727amr22825508qvb.16.1666897616003; Thu, 27 Oct 2022 12:06:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897616; cv=none; d=google.com; s=arc-20160816; b=l2v0LyrPP9E/53aK0zT4ruAFskox/dfF5S6+crPwLPwvDKCI122tQRO0tQj/P081iZ 6H8k0PrPSnGTY4mX0dnVn9CfkUaZQVryEGKTqqB1lhyzJJrpKkrWpyFmkSar2b5eUMI8 YaPcJiupca5r2ElXjUPsSdt+L06HFTWxCoLF2utK2u6scsOMA/zXZ2HSxz7FWWBz3gIa 8WwKaaEuvJmqjz4Hsuu75aYbMT9Up3xaa+POQmNBq55/FrYRKn7f9BRxgc212Ow4kQaG aKUoCehehqW+iUwYN1H6JAoD5bKcpkMGya9La7IXTINd0dk6Z4/bq72GjYmQBHCtnb6f wLYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=aiqxcURpWemXtfy2ejkjSFGPBju8Q9jPUI6+wXEAfhU=; b=OEHSp7Mexnk8nfKdFgszedIPeKDcp1k3F5k9oe4EdhdjEu44tObOAQnbpSjDF8/+Bz CIpJdFOz6kSCH274SCVdxsg7jKaizvqc79QjDj+SMw5L4WfhJ7RxArY1nj3gW9vISMVZ ORYcRVnJyVO7pAAEOs/JU+F6SdU9fp1lahwZg2J5imL29Fx/+otz8iqqPpZsRrLnkrIK 6k9/xOGUIRP8D3SKMf8J3wKvr6cOzeYF23mUJg+pivsYaaLZ2fiCZrcSyH8/JjLcqorV y2woXA/KWQU2xu2xmCktP7D9Cne9pMCaFNXisINPNLQPUgiux7gS5WAHibxWCaRBZ4Z0 o3GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xOisjE0I; 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 ESMTP id g7-20020a0562141cc700b004bb605b1819si1397255qvd.71.2022.10.27.12.06.55 for ; Thu, 27 Oct 2022 12:06:55 -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=xOisjE0I; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tI-0005lK-Bj; Thu, 27 Oct 2022 14:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sI-0005UN-B4 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:07 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sC-0004lG-Mn for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:05 -0400 Received: by mail-wm1-x333.google.com with SMTP id jb18so1580064wmb.4 for ; Thu, 27 Oct 2022 11:44:59 -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=aiqxcURpWemXtfy2ejkjSFGPBju8Q9jPUI6+wXEAfhU=; b=xOisjE0I5JXGfjzH+yHuCBWRy1dbvPNbjs/vCMACJjuOjUohO/KWe23dxYSQKZFTMY gKYWcsRyehIaOUDdYerAx98i7CBhcetgAePD+uGmhECJlJoSE7Hr83uiwhBsx65NBMSq FA9cIV5IgirFSYQN+dtzrLKqZDhE43gA48GC02EHIgTgPr6usZ286KjNSLPJvkUAt1mk Q2NBcVLviBcy3qIhbCtb1NDrkV1WJ3UfDlSuWfF3YnaIX7n7beJkE/pg++WOjYLwnpTT S2a2U0VbihfvOI+FZc08nca0Guth2bfFuimDaOsd8mRWapeXNDOkevXXXSOr5bFYDI/v 18pA== 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=aiqxcURpWemXtfy2ejkjSFGPBju8Q9jPUI6+wXEAfhU=; b=aJhPyfYF/5J/UclKeZGy3u4daZBSMvnnnv+STlprD/c6DIyYM7kZMDmSvQ6B6EG9j2 nLMYfHsvdFGUMJCTXljzocmm0kmBp8XNH8xb1SjSq/zsGW5dhf4kZtVEckuY9cdyOYsr Osn298iDNencOoiZEfiII6n+wlmHwewayVvLw8oL7JKiJyWlP7KTi9VQfaS3fqJI8YcD RJYe+45XiLdJG6vIbS6BZ02721nogPfrpoQt0v2YqroR7E6wBJ0NxMylZIvPenn9h1g1 d9V5GedIhoiBPVp4aeGVwgDUgcqcHub0Fn6o13KkJXApc4nHrZL1t9HuNVkcn+qRVuMY RUdg== X-Gm-Message-State: ACrzQf3PrPIMiV3DGJ+wqpSo0RfXTm853CgxAJ/RWtqAoQeKmy3NGOTP P4eiSYihLkUXPJzCh4ewJ9FByG9nCRQ6DA== X-Received: by 2002:a05:600c:4e11:b0:3cf:452a:2bcf with SMTP id b17-20020a05600c4e1100b003cf452a2bcfmr6867487wmq.108.1666896298555; Thu, 27 Oct 2022 11:44:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c12-20020a05600c0a4c00b003c83465ccbfsm5531994wmq.35.2022.10.27.11.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D530C1FFD1; Thu, 27 Oct 2022 19:36:39 +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?= , Alexandre Iooss , Mahmoud Mandour Subject: [PATCH v4 27/30] contrib/plugins: enable debug on CONFIG_DEBUG_TCG Date: Thu, 27 Oct 2022 19:36:33 +0100 Message-Id: <20221027183637.2772968-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org We used to rely on QEMU_CFLAGS to expose the debug flags but now this is synthesised by meson and only available to the main build. Add our own flags if we detect the build has been enabled with CONFIG_DEBUG_TCG (which is the default for --enable-debug anyway). Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Cc: Paolo Bonzini --- contrib/plugins/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index df3499f4f2..23e0396687 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -29,6 +29,7 @@ SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) CFLAGS = $(GLIB_CFLAGS) CFLAGS += -fPIC -Wall $(filter -W%, $(QEMU_CFLAGS)) CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) +CFLAGS += $(if $(CONFIG_DEBUG_TCG), -ggdb -O0) CFLAGS += -I$(SRC_PATH)/include/qemu all: $(SONAMES) From patchwork Thu Oct 27 18:36:34 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: 619225 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp515150pvb; Thu, 27 Oct 2022 12:27:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VRZ+KOUPzQ0BTrOcDav+/04oxWW4/Pa632cLFVgI/abdRs392wBr5EZTNQJGeJ2Oxczp1 X-Received: by 2002:a05:620a:2945:b0:6ee:c2d2:a925 with SMTP id n5-20020a05620a294500b006eec2d2a925mr36973518qkp.498.1666898878289; Thu, 27 Oct 2022 12:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666898878; cv=none; d=google.com; s=arc-20160816; b=K1wUSyM2vaZf+WMmVZusb0Co4f4Yvwrbd+TkkURFnYh53vmOe76BUomwYEvlZlBxJz 2cv0g9LkE1gcYrMIHe7hF6aujSk8WhsWhjjGPkUttwV1KX1mKoKNbSgcj8K4TceDb5mw nuyWfK5oQHlVfz9KGbZTWnh98Qb/13vvCT1ghrxu6FPLU/X40x7JuDFdk0/PhMtR1BG8 poQ5S9YH3/F/sVbvzl4ZUD5ZbqZlA+Ayqwjh+LFwu0ABIqTrG09BY6bnTIJEGeWou1tu toJWZjGMln6oE2S+GEAiBotVDubk3faAI+lG2aZOgHchGHI22S1WV2FHZ5mlB470Hw5K nE+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=eMYT7dk9gkwhyQGzbmoFJfcfr8V9OEyA0XcsmUrQmgwEVvDMWsq+3KNzIrcaybVBTe /2c4b/f/RaE+BNx2BFtm+V1qAolf0T0UDwDJ9Gji7TwJLzD+t5XqYwOhHFhyenrwr9AZ J3HWn2/1wALxeXKoCh/Dox5XYmMA1h/4FdBP02V8YzDrqA6xTdU8RtrnCK+JnGgM4gPE wNAWT/TZ+W0PQ+MaHUk3Cglg24TeQiQBls171tPFu59YSsZtEnpnRMqW3Chw8CUB/rgN 8CtkUJWGJqKQi/ObRIVaMJmTqPIEo4BJ/BrLl4fsgM2SfQlwcoH26NVC2krWq53rYBLd 2y4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eF/8vFD7"; 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 d7-20020ac851c7000000b003a4ef5c4cc0si1338550qtn.708.2022.10.27.12.27.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:27: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="eF/8vFD7"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tV-0005t8-Vc; Thu, 27 Oct 2022 14:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sO-0005WC-B3 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7sB-0004lE-JH for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id o4so3711364wrq.6 for ; Thu, 27 Oct 2022 11:44:59 -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=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=eF/8vFD7yvk4R1Jki1WtbZ7TzHrwCHeUE+9zmtbLFH0w7ir4FWAZxF6XfFS1UR9QUe OUBjTbSOgFt13d148Psz6lgJ3L/ttr3xWDhAb1iVnxnC9wKJb18/Wdxwum4dFZijffqL EmlbIkm/sNYJD1zRqJJ9qKO2EbIO7t3p3+Or4ZNldCOHBUTEN7Wl7vCwg+NG5emfekPu kKLMHiul2mphHhM0y8WYUxmCl5PEkx7GFoM30z8oq5oDrrb4GKW3PLs4pczDhzGVUa28 nYtbBpF/tQo5QxRiQOnfoY9Toi5FF6+F7KNKNL8voLahLHynwX14hgPWCWA8HMxlI/Zd N8ww== 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=FLSLvPI5diE0vfct5cvufJQNAvAsRI7ZBMMMOLBJMAg=; b=Ua9TvXrW8IlLzJAu9gn6K4GBGm1l4VRJGySMasIRVZo9FLgN6aG21nySg2zhcqyKZ0 q0CIa2peHlawc7lEeKVidEkcViRbKw5Mf34mCWLzGDkbU8i2B/Ue6mx5/XXeYFKObenT 88vUaxv/EcIbHxboChblKE/LuACAgVxmCnWeZW66JZKpZtJHa1pbnafGrrZ9TwEmK9W+ 4WIPfFUnBIpdNc3lVYfAIaFEjM4/dbBSDpAoAWI1sCEo7/xE6IIME/XjPr0QsEaFZp4U EjPdMKXIq9RO+CH7vkeeQhjP1cYXJqEwCBeLeDPzDOkvieMB5CcvDN9ESWE9dLepkreu qKeQ== X-Gm-Message-State: ACrzQf3/r9krwF03xEGXBqWdFaxt6jZpxzgRGuOzV1F2IZtOSSy0pLFh Emb8BHnFop1JcuUw1bNAVGgNlg== X-Received: by 2002:a05:6000:1447:b0:22e:7b1d:cca2 with SMTP id v7-20020a056000144700b0022e7b1dcca2mr34094494wrx.276.1666896298059; Thu, 27 Oct 2022 11:44:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l17-20020a5d6751000000b00236488f62d6sm1797013wrw.79.2022.10.27.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB04C1FFD2; Thu, 27 Oct 2022 19:36:39 +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?= , Alexandre Iooss , Mahmoud Mandour Subject: [PATCH v4 28/30] contrib/plugins: protect execlog's last_exec expansion Date: Thu, 27 Oct 2022 19:36:34 +0100 Message-Id: <20221027183637.2772968-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org We originally naively treated expansion as safe because we expected each new CPU/thread to appear in order. However the -M raspi2 model triggered a case where a new high cpu_index thread started executing just before a smaller one. Clean this up by converting the GArray into the simpler GPtrArray and then holding a lock for the expansion. Signed-off-by: Alex Bennée Cc: Alexandre Iooss Reviewed-by: Richard Henderson --- contrib/plugins/execlog.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index 1b3bb7ebba..e255bd21fd 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -18,11 +18,30 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; /* Store last executed instruction on each vCPU as a GString */ -GArray *last_exec; +static GPtrArray *last_exec; +static GMutex expand_array_lock; static GPtrArray *imatches; static GArray *amatches; +/* + * Expand last_exec array. + * + * As we could have multiple threads trying to do this we need to + * serialise the expansion under a lock. Threads accessing already + * created entries can continue without issue even if the ptr array + * gets reallocated during resize. + */ +static void expand_last_exec(int cpu_index) +{ + g_mutex_lock(&expand_array_lock); + while (cpu_index >= last_exec->len) { + GString *s = g_string_new(NULL); + g_ptr_array_add(last_exec, s); + } + g_mutex_unlock(&expand_array_lock); +} + /** * Add memory read or write information to current instruction log */ @@ -33,7 +52,7 @@ static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t info, /* Find vCPU in array */ g_assert(cpu_index < last_exec->len); - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Indicate type of memory access */ if (qemu_plugin_mem_is_store(info)) { @@ -61,11 +80,10 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) GString *s; /* Find or create vCPU in array */ - while (cpu_index >= last_exec->len) { - s = g_string_new(NULL); - g_array_append_val(last_exec, s); + if (cpu_index >= last_exec->len) { + expand_last_exec(cpu_index); } - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Print previous instruction in cache */ if (s->len) { @@ -163,7 +181,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) guint i; GString *s; for (i = 0; i < last_exec->len; i++) { - s = g_array_index(last_exec, GString *, i); + s = g_ptr_array_index(last_exec, i); if (s->str) { qemu_plugin_outs(s->str); qemu_plugin_outs("\n"); @@ -201,7 +219,11 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, * Initialize dynamic array to cache vCPU instruction. In user mode * we don't know the size before emulation. */ - last_exec = g_array_new(FALSE, FALSE, sizeof(GString *)); + if (info->system_emulation) { + last_exec = g_ptr_array_sized_new(info->system.max_vcpus); + } else { + last_exec = g_ptr_array_new(); + } for (int i = 0; i < argc; i++) { char *opt = argv[i]; From patchwork Thu Oct 27 18:36:35 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: 619202 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496883pvb; Thu, 27 Oct 2022 11:54:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6mKyONoz/lMcWUYtr/AvIR2MHpNXOIWBa7RzJsX6dmYmxcChqqyF33CBFw2ax/r9VdPZ3V X-Received: by 2002:a05:620a:bc2:b0:6cf:468e:b8ce with SMTP id s2-20020a05620a0bc200b006cf468eb8cemr34694242qki.699.1666896853510; Thu, 27 Oct 2022 11:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896853; cv=none; d=google.com; s=arc-20160816; b=CaaOkQ2EVdnYXJgCkKaDZ7GrWtFrm1ep6E5c0iXXumwhdKEVaVD7vRW+4LUDPB+92R qDinqg7sPepFuxYWd5X4jab0Tmahw359r//8/nNnSUtnzqUk6zZJOQhivRIN9Z7hOUoG OzqrOxFNrCNVq4D0MuDdmKDEMCGRLkZQrYlkkBAezNMp5h9Oq7Hs43BHCf5wdD1srpKS 1JmB+uWGUeuGYVVGgVKDkyZ+pRSwA44Yfi9yppf48uM3uHO8vrwgLZdz1GsyNx+I5ElA w3ouLzYxZIO7qpk8cKJHhQUkUmojjJLxeuV2NJfY3IzQOYVml+rA3CCJNXgfgGZtf5mW stTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=sHYyMytvaRwCrcUxnHHFfEwhoSYAHml8PTkMZH1b3Uw=; b=OLbxd6sZlBa14ZOULgHARtHYiq+L3hCzbrXogU//zNar4Dp6kzkvYPIbJBePeyvwqZ Vdl43vbM6WGDaSpF3KNPsjrSFwn5NuuLvuzAxoqiD0z4KlgSmXjrRhOAP9mw6rzhJtfj cgPPXMS+gG+teeJfVy+ioKfvSQINJd1tqklk4n9+INcvhFOxWEslmGF3Sd3xHdMD0v9G G3S86T1PpHJhIB4VYo/7EbPXLrm76ToffVZA02HFBrq1L6IerN7dvJr7fPhJXtPIh/pz 7yk/bRR74mrOfVzGfAiyTq4k6kjtYrRSswnX9FS83lBkHPK4v6qV8ASX/ZPiioc70SXf v0Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i7CMzyk2; 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 ESMTP id y19-20020ac87c93000000b003975b079163si1271940qtv.427.2022.10.27.11.54.13 for ; Thu, 27 Oct 2022 11:54: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=i7CMzyk2; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7tF-0005ki-Cj; Thu, 27 Oct 2022 14:46:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo7sC-0005SR-8m for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:45:03 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7s6-0004jT-U0 for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:44:59 -0400 Received: by mail-wr1-x42d.google.com with SMTP id bs21so3717074wrb.4 for ; Thu, 27 Oct 2022 11:44: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=sHYyMytvaRwCrcUxnHHFfEwhoSYAHml8PTkMZH1b3Uw=; b=i7CMzyk2Q/F/37Y8xk/nuncJNSx1vG9hbjqjaNU7I6xAjqq8xZAyG2rzAF7QhOYz31 fQk5uEXt6kZMwFWxZzFoatSA1PMhpBhN4q95vOLpoK96TtkLalZ9C41xJcEa8FbKz1IA gtrxP9h5VSFTAgOvm8B5sEd4HpKHE+qzqn2xNyAj41f1xNhmDvCvDwzOI8W9FmvXwVUU rkbDGrT8zvmGG+Awx9tSLw/TJcy516G7DqQOZrww0PkoGRPxr+nFwuufE1cQxbt478wn 1WMUyn6hpAHAP/cUC+LJSSAkWs/bkddk0to6SNhYjSAmoA0arjGr/FGQtj8F5taeFRm4 NQKA== 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=sHYyMytvaRwCrcUxnHHFfEwhoSYAHml8PTkMZH1b3Uw=; b=KxQEoZPVusoKhHsSCuOBbIBaa+znjSaqZiby3CTHYYYBodKXkxqFX2l0CDLgv7vwkH IMhJte2ivIqpB1/P3kqsIwQOYdsLchvUEXB0p+ADRCUGp3qMQ0sLRqLp73MUxARTFG0k ivtKTSJq9JjePmRDS8jVTzmj5h2fu4hfELwyImy8sYCtYEXjK56R7emMTxj2bhfDe6r3 BpzdHIGf6G7zMqDRgv1PtrHbnljeWVDZeorG6p6jzOtp9Y13QlB0ID9/uUkf3xyJCvZh SE2rmdT520sHUci8QPVSaTpMh3TQo0NxHijwuGuMejwAKPfKgQ9HscbA2vcLX1WsaVdH x5Sw== X-Gm-Message-State: ACrzQf20edvv4w5tk1Wiookdz/i5mx0ArfFpCtNG9NkBZvdlJtS1hVAF ua6zGtn714Gwd4mT4hxfhjIE3Q== X-Received: by 2002:a05:6000:144f:b0:231:2053:ef7c with SMTP id v15-20020a056000144f00b002312053ef7cmr32995992wrx.179.1666896293358; Thu, 27 Oct 2022 11:44:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e8-20020adffd08000000b0022e653f5abbsm1770173wrr.69.2022.10.27.11.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:44:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 10C031FFBC; Thu, 27 Oct 2022 19:36:40 +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 , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Juan Quintela Subject: [PATCH v4 29/30] tests/unit: cleanups for test-io-channel-command Date: Thu, 27 Oct 2022 19:36:35 +0100 Message-Id: <20221027183637.2772968-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org This test is hanging under heavy load when the two socats race while trying to create the socket. I've tried various approaches to avoid the race but it seems "creat=0" won't stop socat trying to create a pipe if it executes first. In the end I just use a small sleep which seems to be reliable enough on the load situations I've tried. While I was there I also properly created a tmpdir for the socket to live in which is cleaned up at the end of the test. Signed-off-by: Alex Bennée Cc: Thomas Huth Cc: Daniel P. Berrangé Cc: Marc-André Lureau Cc: Juan Quintela Reviewed-by: Daniel P. Berrangé --- tests/unit/test-io-channel-command.c | 45 +++++++++++++++++----------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 7eee939c07..54bb0f139a 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" @@ -26,32 +27,32 @@ #define TEST_FIFO "test-io-channel-command.fifo" -#define SOCAT_SRC "PIPE:" TEST_FIFO ",wronly" -#define SOCAT_DST "PIPE:" TEST_FIFO ",rdonly" - static char *socat = NULL; static void test_io_channel_command_fifo(bool async) { + g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); + g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO); + g_autoptr(GString) srcargs = g_string_new(socat); + g_autoptr(GString) dstargs = g_string_new(socat); + g_auto(GStrv) srcargv; + g_auto(GStrv) dstargv; QIOChannel *src, *dst; QIOChannelTest *test; - const char *srcargv[] = { - socat, "-", SOCAT_SRC, NULL, - }; - const char *dstargv[] = { - socat, SOCAT_DST, "-", NULL, - }; - if (!socat) { - g_test_skip("socat is not found in PATH"); - return; - } + g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo); + g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo); + + srcargv = g_strsplit(srcargs->str, " ", -1); + dstargv = g_strsplit(dstargs->str, " ", -1); - unlink(TEST_FIFO); - src = QIO_CHANNEL(qio_channel_command_new_spawn(srcargv, + src = QIO_CHANNEL(qio_channel_command_new_spawn((const char**) srcargv, O_WRONLY, &error_abort)); - dst = QIO_CHANNEL(qio_channel_command_new_spawn(dstargv, + /* try to avoid a race to create the socket */ + g_usleep(1000); + + dst = QIO_CHANNEL(qio_channel_command_new_spawn((const char**) dstargv, O_RDONLY, &error_abort)); @@ -62,17 +63,27 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); - unlink(TEST_FIFO); + g_rmdir(tmpdir); } static void test_io_channel_command_fifo_async(void) { + if (!socat) { + g_test_skip("socat is not found in PATH"); + return; + } + test_io_channel_command_fifo(true); } static void test_io_channel_command_fifo_sync(void) { + if (!socat) { + g_test_skip("socat is not found in PATH"); + return; + } + test_io_channel_command_fifo(false); } From patchwork Thu Oct 27 18:36:36 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: 619207 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp506461pvb; Thu, 27 Oct 2022 12:11:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ykL4hyKmREMEbALYSqylIbmHK2HMu6qcd2T+orbLZUzoe99MhBpd850SDiYCE5xWGvIoi X-Received: by 2002:ad4:5ba3:0:b0:4bb:62e5:1db6 with SMTP id 3-20020ad45ba3000000b004bb62e51db6mr23139855qvq.89.1666897879640; Thu, 27 Oct 2022 12:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666897879; cv=none; d=google.com; s=arc-20160816; b=SNoidxY2t3DJ3IKiJWTe+OxT6yXGGH/xrRop4PhwpbwYpsrUdP3qEhzYIcOSzqXnTg /nRBa0rb7phMBJ+1fjXs/QOwr6DRpqBX9Y27eDSnjJZjK9OFzVTX43bKcNJAerAO8x5v KyL3H0oKcfN0G043aufs9TAyoJtDBPYYcdtlmTaeOSJq9PxJDxsdly/1EXGMQvPKWWIq YFxeMn0O40LUQDqZucpr9WwoHl+4Kusbcfh7Qm/N3hkDXcQTAVjmsOUtJPWqD8iQMXko +ArpooBvFDD/0M9AvQCXOFNdlvIviHCwnYLKVCRrNxx2O3ydUSfCvKuaRuTDETNlJhOw cE9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=A0SXCM+KSqiVxWBvTd3VpYjIcK+dRrJ055VbgsI9csQ=; b=KsT/w/PznjW+lfu4ZhY52yfd0W3tCjcMn46Ecuodr4ISJpRi/KO86Yd21ELTKZt8B9 VxxR7J9i3NZ27MbE5w36vuIG/akzOl5+TsmZNGpgm8V0rfGzPm1kwbtJZ0KOVzbBUyzH nrQkXR0RMcCeD7YsSPlZfEaRwDDFIWqNNoRwk9xtV3SITvsT+Xq6qVv8QxzZ5tQp0y9d YWvc5MC+7ZN1Cnw0nbqYCFmhDcw0mTQypFHiDZrA7QR4JQb0+tfwyt4IzIPTos6y0apd xkvm31mxtnbSjZHwsCw4g1JnvNEPxNv/JhNsTw1mhxGEywpsHzAKQOsIA5WpYUeoJ8vH NDJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iiY712eK; 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 v14-20020a05622a188e00b00398533be759si1606736qtc.204.2022.10.27.12.11.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Oct 2022 12:11:19 -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=iiY712eK; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo82h-0001TF-2t; Thu, 27 Oct 2022 14:55:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oo829-0008WE-VK for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo81n-0006A7-Gl for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:55:17 -0400 Received: by mail-wr1-x433.google.com with SMTP id bs21so3753509wrb.4 for ; Thu, 27 Oct 2022 11:54: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=A0SXCM+KSqiVxWBvTd3VpYjIcK+dRrJ055VbgsI9csQ=; b=iiY712eK6CAp/VUCSHW2N8lxgtMOfRVKPbT0gYFgxNFHerCMtSxI5VueLLe1rKicLq dHfTjENXN2cFJLTXWuZbCTLhZ6V9PvSYD5GtYBgK50zNgnwwR0YV7ncR/jn7sR4fc7Ac LkrlXEXsZFyP8dcODFAMODxma/FkcAUqG5uv7DEQQI6XvdK4biIO52LgSYEJeEMffkCd lOKUfP1rodoyxuMohKXDg8I8vYowuAegIu9hK7FY0idW5BlNmZs7/hq4oRNUpzeyQpEA ALFxYJGzN6va2V1eiCiYUwNAnukgWIXOF859xmd1qhEzZdsjqb4V3pYAuZvbRyuyo79n raNg== 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=A0SXCM+KSqiVxWBvTd3VpYjIcK+dRrJ055VbgsI9csQ=; b=B/wS46UKypH5EJdoe+E8uRzjCkKc/6rw88SOykNJS/5tQOajjJxqAvyWwgBopZwJAz PGqpkFfPGErtBf1ictUbGO+W5xI6qlYO6QvdMKg6SVHGlMfNA0lEef+JTMWIYbddQKR1 e1+g9uj7RlOE7kzz5Cq4u7NTvkQPSPYxbNkpsNvuOYd1bDfqfbR9VVwpq5g0UskUA5Hl D9UsNOHUtIjygby5gmMzTqGlFVXq1m/nqlqjR98fz2xWXe5b8epC+XdeQmoBOEJ8SKEw kDNdRqZzREbKekW41LMiCqcQ2qlikgmkj/Jz64MWA+tHnT9f5POHnx71ZXUE4VzPB34V U1mA== X-Gm-Message-State: ACrzQf2J4FuMVGFQZnfODXNUEy9n/QedHhMcNWBlAUG7AlFbovl+PoIV vSoCc0IzFzbjkx0qO2xmH8fMew== X-Received: by 2002:adf:e84f:0:b0:235:d53a:2d7f with SMTP id d15-20020adfe84f000000b00235d53a2d7fmr27219508wrn.334.1666896892149; Thu, 27 Oct 2022 11:54:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j8-20020a5d6188000000b0022e035a4e93sm1886126wru.87.2022.10.27.11.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:54:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26A0B1FFD3; Thu, 27 Oct 2022 19:36:40 +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, Ilya Leoshkevich , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v4 30/30] tests/vm: use -o IdentitiesOnly=yes for ssh Date: Thu, 27 Oct 2022 19:36:36 +0100 Message-Id: <20221027183637.2772968-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Ilya Leoshkevich When one has a lot of keys in ~/.ssh directory, the ssh command will try all of them before the one specified on the command line, and this may cause the remote ssh server to reject the connection due to too many failed authentication attempts. Fix by adding -o IdentitiesOnly=yes, which makes the ssh client consider only the keys specified on the command line. Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth Message-Id: <20221027113026.2280863-1-iii@linux.ibm.com> Signed-off-by: Alex Bennée --- tests/vm/basevm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4fd9af10b7..2276364c42 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -233,7 +233,8 @@ def _ssh_do(self, user, cmd, check): "-o", "UserKnownHostsFile=" + os.devnull, "-o", "ConnectTimeout={}".format(self._config["ssh_timeout"]), - "-p", str(self.ssh_port), "-i", self._ssh_tmp_key_file] + "-p", str(self.ssh_port), "-i", self._ssh_tmp_key_file, + "-o", "IdentitiesOnly=yes"] # If not in debug mode, set ssh to quiet mode to # avoid printing the results of commands. if not self.debug: