From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583666650692.4772230489981; Tue, 6 Jul 2021 08:01:06 -0700 (PDT) Received: from localhost ([::1]:52764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mZN-0007Wc-8g for importer@patchew.org; Tue, 06 Jul 2021 11:01:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWm-0004ax-ER for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:26 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWj-00020V-Fa for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:24 -0400 Received: by mail-wr1-x431.google.com with SMTP id l5so9675344wrv.7 for ; Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n16sm1008224wrr.73.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3BD61FF87; Tue, 6 Jul 2021 15:58:17 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M+Bmwitpli/El3tfQx09X6m1DsmvT8z7wFQh9OyOsVo=; b=EahyWPQaxFBQLQS7c8MPMmpKDxz0MD7WM6y77XNIzI72zUJ9GxyM9HHEFPb8fYhB3E NXlzTG3Rljw532z9dxla73wx6ZIXQGCBb+SVZHNL4vTO/c3Az3TkVnkWFuRU/RCtLZ/r aB6tMkOn6GIIYyp8dz7qymmIo053sK16fc6OCIuJSg6hZimdIBbnL541yTTisIku+DZE DHLIZtMlIpf3ZzSKYVrkvtnY7QveWN2C/rZgRUymFwTmy7AFAznxdHs2jaHsXXXAl32n aMhlOV5JQ9gRzA7rY7WnTxKqPw73pYKgm13v+HNnQ3vG3TlupsYo4RDb8/n4KF1rczGF ewOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M+Bmwitpli/El3tfQx09X6m1DsmvT8z7wFQh9OyOsVo=; b=E3J8pAVh/56xJMyhnIDCUVSv+dFTsdp9AD2ZcjfwIebJUtENFPgrBQfHSUBeuxGPM2 WYdls9s9prfQ4FdO84sNYlIgv/6CzdRz6j1ixMgNE3pp58KKfGzOwd2x6mVqIdIxn9lB Pp9+idtapDUB4zOUijR3iAr1l9EnFfwwbeLg2Dzmtd7whjZAivvqDi5kGLWu8BsD6zu/ 0D4VcIS5hiNe/bP9coErBe3THQlqRTPJw+MXkhI6gi0NKqEWAzcDDlEEK0OQn+MqSiq5 jDkLqvyaY2zy5wtAZlS6NQPEaB49WRpFkNGvRoADsEZ195iY60fFd3WDwT8C/ovshfL+ 9Rng== X-Gm-Message-State: AOAM533oEIRs/MzLps54zT24LapVtgtU1x9O8bRBjX6lo7Bl43QRTTL+ os2MyFIO38bSuXctAujw3hsrjg== X-Google-Smtp-Source: ABdhPJwaMwB40tfkF371CTYsuKxtjyUxnyw77B2y+nXfVjG0jZYbk2gX3/aIG1Cu90q9JlLjXnQNgQ== X-Received: by 2002:adf:ef8b:: with SMTP id d11mr22299838wro.346.1625583499950; Tue, 06 Jul 2021 07:58:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/39] Jobs based on custom runners: documentation and configuration placeholder Date: Tue, 6 Jul 2021 15:57:39 +0100 Message-Id: <20210706145817.24109-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625583691540100001 From: Cleber Rosa As described in the included documentation, the "custom runner" jobs extend the GitLab CI jobs already in place. One of their primary goals of catching and preventing regressions on a wider number of host systems than the ones provided by GitLab's shared runners. This sets the stage in which other community members can add their own machine configuration documentation/scripts, and accompanying job definitions. As a general rule, those newly added contributed jobs should run as "non-gating", until their reliability is verified (AKA "allow_failure: true"). Signed-off-by: Cleber Rosa Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-2-crosa@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/ci.rst | 32 ++++++++++++++++++++++++++++++++ docs/devel/index.rst | 1 + .gitlab-ci.d/custom-runners.yml | 14 ++++++++++++++ .gitlab-ci.d/qemu-project.yml | 1 + 4 files changed, 48 insertions(+) create mode 100644 docs/devel/ci.rst create mode 100644 .gitlab-ci.d/custom-runners.yml diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst new file mode 100644 index 0000000000..064ffa9988 --- /dev/null +++ b/docs/devel/ci.rst @@ -0,0 +1,32 @@ +=3D=3D +CI +=3D=3D + +QEMU has configurations enabled for a number of different CI services. +The most up to date information about them and their status can be +found at:: + + https://wiki.qemu.org/Testing/CI + +Jobs on Custom Runners +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Besides the jobs run under the various CI systems listed before, there +are a number additional jobs that will run before an actual merge. +These use the same GitLab CI's service/framework already used for all +other GitLab based CI jobs, but rely on additional systems, not the +ones provided by GitLab as "shared runners". + +The architecture of GitLab's CI service allows different machines to +be set up with GitLab's "agent", called gitlab-runner, which will take +care of running jobs created by events such as a push to a branch. +Here, the combination of a machine, properly configured with GitLab's +gitlab-runner, is called a "custom runner". + +The GitLab CI jobs definition for the custom runners are located under:: + + .gitlab-ci.d/custom-runners.yml + +Custom runners entail custom machines. To see a list of the machines +currently deployed in the QEMU GitLab CI and their maintainers, please +refer to the QEMU `wiki `__. diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 977c3893bd..da15273786 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -27,6 +27,7 @@ Contents: migration atomics stable-process + ci qtest decodetree secure-coding-practices diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml new file mode 100644 index 0000000000..a07b27384c --- /dev/null +++ b/.gitlab-ci.d/custom-runners.yml @@ -0,0 +1,14 @@ +# The CI jobs defined here require GitLab runners installed and +# registered on machines that match their operating system names, +# versions and architectures. This is in contrast to the other CI +# jobs that are intended to run on GitLab's "shared" runners. + +# Different than the default approach on "shared" runners, based on +# containers, the custom runners have no such *requirement*, as those +# jobs should be capable of running on operating systems with no +# compatible container implementation, or no support from +# gitlab-runner. To avoid problems that gitlab-runner can cause while +# reusing the GIT repository, let's enable the clone strategy, which +# guarantees a fresh repository on each job run. +variables: + GIT_STRATEGY: clone diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index 64cb2ba1da..dde8270301 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -9,3 +9,4 @@ include: - local: '/.gitlab-ci.d/crossbuilds.yml' - local: '/.gitlab-ci.d/buildtest.yml' - local: '/.gitlab-ci.d/static_checks.yml' + - local: '/.gitlab-ci.d/custom-runners.yml' --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583867914868.5558692590976; Tue, 6 Jul 2021 08:04:27 -0700 (PDT) Received: from localhost ([::1]:33228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mcb-0004yQ-Pd for importer@patchew.org; Tue, 06 Jul 2021 11:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWz-0004ef-Lk for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:56098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWl-00022M-L2 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:36 -0400 Received: by mail-wm1-x32f.google.com with SMTP id j34so13765173wms.5 for ; Tue, 06 Jul 2021 07:58:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm16137777wmq.3.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F21A11FF8C; Tue, 6 Jul 2021 15:58:17 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OJ+a2HwSuRNejGfA9xMEuP+rnbpPniiuWoFoxeydpO0=; b=ZsTzpG3+wrOCUHovDttmLdau8dzLHzKTofNv9dhnmqakTkMc4Tm6CKgIPHS4veD1Nn +XlPAsYCW1Cd08FJaE3itFphF8Z9dsuZFxsPMCpZqZ1JDH4D+b+TqAPn116HQOzycKWH t0dVPowesnXajd42iiwN9w4+lqkENGyxs0AKBthnh5lUttaSPrxrDrQdYiC2qBecvMsw GlQ96MkPCqBGMY3VpOD8dV7OMXN/UvmBAH9EExOSldX/WlWqLMRR/BotdwWwQfZhftft pM8W9N22VQzuiqh0uNXdLOclyRoJ+x3M7QUli2lBBj5BAcEOt4Eze9np7qvU2HLdXOLG VpXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OJ+a2HwSuRNejGfA9xMEuP+rnbpPniiuWoFoxeydpO0=; b=k2Y2qkZQiKOaKJ55PGrEt/lvCXsLfS0sJKW2xlyuLHE08uPvNVGymtXhnAYXm5z/N2 p4ETH3QX0s/7fjEAfwKtKTg4pVDnYMlIfZdIGzI3kCJBK+5tIoDWbeX8EUvbPHn2lVsh uxrr0Fc2Aa1eWt1cW1dtpCMPyrDxyzxSsRfK+LLPLb8UXYDa+hqNt9sF2oXXhT/Fkexx XJlhLmdI4h/Ez3jmGwJCfuFJZ5cZNP1lr4cio8QnHpzb30XEFMqT2UuzGytnIkX/Yc3k BunmeVUhmASb1Eu2IP8FeuimKl87pdyWdgfTlz1V0pfto3tvDkcXrhIqX18EdJ2QK2es MHow== X-Gm-Message-State: AOAM532tGy0NmXQeqrp3S4nWuxb7RtS056N+F5huPV4+GGLQ6oSRVlLg oKyzcVEianWe4fT6J7ZJeYTIbQ== X-Google-Smtp-Source: ABdhPJxkhEMp7uCN4yeyiRVdUnXkg8cbCY66DrID2iXoC2OITWQtWjQDGqysFgoSKNuZ9qg8uBLnTQ== X-Received: by 2002:a7b:cc08:: with SMTP id f8mr21237212wmh.58.1625583501642; Tue, 06 Jul 2021 07:58:21 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/39] Jobs based on custom runners: build environment docs and playbook Date: Tue, 6 Jul 2021 15:57:40 +0100 Message-Id: <20210706145817.24109-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625583909804100005 From: Cleber Rosa To run basic jobs on custom runners, the environment needs to be properly set up. The most common requirement is having the right packages installed. The playbook introduced here covers the QEMU's project s390x and aarch64 machines. At the time this is being proposed, those machines have already had this playbook applied to them. Signed-off-by: Cleber Rosa Tested-by: Alex Benn=C3=A9e Tested-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210630012619.115262-3-crosa@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/ci.rst | 40 +++++++++ scripts/ci/setup/.gitignore | 2 + scripts/ci/setup/build-environment.yml | 116 +++++++++++++++++++++++++ scripts/ci/setup/inventory.template | 1 + 4 files changed, 159 insertions(+) create mode 100644 scripts/ci/setup/.gitignore create mode 100644 scripts/ci/setup/build-environment.yml create mode 100644 scripts/ci/setup/inventory.template diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index 064ffa9988..bfedbb1025 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -30,3 +30,43 @@ The GitLab CI jobs definition for the custom runners are= located under:: Custom runners entail custom machines. To see a list of the machines currently deployed in the QEMU GitLab CI and their maintainers, please refer to the QEMU `wiki `__. + +Machine Setup Howto +------------------- + +For all Linux based systems, the setup can be mostly automated by the +execution of two Ansible playbooks. Create an ``inventory`` file +under ``scripts/ci/setup``, such as this:: + + fully.qualified.domain + other.machine.hostname + +You may need to set some variables in the inventory file itself. One +very common need is to tell Ansible to use a Python 3 interpreter on +those hosts. This would look like:: + + fully.qualified.domain ansible_python_interpreter=3D/usr/bin/python3 + other.machine.hostname ansible_python_interpreter=3D/usr/bin/python3 + +Build environment +~~~~~~~~~~~~~~~~~ + +The ``scripts/ci/setup/build-environment.yml`` Ansible playbook will +set up machines with the environment needed to perform builds and run +QEMU tests. This playbook consists on the installation of various +required packages (and a general package update while at it). It +currently covers a number of different Linux distributions, but it can +be expanded to cover other systems. + +The minimum required version of Ansible successfully tested in this +playbook is 2.8.0 (a version check is embedded within the playbook +itself). To run the playbook, execute:: + + cd scripts/ci/setup + ansible-playbook -i inventory build-environment.yml + +Please note that most of the tasks in the playbook require superuser +privileges, such as those from the ``root`` account or those obtained +by ``sudo``. If necessary, please refer to ``ansible-playbook`` +options such as ``--become``, ``--become-method``, ``--become-user`` +and ``--ask-become-pass``. diff --git a/scripts/ci/setup/.gitignore b/scripts/ci/setup/.gitignore new file mode 100644 index 0000000000..ee088604d1 --- /dev/null +++ b/scripts/ci/setup/.gitignore @@ -0,0 +1,2 @@ +inventory + diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml new file mode 100644 index 0000000000..581c1c75d1 --- /dev/null +++ b/scripts/ci/setup/build-environment.yml @@ -0,0 +1,116 @@ +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Cleber Rosa +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. +# +# This is an ansible playbook file. Run it to set up systems with the +# environment needed to build QEMU. +--- +- name: Installation of basic packages to build QEMU + hosts: all + tasks: + - name: Check for suitable ansible version + delegate_to: localhost + assert: + that: + - '((ansible_version.major =3D=3D 2) and (ansible_version.minor = >=3D 8)) or (ansible_version.major >=3D 3)' + msg: "Unsuitable ansible version, please use version 2.8.0 or late= r" + + - name: Update apt cache / upgrade packages via apt + apt: + update_cache: yes + upgrade: yes + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + + - name: Install basic packages to build QEMU on Ubuntu 18.04/20.04 + package: + name: + # Originally from tests/docker/dockerfiles/ubuntu1804.docker + - ccache + - gcc + - gettext + - git + - glusterfs-common + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libbz2-dev + - libcacard-dev + - libcap-ng-dev + - libcurl4-gnutls-dev + - libdrm-dev + - libepoxy-dev + - libfdt-dev + - libgbm-dev + - libgtk-3-dev + - libibverbs-dev + - libiscsi-dev + - libjemalloc-dev + - libjpeg-turbo8-dev + - liblzo2-dev + - libncurses5-dev + - libncursesw5-dev + - libnfs-dev + - libnss3-dev + - libnuma-dev + - libpixman-1-dev + - librados-dev + - librbd-dev + - librdmacm-dev + - libsasl2-dev + - libsdl2-dev + - libseccomp-dev + - libsnappy-dev + - libspice-protocol-dev + - libssh-dev + - libusb-1.0-0-dev + - libusbredirhost-dev + - libvdeplug-dev + - libvte-2.91-dev + - libzstd-dev + - make + - python3-yaml + - python3-sphinx + - python3-sphinx-rtd-theme + - ninja-build + - sparse + - xfslibs-dev + state: present + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + + - name: Install packages to build QEMU on Ubuntu 18.04/20.04 on non-s3= 90x + package: + name: + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['architecture'] !=3D 's390x' + + - name: Install basic packages to build QEMU on Ubuntu 18.04 + package: + name: + # Originally from tests/docker/dockerfiles/ubuntu1804.docker + - clang + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['distribution_version'] =3D=3D '18.04' + + - name: Install basic packages to build QEMU on Ubuntu 20.04 + package: + name: + # Originally from tests/docker/dockerfiles/ubuntu2004.docker + - clang-10 + - genisoimage + - liblttng-ust-dev + - libslirp-dev + - netcat-openbsd + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['distribution_version'] =3D=3D '20.04' diff --git a/scripts/ci/setup/inventory.template b/scripts/ci/setup/invento= ry.template new file mode 100644 index 0000000000..2fbb50c4a8 --- /dev/null +++ b/scripts/ci/setup/inventory.template @@ -0,0 +1 @@ +localhost --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16255838679421004.0468691262168; Tue, 6 Jul 2021 08:04:27 -0700 (PDT) Received: from localhost ([::1]:33280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mcb-00050x-I7 for importer@patchew.org; Tue, 06 Jul 2021 11:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWu-0004d0-3A for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:33 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWm-00022b-52 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:31 -0400 Received: by mail-wr1-x42b.google.com with SMTP id i8so13547408wrp.12 for ; Tue, 06 Jul 2021 07:58:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm15357659wms.24.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D8031FF8F; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=crTi4XNq+Ingn7CUQ5c/evQBVola36pTXX+nEdv6k1Y=; b=ID5O+jwtIxXt6VMaowEtHQU7LmgigMMXnZHCTJGO1IVUFF3+w1D2nhVUFubi2Enxy/ yRcMAQH1090hytEqxxtSZooXfHFi1WZx8BwwqsBjAtterPk0QvPZTPqr3gLDDiB3xIqG FNN8BclA2+S+evGV8qxyKTbgA0XAgahvnwqOeZyZfk49VsYka/q8bLsN3IMK7jkfoFMq hHT+GJE4GebCphNzV2qZDmrVYmbaESCLwxCHZECuJx3qzk+p7nHx0/L+DKpv1K43AWCC Mwx1qEGgU+QirOVYLWhOiy+SwHq8+oEDj3cDly7bj1hVXRSrjRZDZt7PeMtaG+pt1oWP XfuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=crTi4XNq+Ingn7CUQ5c/evQBVola36pTXX+nEdv6k1Y=; b=pMiy4NOz643QWgD+krgN/SvD9Xip4JUljRwnpgJ8KlwW5PURX8UHyVuB9ypSOmBbo+ QrxY9zlEJZ44KG5+sBrxpucSbB6YegfsGIQtb2JgrHWzn7+818rbHrMA79ok/wvb2BjD LR892tMW1mC+lpTQMAVQ9REQW69TaHWttfnfE+deJkQ7i8V5mw7rjL/pVhG95TKMvXgr +/wZdSFDwQtBmnUQfBBgjbdw0vJanO92CPaHbj9EJuHPwemkkQt4WOZRMsHjQcJDiTyf qvhgLLIe7kchLJulDYkdkXuvcJZqfUB7RBytyeQ/iwb1PW27/S6CY/GW7ajzDkrwA1Wy dw7A== X-Gm-Message-State: AOAM531tv/j4xu3a/Bu1eW/N8yhxgeRzDPKT2XmEQuhaS1QVk5VilqEP xtMC2ZzUblShracb21OnLaVyIQ== X-Google-Smtp-Source: ABdhPJwdA4K3N/vE0CQKdtcya+EFlqdSIkCgDio84wxjEz65CrLdMzNaNvARYrn7YEfjXKx+QQhxEQ== X-Received: by 2002:a5d:508b:: with SMTP id a11mr21845439wrt.280.1625583502551; Tue, 06 Jul 2021 07:58:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Tue, 6 Jul 2021 15:57:41 +0100 Message-Id: <20210706145817.24109-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625583909637100002 From: Cleber Rosa To have the jobs dispatched to custom runners, gitlab-runner must be installed, active as a service and properly configured. The variables file and playbook introduced here should help with those steps. The playbook introduced here covers the Linux distributions and has been primarily tested on OS/machines that the QEMU project has available to act as runners, namely: * Ubuntu 20.04 on aarch64 * Ubuntu 18.04 on s390x But, it should work on all other Linux distributions. Earlier versions were tested on FreeBSD too, so chances of success are high. Signed-off-by: Cleber Rosa Tested-by: Willian Rampazzo Tested-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210630012619.115262-4-crosa@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/ci.rst | 55 +++++++++++++++++++++++ scripts/ci/setup/.gitignore | 2 +- scripts/ci/setup/gitlab-runner.yml | 71 ++++++++++++++++++++++++++++++ scripts/ci/setup/vars.yml.template | 12 +++++ 4 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 scripts/ci/setup/gitlab-runner.yml create mode 100644 scripts/ci/setup/vars.yml.template diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index bfedbb1025..b3bf3ef615 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -70,3 +70,58 @@ privileges, such as those from the ``root`` account or t= hose obtained by ``sudo``. If necessary, please refer to ``ansible-playbook`` options such as ``--become``, ``--become-method``, ``--become-user`` and ``--ask-become-pass``. + +gitlab-runner setup and registration +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The gitlab-runner agent needs to be installed on each machine that +will run jobs. The association between a machine and a GitLab project +happens with a registration token. To find the registration token for +your repository/project, navigate on GitLab's web UI to: + + * Settings (the gears-like icon at the bottom of the left hand side + vertical toolbar), then + * CI/CD, then + * Runners, and click on the "Expand" button, then + * Under "Set up a specific Runner manually", look for the value under + "And this registration token:" + +Copy the ``scripts/ci/setup/vars.yml.template`` file to +``scripts/ci/setup/vars.yml``. Then, set the +``gitlab_runner_registration_token`` variable to the value obtained +earlier. + +To run the playbook, execute:: + + cd scripts/ci/setup + ansible-playbook -i inventory gitlab-runner.yml + +Following the registration, it's necessary to configure the runner tags, +and optionally other configurations on the GitLab UI. Navigate to: + + * Settings (the gears like icon), then + * CI/CD, then + * Runners, and click on the "Expand" button, then + * "Runners activated for this project", then + * Click on the "Edit" icon (next to the "Lock" Icon) + +Tags are very important as they are used to route specific jobs to +specific types of runners, so it's a good idea to double check that +the automatically created tags are consistent with the OS and +architecture. For instance, an Ubuntu 20.04 aarch64 system should +have tags set as:: + + ubuntu_20.04,aarch64 + +Because the job definition at ``.gitlab-ci.d/custom-runners.yml`` +would contain:: + + ubuntu-20.04-aarch64-all: + tags: + - ubuntu_20.04 + - aarch64 + +It's also recommended to: + + * increase the "Maximum job timeout" to something like ``2h`` + * give it a better Description diff --git a/scripts/ci/setup/.gitignore b/scripts/ci/setup/.gitignore index ee088604d1..f4a6183f1f 100644 --- a/scripts/ci/setup/.gitignore +++ b/scripts/ci/setup/.gitignore @@ -1,2 +1,2 @@ inventory - +vars.yml diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-r= unner.yml new file mode 100644 index 0000000000..1127db516f --- /dev/null +++ b/scripts/ci/setup/gitlab-runner.yml @@ -0,0 +1,71 @@ +# Copyright (c) 2021 Red Hat, Inc. +# +# Author: +# Cleber Rosa +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. +# +# This is an ansible playbook file. Run it to set up systems with the +# gitlab-runner agent. +--- +- name: Installation of gitlab-runner + hosts: all + vars_files: + - vars.yml + tasks: + - debug: + msg: 'Checking for a valid GitLab registration token' + failed_when: "gitlab_runner_registration_token =3D=3D 'PLEASE_PROVID= E_A_VALID_TOKEN'" + + - name: Create a group for the gitlab-runner service + group: + name: gitlab-runner + + - name: Create a user for the gitlab-runner service + user: + user: gitlab-runner + group: gitlab-runner + comment: GitLab Runner + home: /home/gitlab-runner + shell: /bin/bash + + - name: Remove the .bash_logout file when on Ubuntu systems + file: + path: /home/gitlab-runner/.bash_logout + state: absent + when: "ansible_facts['distribution'] =3D=3D 'Ubuntu'" + + - name: Set the Operating System for gitlab-runner + set_fact: + gitlab_runner_os: "{{ ansible_facts[\"system\"]|lower }}" + - debug: + msg: gitlab-runner OS is {{ gitlab_runner_os }} + + - name: Set the architecture for gitlab-runner + set_fact: + gitlab_runner_arch: "{{ ansible_to_gitlab_arch[ansible_facts[\"arc= hitecture\"]] }}" + - debug: + msg: gitlab-runner arch is {{ gitlab_runner_arch }} + + - name: Download the matching gitlab-runner + get_url: + dest: /usr/local/bin/gitlab-runner + url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_= runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-{{ gitlab_= runner_arch }}" + owner: gitlab-runner + group: gitlab-runner + mode: u=3Drwx,g=3Drwx,o=3Drx + + - name: Register the gitlab-runner + command: "/usr/local/bin/gitlab-runner register --non-interactive --= url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_re= gistration_token }} --executor shell --tag-list {{ ansible_facts[\"architec= ture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"d= istribution_version\"] }} --description '{{ ansible_facts[\"distribution\"]= }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"archit= ecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + + - name: Install the gitlab-runner service using its own functionality + command: /usr/local/bin/gitlab-runner install --user gitlab-runner -= -working-directory /home/gitlab-runner + register: gitlab_runner_install_service_result + failed_when: "gitlab_runner_install_service_result.rc !=3D 0 and \"a= lready exists\" not in gitlab_runner_install_service_result.stderr" + + - name: Enable the gitlab-runner service + service: + name: gitlab-runner + state: started + enabled: yes diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml= .template new file mode 100644 index 0000000000..e48089761f --- /dev/null +++ b/scripts/ci/setup/vars.yml.template @@ -0,0 +1,12 @@ +# The version of the gitlab-runner to use +gitlab_runner_version: 13.12.0 +# The URL of the gitlab server to use, usually https://gitlab.com unless y= ou're +# using a private GitLab instance +gitlab_runner_server_url: https://gitlab.com +# A mapping of the ansible to gitlab architecture nomenclature +ansible_to_gitlab_arch: + x86_64: amd64 + aarch64: arm64 + s390x: s390x +# A unique token made available by GitLab to your project for registering = runners +gitlab_runner_registration_token: PLEASE_PROVIDE_A_VALID_TOKEN --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583867892909.1343697642508; Tue, 6 Jul 2021 08:04:27 -0700 (PDT) Received: from localhost ([::1]:33234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mcb-0004ys-Pb for importer@patchew.org; Tue, 06 Jul 2021 11:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX5-0004iA-GR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:44 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWq-000233-4U for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:40 -0400 Received: by mail-wm1-x332.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1982795wmh.2 for ; Tue, 06 Jul 2021 07:58:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u1sm3141966wmn.23.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 367E91FF90; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=isRhm7PtwuN/k+yKMymzpJRt/x/pmEeyNtpyI5WWM24=; b=ClQC/EyhnZT3e/lT318LpzLR0SOIGX6mzEMFH+RsLhyXEJPreUkSc4+D9Wf4hoLj5X 5GF60RVasp1qEhDQfTfH0eRNdb9f/0HJigN7ZNFBYrkUYt70bGJ9v7EVuBRnTxuYdxFf MJOGz7d1Ss0AkOeTX42mgeSWqI3nCVFNtre106agaETKnn79LpLp/qm9X2yd4I7JTbd4 IP/dDlkVPMHD6rVTHbG01355UDXQyKHv3Qg+Ks1PAujk+msrImnYoY2oK60LGxrpsCOR CE5GqH0p8GgbqD7DGDErzJ7dai/G6CIpRuemWvPGvA6a5ZyjQ8nATRBOuCXusaOVcy1c KMNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=isRhm7PtwuN/k+yKMymzpJRt/x/pmEeyNtpyI5WWM24=; b=qb1nUTI8ZnWL4lUpxESuq/idRij/PxeJn258yee4YpEjQYnNLlcE9asHvWabDTjMBu qFgBf/YswBmENmeCprr6BVCC+1zM1bcKNA+fdE1ubRY5BcWZ9dqmzvIY/3J9nQGgFguQ UO80CobMd2hqfyx+A3EpQcnwh39/x0Y4nNKw2crbmZ7k7/eEkVPIrlH0MnNCjyaWs8+F R/SB/QcUF8e91HCfBZLkIs6r5V5eGKh9jvPBjg+L7YR8zORI5xErB46ZzqcZw8K2uzLW ocsbndidSovIy4QJ2nIschtYWUiwMHtjVG0Ume0ZK3dUJE4qCyUMA4g9IrYzdJjNyyzq 5sWA== X-Gm-Message-State: AOAM5334s2xqws04xGhecfcB0OeeXgfibjw6d2LaHcpe8jkceuS2CokT i9b2h31r2mWplsUcrdIkQBgM8g== X-Google-Smtp-Source: ABdhPJx/LfpkJwOyvDL2SWHvOK3jnUBGV0MZUNzJ7CnVfLDrfCgrVP/G+Kj7MlpSqipUYceN/2wvig== X-Received: by 2002:a05:600c:3b9f:: with SMTP id n31mr14081318wms.123.1625583504325; Tue, 06 Jul 2021 07:58:24 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Date: Tue, 6 Jul 2021 15:57:42 +0100 Message-Id: <20210706145817.24109-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625583909589100001 From: Cleber Rosa The QEMU project has two machines (aarch64 and s390x) that can be used for jobs that do build and run tests. This introduces those jobs, which are a mapping of custom scripts used for the same purpose. Signed-off-by: Cleber Rosa Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-5-crosa@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/custom-runners.yml | 208 ++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index a07b27384c..061d3cdfed 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -12,3 +12,211 @@ # guarantees a fresh repository on each job run. variables: GIT_STRATEGY: clone + +# All ubuntu-18.04 jobs should run successfully in an environment +# setup by the scripts/ci/setup/build-environment.yml task +# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +ubuntu-18.04-s390x-all-linux-static: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+= bug/1838763 + # --disable-glusterfs is needed because there's no static version of thos= e libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-gluster= fs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + - make --output-sync -j`nproc` check-tcg V=3D1 + +ubuntu-18.04-s390x-all: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-18.04-s390x-alldbg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --enable-debug --disable-libssh + - make clean + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-18.04-s390x-clang: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=3Dclang --cxx=3Dclang++ --enable-san= itizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-18.04-s390x-tci: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh --enable-tcg-interpreter + - make --output-sync -j`nproc` + +ubuntu-18.04-s390x-notcg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --disable-tcg + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +# All ubuntu-20.04 jobs should run successfully in an environment +# setup by the scripts/ci/setup/qemu/build-environment.yml task +# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +ubuntu-20.04-aarch64-all-linux-static: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+= bug/1838763 + # --disable-glusterfs is needed because there's no static version of thos= e libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-gluster= fs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + - make --output-sync -j`nproc` check-tcg V=3D1 + +ubuntu-20.04-aarch64-all: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-20.04-aarch64-alldbg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --enable-debug --disable-libssh + - make clean + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-20.04-aarch64-clang: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=3Dclang-10 --cxx=3Dclang++-10 --enab= le-sanitizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 + +ubuntu-20.04-aarch64-tci: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh --enable-tcg-interpreter + - make --output-sync -j`nproc` + +ubuntu-20.04-aarch64-notcg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =3D~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --disable-tcg + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=3D1 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583995876299.48571618505; Tue, 6 Jul 2021 08:06:35 -0700 (PDT) Received: from localhost ([::1]:41824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meg-0002Q4-MS for importer@patchew.org; Tue, 06 Jul 2021 11:06:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004iY-1A for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-00023t-Q1 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:43 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso1973757wmh.4 for ; Tue, 06 Jul 2021 07:58:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e23sm3133843wme.31.2021.07.06.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 512151FF91; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vp/dNCh38Mi79xbfwOjgNPw51ttemhaIbt3S+P08Mv0=; b=zkxF2icfug0NRuruMY1yTiQazIKm2zIYAjywenaj9Ddx64+wRlQDWPcDHv65aVrD5k H/xW8VOWV8ZB+qRAjcxbEgsXfuqQWJUoV9ijzdzZS9/gXzJo0flGuSrZ4h7R0tDXOiFY 4bktjXcJKfJqLAS9UgZLwbSAHnnVeiOjNl/wVSb934vn201KDS4ioDqEhN08qwRmcp3N lMohRZS4UV5Vp5dEb5y89YXa4hkOFC0odlTMEKno2zERcIADyrP9gx1QQR+/U5O2yxRn DjvQqlETA5Mej4jgosKhMdiUz/lmbV5V8rl5PN9DZve2uvGpjRh8ZepXjkzrpgAEnlle JZeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vp/dNCh38Mi79xbfwOjgNPw51ttemhaIbt3S+P08Mv0=; b=nURPhjK1g46g+S2yag9o4EXEAzgto8BtVcU+5sVb51MegNuGWvD+IJSNP3hBlLbBSR U0WCBZ1BSe6/h0RaL+s/F4YOIIT3xnnalKkqNMVQUpIZ3sqpV+LSRMrffDfYwFqJej7f vAXoysEDempusBGTuEHCSTWo360nxfmW00/N+Rv4mAS0Q2qHpLcF7YpL5OZmzh/rhvWQ IeRfqbpJV/n4CTyLZ5k9Zn0bF4RNKUY/uRzGuBSnNKecmzNpKtTTqPQaLMnK0S8wkC6a 6qUV0O/7Pt1a2PAEiBgEZC6IWEY/3k4nel3XJcD9FppIWqK7Os8iCFu+QgVQ1EKoRdJd w3Gg== X-Gm-Message-State: AOAM533B2zSZn62nqUFSpSTAkPCT/8rC7CxCJ9ZaNfY1WeWrnGYryjPY vd18L8qJNI2NHFggVggp9qFbFQ== X-Google-Smtp-Source: ABdhPJx2waSiK6dQmAI1/L69Ott/YwWA7gsisSfeTNKMGark0ehHe6mb21a5ZWFnzxdaLtuOT6pN2A== X-Received: by 2002:a1c:f314:: with SMTP id q20mr1271354wmq.154.1625583507761; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/39] tests/tcg: generalise the disabling of the signals test Date: Tue, 6 Jul 2021 15:57:43 +0100 Message-Id: <20210706145817.24109-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, David Hildenbrand , Richard Henderson , f4bug@amsat.org, "open list:S390 TCG CPUs" , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584024579100006 It turns out you push down in one place and failures pop-up elsewhere. Especially on CI. Disable for now for all targets. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/hppa/Makefile.target | 3 --- tests/tcg/multiarch/Makefile.target | 6 ++++++ tests/tcg/s390x/Makefile.target | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target index 71791235f6..473864d1d4 100644 --- a/tests/tcg/hppa/Makefile.target +++ b/tests/tcg/hppa/Makefile.target @@ -5,6 +5,3 @@ # On parisc Linux supports 4K/16K/64K (but currently only 4k works) EXTRA_RUNS+=3Drun-test-mmap-4096 # run-test-mmap-16384 run-test-mmap-65536 =20 -# There is a race that causes this to fail about 1% of the time -run-signals: signals - $(call skip-test, $<, "BROKEN awaiting vdso support") diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index 3f283eabe6..d57a115873 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -32,6 +32,12 @@ threadcount: LDFLAGS+=3D-lpthread =20 signals: LDFLAGS+=3D-lrt -lpthread =20 +# This triggers failures on s390x hosts about 4% of the time +# This triggers failures for hppa-linux about 1% of the time +run-signals: signals + $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso suppor= t") + + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 0036b8a505..5d3de1b27a 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -9,6 +9,3 @@ TESTS+=3Dpack TESTS+=3Dmvo TESTS+=3Dmvc =20 -# This triggers failures on s390x hosts about 4% of the time -run-signals: signals - $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups") --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583666411846.93746855391; Tue, 6 Jul 2021 08:01:06 -0700 (PDT) Received: from localhost ([::1]:52874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mZN-0007aE-2z for importer@patchew.org; Tue, 06 Jul 2021 11:01:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX0-0004ez-CS for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-000237-FB for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i8so13547589wrp.12 for ; Tue, 06 Jul 2021 07:58:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c1sm16964984wrp.94.2021.07.06.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E761FF92; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=CbXCJ8YaRX3KP6VPziblomeo/5M4vdKJnHQcMifN9E/vdwt7f2sFyCi95J9ezyoTxp 7C3aie32E6eAcevr2n2HQWkxbuivXWyjmXaiWC2jvHW/wsxq/pyt4gk3W3ntpRpot4GI ea3ofLjSosMuUBF6B1NkKltw+HkgntAfWDBFTr3/jdku3TdacSKhn9PAjdyjxSI87urS VvDQlj8JxW55+kdoagG4BtehDKMKn+EnHEdjaxAaAcjhoAHW5dL1ax2YPmew6RjqXUvG pikVRLwvorjqTCcXrhhS7gyToQovVrenvc/gLFG3Od3LyAKGFB0mFivp4cA3GrsPwl09 agTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=tHCh6WhxjZ4Sq8+9oHDDxfAQGFCm1sUQaEIewsOAkfBmjMn21yOULNw8dseCtTQWH5 Uulc0GofVp7JH/oxCByypEzmJJzLBM/vp6uC3lA0q0wg1X9tmTRb/2InvKTy6OrEBAhI HEqQbqBj0EA8KH8HWNwAZ5FyzLxCpLV5bowjH3q1P3T2ET1zicrHJJJJzT8EiPLFhwa6 cZBwNwpLWjyQu4ygmBaQ5IeppHXn8KH/c8SKAGoSH9LhqSPEbhEKK3ubGn8ELV/7gYHP m/WZu6fy2AfDj6fovh46XUh84EU6N34oXJoU77F7bYXsdM8RaDlFzbE5XJvSsLCCRQ5r wUUA== X-Gm-Message-State: AOAM530jNHICR++7JVU0OjQUMAcnzhBT9IwleYPuUz+RHrLnd/knhGfZ wA86X1N9EG9PBcmGDbaxEaMahg== X-Google-Smtp-Source: ABdhPJy4VEaRNKXTBt2ilSWrVEWTjfWY3vh/yBqVRrfi9wheR9tAFFdAvqn9lOpogEDAxR4EqTcq0A== X-Received: by 2002:a5d:5088:: with SMTP id a8mr19996266wrt.153.1625583505222; Tue, 06 Jul 2021 07:58:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/39] build: validate that system capstone works before using it Date: Tue, 6 Jul 2021 15:57:44 +0100 Message-Id: <20210706145817.24109-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584597736100001 From: Daniel P. Berrang=C3=A9 Some versions of capstone have shipped a broken pkg-config file which puts the -I path without the trailing '/capstone' suffix. This breaks the ability to "#include ". Upstream and most distros have fixed this, but a few stragglers remain, notably FreeBSD. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210625172211.451010-2-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meson.build b/meson.build index 7e12de01be..2748721d71 100644 --- a/meson.build +++ b/meson.build @@ -1641,6 +1641,19 @@ if capstone_opt in ['enabled', 'auto', 'system'] kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt =3D=3D 'system' or capstone_opt =3D=3D 'enabled' and not ha= ve_internal) + + # Some versions of capstone have broken pkg-config file + # that reports a wrong -I path, causing the #include to + # fail later. If the system has such a broken version + # do not use it. + if capstone.found() and not cc.compiles('#include ', + dependencies: [capstone]) + capstone =3D not_found + if capstone_opt =3D=3D 'system' + error('system capstone requested, it it does not appear to work') + endif + endif + if capstone.found() capstone_opt =3D 'system' elif have_internal --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584069156207.57901865390966; Tue, 6 Jul 2021 08:07:49 -0700 (PDT) Received: from localhost ([::1]:46186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mfr-0005NU-H5 for importer@patchew.org; Tue, 06 Jul 2021 11:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX8-0004mS-A9 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:46 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWu-000245-V0 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:46 -0400 Received: by mail-wr1-x430.google.com with SMTP id q17so6044794wrv.2 for ; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v18sm17210266wrr.54.2021.07.06.07.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BF4E1FF93; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88Ii6HcAWSALYib9d0gO1JUFEgQlqOc09D7AHpUWIH0=; b=NnxHmyw6ObbEch724OcshND59hwsuTUjUmwaV7l2wqOdulBx+Vt9ndlq40ArluO7gd UHvvLnkMnUqX7PA/5f9P4/6yxXyqTrA8T4sH6wfqAMFGDH+1ZWZN0T0vpUcACxGFsQCm 5A1P22V+R57iyoNzJHvGqzDIZ4WcxoRDyYUhOD2gKvsgHXFKQd2QZP7w4ZoMZhIhNZMN l4NBltRn6glFzgkCxyOe6hbFE3wecTlqkC5nVG3VfXBMBDpWZzheYPTaoT0Hj0PSpKk5 UFEDT84ZLTLtIfO0kuNbkMbcfbcR2Xt3UHnTvtW5Jw2ePqi5wFRqrI9PUaA8stYA19ga uz+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88Ii6HcAWSALYib9d0gO1JUFEgQlqOc09D7AHpUWIH0=; b=Bxmep8llgZJjOddYzXZsjtHTvqsPOzPfLiIlvUkLPhODrTuSDjIfrh+6AZeTTB6ss1 f02b844M5SFVP8B4PojVmhkzGTprqZrDlOWD8jeLBqSIhpv8ou9iDWR2jmH2+3Whjcre lvtOGGLNDkCOgdbRviQmVPLv6NqsiGVFO3zQuD/dt4xwZiMs/YNwCIqygwp2Mg+l05jW 76ybERwFlrjgDJtM4up33VJgDrPLHY9mIndv7s0kjcXAZ5w+9Mh76axK55ZewYpwUDXN x7hQelav3PN7fm+0oQJKPrJYiMibWlglHbprGcUNaiU2gwhNc4SAq7LLZRBJmSvAYKKN SLMw== X-Gm-Message-State: AOAM532/aQK1S+2FDOwW6dTxgEsS/1r1YS5vdSTQhAGVKbua7bT3YC1u rXK75hlgE8dzwG872kwzkuWcqA== X-Google-Smtp-Source: ABdhPJy5y15A/Y7M2Mvvpe9W/Ym75pqcGANPOS8Qf7/2tsctWx0Gx0yWJ5cqzKhxseTZdS3E16MEJA== X-Received: by 2002:a05:6000:c6:: with SMTP id q6mr6827944wrx.252.1625583509522; Tue, 06 Jul 2021 07:58:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Tue, 6 Jul 2021 15:57:45 +0100 Message-Id: <20210706145817.24109-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584070581100001 From: Daniel P. Berrang=C3=A9 This adds support for running 4 jobs via Cirrus CI runners: * FreeBSD 12 * FreeBSD 13 * macOS 11 with default XCode * macOS 11 with latest XCode The gitlab job uses a container published by the libvirt-ci project (https://gitlab.com/libvirt/libvirt-ci) that contains the 'cirrus-run' command. This accepts a short yaml file that describes a single Cirrus CI job, runs it using the Cirrus CI REST API, and reports any output to the console. In this way Cirrus CI is effectively working as an indirect custom runner for GitLab CI pipelines. The key benefit is that Cirrus CI job results affect the GitLab CI pipeline result and so the user only has look at one CI dashboard. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210625172211.451010-3-berrange@redhat.com> [AJB: remove $TEMPORARILY_DISABLED condition] Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/cirrus/README.rst | 54 +++++++++++++++ .gitlab-ci.d/cirrus.yml | 102 ++++++++++++++++++++++++++++ .gitlab-ci.d/cirrus/build.yml | 35 ++++++++++ .gitlab-ci.d/cirrus/freebsd-12.vars | 13 ++++ .gitlab-ci.d/cirrus/freebsd-13.vars | 13 ++++ .gitlab-ci.d/cirrus/macos-11.vars | 15 ++++ .gitlab-ci.d/qemu-project.yml | 1 + 7 files changed, 233 insertions(+) create mode 100644 .gitlab-ci.d/cirrus/README.rst create mode 100644 .gitlab-ci.d/cirrus.yml create mode 100644 .gitlab-ci.d/cirrus/build.yml create mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars create mode 100644 .gitlab-ci.d/cirrus/freebsd-13.vars create mode 100644 .gitlab-ci.d/cirrus/macos-11.vars diff --git a/.gitlab-ci.d/cirrus/README.rst b/.gitlab-ci.d/cirrus/README.rst new file mode 100644 index 0000000000..657b0706d7 --- /dev/null +++ b/.gitlab-ci.d/cirrus/README.rst @@ -0,0 +1,54 @@ +Cirrus CI integration +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +GitLab CI shared runners only provide a docker environment running on Linu= x. +While it is possible to provide private runners for non-Linux platforms th= is +is not something most contributors/maintainers will wish to do. + +To work around this limitation, we take advantage of `Cirrus CI`_'s free +offering: more specifically, we use the `cirrus-run`_ script to trigger Ci= rrus +CI jobs from GitLab CI jobs so that Cirrus CI job output is integrated into +the main GitLab CI pipeline dashboard. + +There is, however, some one-time setup required. If you want FreeBSD and m= acOS +builds to happen when you push to your GitLab repository, you need to + +* set up a GitHub repository for the project, eg. ``yourusername/qemu``. + This repository needs to exist for cirrus-run to work, but it doesn't ne= ed to + be kept up to date, so you can create it and then forget about it; + +* enable the `Cirrus CI GitHub app`_ for your GitHub account; + +* sign up for Cirrus CI. It's enough to log into the website using your Gi= tHub + account; + +* grab an API token from the `Cirrus CI settings`_ page; + +* it may be necessary to push an empty ``.cirrus.yml`` file to your github= fork + for Cirrus CI to properly recognize the project. You can check whether + Cirrus CI knows about your project by navigating to: + + ``https://cirrus-ci.com/yourusername/qemu`` + +* in the *CI/CD / Variables* section of the settings page for your GitLab + repository, create two new variables: + + * ``CIRRUS_GITHUB_REPO``, containing the name of the GitHub repository + created earlier, eg. ``yourusername/qemu``; + + * ``CIRRUS_API_TOKEN``, containing the Cirrus CI API token generated ear= lier. + This variable **must** be marked as *Masked*, because anyone with know= ledge + of it can impersonate you as far as Cirrus CI is concerned. + + Neither of these variables should be marked as *Protected*, because in + general you'll want to be able to trigger Cirrus CI builds from non-prot= ected + branches. + +Once this one-time setup is complete, you can just keep pushing to your Gi= tLab +repository as usual and you'll automatically get the additional CI coverag= e. + + +.. _Cirrus CI GitHub app: https://github.com/marketplace/cirrus-ci +.. _Cirrus CI settings: https://cirrus-ci.com/settings/profile/ +.. _Cirrus CI: https://cirrus-ci.com/ +.. _cirrus-run: https://github.com/sio/cirrus-run/ diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml new file mode 100644 index 0000000000..60b13ed83f --- /dev/null +++ b/.gitlab-ci.d/cirrus.yml @@ -0,0 +1,102 @@ +# Jobs that we delegate to Cirrus CI because they require an operating +# system other than Linux. These jobs will only run if the required +# setup has been performed on the GitLab account. +# +# The Cirrus CI configuration is generated by replacing target-specific +# variables in a generic template: some of these variables are provided +# when the GitLab CI job is defined, others are taken from a shell +# snippet generated using lcitool. +# +# Note that the $PATH environment variable has to be treated with +# special care, because we can't just override it at the GitLab CI job +# definition level or we risk breaking it completely. +.cirrus_build_job: + stage: build + image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master + needs: [] + allow_failure: true + script: + - source .gitlab-ci.d/cirrus/$NAME.vars + - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" + -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" + -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" + -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" + -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" + -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" + -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" + -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" + -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" + -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" + -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" + -e "s|[@]PKGS@|$PKGS|g" + -e "s|[@]MAKE@|$MAKE|g" + -e "s|[@]PYTHON@|$PYTHON|g" + -e "s|[@]PIP3@|$PIP3|g" + -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" + -e "s|[@]CONFIGURE_ARGS@|$CONFIGURE_ARGS|g" + -e "s|[@]TEST_TARGETSS@|$TEST_TARGETSS|g" + <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml + - cat .gitlab-ci.d/cirrus/$NAME.yml + - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml + rules: + - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" + +x64-freebsd-12-build: + extends: .cirrus_build_job + variables: + NAME: freebsd-12 + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G + UPDATE_COMMAND: pkg update + INSTALL_COMMAND: pkg install -y + # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed + # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 + CONFIGURE_ARGS: --disable-gnutls + TEST_TARGETS: check + +x64-freebsd-13-build: + extends: .cirrus_build_job + variables: + NAME: freebsd-13 + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G + UPDATE_COMMAND: pkg update + INSTALL_COMMAND: pkg install -y + TEST_TARGETS: check + +x64-macos-11-base-build: + extends: .cirrus_build_job + variables: + NAME: macos-11 + CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 + +x64-macos-11-xcode-build: + extends: .cirrus_build_job + variables: + NAME: macos-11 + CIRRUS_VM_INSTANCE_TYPE: osx_instance + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_IMAGE_NAME: big-sur-xcode + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G + UPDATE_COMMAND: brew update + INSTALL_COMMAND: brew install + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml new file mode 100644 index 0000000000..857bdc5536 --- /dev/null +++ b/.gitlab-ci.d/cirrus/build.yml @@ -0,0 +1,35 @@ +@CIRRUS_VM_INSTANCE_TYPE@: + @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ + cpu: @CIRRUS_VM_CPUS@ + memory: @CIRRUS_VM_RAM@ + +env: + CIRRUS_CLONE_DEPTH: 1 + CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" + CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@" + CI_COMMIT_SHA: "@CI_COMMIT_SHA@" + PATH: "@PATH@" + PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" + PYTHON: "@PYTHON@" + MAKE: "@MAKE@" + CONFIGURE_ARGS: "@CONFIGURE_ARGS@" + +build_task: + install_script: + - @UPDATE_COMMAND@ + - @INSTALL_COMMAND@ @PKGS@ + - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi + clone_script: + - git clone --depth 100 "$CI_REPOSITORY_URL" . + - git fetch origin "$CI_COMMIT_REF_NAME" + - git reset --hard "$CI_COMMIT_SHA" + build_script: + - mkdir build + - cd build + - ../configure --enable-werror $CONFIGURE_ARGS + || { cat config.log meson-logs/meson-log.txt; exit 1; } + - $MAKE -j$(sysctl -n hw.ncpu) + - for TARGET in $TEST_TARGETS ; + do + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=3D1 ; + done diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars new file mode 100644 index 0000000000..5e51e50ea9 --- /dev/null +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -0,0 +1,13 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-12 qemu +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da29081= 7b9adeea1fd1eb1 + +PACKAGING_COMMAND=3D'pkg' +CCACHE=3D'/usr/local/bin/ccache' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PYTHON=3D'/usr/local/bin/python3' +PIP3=3D'/usr/local/bin/pip-3.7' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed g= tk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh l= ibtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Te= st-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sp= hinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 = sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer v= te3 zstd' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars new file mode 100644 index 0000000000..07716833d9 --- /dev/null +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -0,0 +1,13 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-13 qemu +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da29081= 7b9adeea1fd1eb1 + +PACKAGING_COMMAND=3D'pkg' +CCACHE=3D'/usr/local/bin/ccache' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PYTHON=3D'/usr/local/bin/python3' +PIP3=3D'/usr/local/bin/pip-3.7' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed g= tk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh l= ibtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Te= st-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sp= hinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 = sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer v= te3 zstd' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-= 11.vars new file mode 100644 index 0000000000..cbec8a44a3 --- /dev/null +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -0,0 +1,15 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-11 qemu +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da29081= 7b9adeea1fd1eb1 + +PACKAGING_COMMAND=3D'brew' +CCACHE=3D'/usr/local/bin/ccache' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PYTHON=3D'/usr/local/bin/python3' +PIP3=3D'/usr/local/bin/pip3' +PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy li= bffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxm= l2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 = rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usb= redir vde vte3 zlib zstd' +PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +CPAN_PKGS=3D'Test::Harness' diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index dde8270301..b3d79bc429 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -10,3 +10,4 @@ include: - local: '/.gitlab-ci.d/buildtest.yml' - local: '/.gitlab-ci.d/static_checks.yml' - local: '/.gitlab-ci.d/custom-runners.yml' + - local: '/.gitlab-ci.d/cirrus.yml' --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584114802815.8348254290752; Tue, 6 Jul 2021 08:08:34 -0700 (PDT) Received: from localhost ([::1]:50740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mgb-0008P5-TK for importer@patchew.org; Tue, 06 Jul 2021 11:08:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004lD-Rd for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-00023q-Pu for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: by mail-wm1-x32b.google.com with SMTP id g10so7937816wmh.2 for ; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n41sm2959445wms.26.2021.07.06.07.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A3E231FF96; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bTttEc+oJXhPYrt7q5iIhClUXDghFeYtwNO1q7NtVDA=; b=JCIQL7Snl+Ug+GZDN2TtwyuTPwWQ/as0P8NZlcpOeXaW5OXyd9HK0TqQl9GbNS+g5e isJA7ObpljUic7Vg5WgrzQLsE3BmJSs19Y5b3n2w1tV6JeB7JoVnpa9VGZVlmAXXFhS9 IKrlT+aTCTHOJ47DcyIuIt6EDfbnjnopyOdjlQFUWL+lrKBdS8FdsMSxcLgTY9HtzCD4 +q73qTi4IYUN1YGGp53AtoDd58OXyTbEMhC4WGl0EfiLN19FU/yAGQhewItT0Xcv+Zgp lzOB3uYB+2P8QhZonwgZLCJ3kqfNiyBl+Goa1jeEgUOwQq4+Pd7xBzk6P1lcbXpSc6P1 TGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bTttEc+oJXhPYrt7q5iIhClUXDghFeYtwNO1q7NtVDA=; b=feygw1cYUCoCIV3QZc6oMxbw0H+23tidIpr6kTjuw87vVT9B4mkuxcarQjobqJbIGP zQuMNkJj4WF9b56UVpucZ+2LGWphx5zdr2u9zR3D6dIB5OabaT7CZeO0sOvfSfs8PLdl u+BL6D/iHqj+0DpyiJv9Mc00Tnd7n/L4qQSxgRbAbiTM5JkgwgBdD2SA2df3fyuLT2TL G5VGjEQiFuOJkO+FhCKSj9+GWSrKq7XIPGc7uqGU9PVUO4b7iwklbGyCMCp7e4d40aNx xTF93tC4Nh6MprChUdTEW8CQ9Q1OAa7+LLppl3tMJ8/3zPyY1ilQ2xPYiOomnGj3gJ3O /8ug== X-Gm-Message-State: AOAM533DUCxgA2PUL6e9yKIXyG8AvxWwhxUKHh5Ztvf7vwaRo7bVTwYz SDchwvCxHX9VgLSgSSExmSnaUw== X-Google-Smtp-Source: ABdhPJyGQJKIYHStDEpAje1PLGzA5p+0ZjrjjfwM+8hbn8o0LU5QdQDel4BX7sJYuYymkoe1C6HLKw== X-Received: by 2002:a05:600c:4f41:: with SMTP id m1mr20941645wmq.134.1625583507016; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/39] cirrus: delete FreeBSD and macOS jobs Date: Tue, 6 Jul 2021 15:57:46 +0100 Message-Id: <20210706145817.24109-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Ed Maste , Yonggang Luo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584117225100001 From: Daniel P. Berrang=C3=A9 The builds for these two platforms can now be performed from GitLab CI using cirrus-run. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210625172211.451010-4-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .cirrus.yml | 55 ----------------------------------------------------- 1 file changed, 55 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f4bf49b704..02c43a074a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,61 +1,6 @@ env: CIRRUS_CLONE_DEPTH: 1 =20 -freebsd_12_task: - freebsd_instance: - image_family: freebsd-12-2 - cpu: 8 - memory: 8G - install_script: - - ASSUME_ALWAYS_YES=3Dyes pkg bootstrap -f ; - - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed - nettle perl5 pixman pkgconf png usbredir ninja - script: - - mkdir build - - cd build - # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed - # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 - - ../configure --enable-werror --disable-gnutls - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - gmake -j$(sysctl -n hw.ncpu) - - gmake -j$(sysctl -n hw.ncpu) check V=3D1 - -macos_task: - osx_instance: - image: catalina-base - install_script: - - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ni= nja - script: - - mkdir build - - cd build - - ../configure --python=3D/usr/local/bin/python3 --enable-werror - --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations' - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=3D1 - - gmake check-block V=3D1 - - gmake check-qapi-schema V=3D1 - - gmake check-softfloat V=3D1 - - gmake check-qtest-x86_64 V=3D1 - -macos_xcode_task: - osx_instance: - # this is an alias for the latest Xcode - image: catalina-xcode - install_script: - - brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja - script: - - mkdir build - - cd build - - ../configure --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations'= --enable-modules - --enable-werror --cc=3Dclang || { cat config.log meson-= logs/meson-log.txt; exit 1; } - - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=3D1 - - gmake check-block V=3D1 - - gmake check-qapi-schema V=3D1 - - gmake check-softfloat V=3D1 - - gmake check-qtest-x86_64 V=3D1 - windows_msys2_task: timeout_in: 90m windows_container: --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584116707898.4713094074546; Tue, 6 Jul 2021 08:08:36 -0700 (PDT) Received: from localhost ([::1]:50700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mgd-0008O1-PX for importer@patchew.org; Tue, 06 Jul 2021 11:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX9-0004sH-So for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35606) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWx-00025I-IJ for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: by mail-wm1-x32e.google.com with SMTP id j39-20020a05600c1c27b029020028e48b8fso2005877wms.0 for ; Tue, 06 Jul 2021 07:58:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y7sm17586286wro.51.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C77EF1FF98; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=xzF5y9hW4ssuQaIiUDOsfwqb4TKvG1zObUKZqpUP1uaCDHCljsdUYRNMH+hWYHivGm pDE1ueKfXLWw9GG6EsYhB2/mv8RR9OXOd3xf+uTRUoVjB7plKSXPhylJejWoIHwKMgNL 05z1iePMKHZBgnqemFYhS+tXSykUW9T1J8WBikWJke7M/xRPUFZGDiF4C5ocVv7JxoQi aY0MRASmqJ5QGG6qLAiGpunpJUwkcmJnFc7bhylDlydsRTUEsPVYYtxVoSeqMltOlGIX iLMuFHJ/vh+jhAIILa/q5bgFCyDQtKTnFHw66c/iW3PZX6Ai5eURsYYzWdWcFp/L/Cmp n+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=cZr4h8KZUcnlcmUj99W1TJTBDaG+3RQFhPSQ9e5G+sZbFW8BPm6l1Cm+6qsmfjhvp/ kjq1OudgIoBnlr9kDb7dZQfS1/trT3gK5ScfZiRW1VdyHTmJCEAau/4iRvjtGuEwfty+ V6Lr2ILjLvpF3T6eBTn021HDVyDEG9YKh7zad3alzGJ5uTdZxCJlRt1g6a16Ac4dGe1D sldMFclaYxE0qcM/JWQT6YOJYxsWVI1mi9eoJu9j+H/q5tau62X06Sw0DVN0cdbDHnKN icQO7lno5zNehr3HC4eUPUcIq5MJ9RuHjTBk0dCyiAI8+/T9Wa4fxCBmZeJ32vDmX4Vg 58Ug== X-Gm-Message-State: AOAM5301o4qMoc0Hfq1iLgOwtwgz6NfgNFsMgJ9IGdRXJatWrbk8lYTW Tyw10Fcda06ACgfuLYu5HVn6bg== X-Google-Smtp-Source: ABdhPJz65lxkUzbeiR8+dLHjV4XX1IDNYQDEBTJd34TpxhddCQxISd4enqEJWfFwxP0qsOAGz2PEJg== X-Received: by 2002:a05:600c:17c3:: with SMTP id y3mr20716494wmo.40.1625583513530; Tue, 06 Jul 2021 07:58:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/39] hw/usb/ccid: remove references to NSS Date: Tue, 6 Jul 2021 15:57:47 +0100 Message-Id: <20210706145817.24109-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584119183100005 From: Daniel P. Berrang=C3=A9 The NSS package was previously pre-requisite for building CCID related features, however, this became obsolete when the libcacard library was spun off to a separate project: commit 7b02f5447c64d1854468f758398c9f6fe9e5721f Author: Marc-Andr=C3=A9 Lureau Date: Sun Aug 30 11:48:40 2015 +0200 libcacard: use the standalone project Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-2-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/ccid.txt | 15 +++++++-------- .travis.yml | 12 ++++++------ scripts/coverity-scan/coverity-scan.docker | 1 - tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/docs/ccid.txt b/docs/ccid.txt index c97fbd2de0..2b85b1bd42 100644 --- a/docs/ccid.txt +++ b/docs/ccid.txt @@ -34,15 +34,14 @@ reader and smart card (i.e. not backed by a physical de= vice) using this device. =20 2. Building =20 -The cryptographic functions and access to the physical card is done via NS= S. - -Installing NSS: +The cryptographic functions and access to the physical card is done via the +libcacard library, whose development package must be installed prior to +building QEMU: =20 In redhat/fedora: - yum install nss-devel -In ubuntu/debian: - apt-get install libnss3-dev - (not tested on ubuntu) + yum install libcacard-devel +In ubuntu: + apt-get install libcacard-dev =20 Configuring and building: ./configure --enable-smartcard && make @@ -51,7 +50,7 @@ Configuring and building: 3. Using ccid-card-emulated with hardware =20 Assuming you have a working smartcard on the host with the current -user, using NSS, qemu acts as another NSS client using ccid-card-emulated: +user, using libcacard, QEMU acts as another client using ccid-card-emulate= d: =20 qemu -usb -device usb-ccid -device ccid-card-emulated =20 diff --git a/.travis.yml b/.travis.yml index 4609240b5a..0faddf7b4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ addons: - libattr1-dev - libbrlapi-dev - libcap-ng-dev + - libcacard-dev - libgcc-7-dev - libgnutls28-dev - libgtk-3-dev @@ -34,7 +35,6 @@ addons: - liblttng-ust-dev - libncurses5-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libpng-dev - librados-dev @@ -129,6 +129,7 @@ jobs: - libaio-dev - libattr1-dev - libbrlapi-dev + - libcacard-dev - libcap-ng-dev - libgcrypt20-dev - libgnutls28-dev @@ -137,7 +138,6 @@ jobs: - liblttng-ust-dev - libncurses5-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libpng-dev - librados-dev @@ -163,6 +163,7 @@ jobs: - libaio-dev - libattr1-dev - libbrlapi-dev + - libcacard-dev - libcap-ng-dev - libgcrypt20-dev - libgnutls28-dev @@ -171,7 +172,6 @@ jobs: - liblttng-ust-dev - libncurses5-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libpng-dev - librados-dev @@ -196,6 +196,7 @@ jobs: - libaio-dev - libattr1-dev - libbrlapi-dev + - libcacard-dev - libcap-ng-dev - libgcrypt20-dev - libgnutls28-dev @@ -204,7 +205,6 @@ jobs: - liblttng-ust-dev - libncurses5-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libpng-dev - librados-dev @@ -238,6 +238,7 @@ jobs: apt_packages: - libaio-dev - libattr1-dev + - libcacard-dev - libcap-ng-dev - libgnutls28-dev - libiscsi-dev @@ -245,7 +246,6 @@ jobs: - liblzo2-dev - libncurses-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libsdl2-dev - libsdl2-image-dev @@ -281,6 +281,7 @@ jobs: - libaio-dev - libattr1-dev - libbrlapi-dev + - libcacard-dev - libcap-ng-dev - libgcrypt20-dev - libgnutls28-dev @@ -289,7 +290,6 @@ jobs: - liblttng-ust-dev - libncurses5-dev - libnfs-dev - - libnss3-dev - libpixman-1-dev - libpng-dev - librados-dev diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-= scan/coverity-scan.docker index 501ac67233..ecff6ac5b4 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -93,7 +93,6 @@ ENV PACKAGES \ mingw64-SDL2 \ ncurses-devel \ nettle-devel \ - nss-devel \ numactl-devel \ perl \ perl-Test-Harness \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 00cac5d61c..9dde3f6a78 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -28,6 +28,7 @@ ENV PACKAGES \ libasan \ libattr-devel \ libblockdev-mpath-devel \ + libcacard-devel \ libcap-ng-devel \ libcurl-devel \ libepoxy-devel \ @@ -82,7 +83,6 @@ ENV PACKAGES \ ncurses-devel \ nettle-devel \ ninja-build \ - nss-devel \ numactl-devel \ perl \ perl-Test-Harness \ diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index 24d1647a65..100cfa76e3 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -40,7 +40,6 @@ ENV PACKAGES \ libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ - libnss3-dev \ libnuma-dev \ libpixman-1-dev \ libpng-dev \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 2f1ec7c42b..86114be23a 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -27,7 +27,6 @@ ENV PACKAGES \ libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ - libnss3-dev \ libnuma-dev \ libpixman-1-dev \ librados-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index fe993fe2a3..b33ed139d9 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -31,7 +31,6 @@ ENV PACKAGES flex bison \ libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ - libnss3-dev \ libnuma-dev \ libpixman-1-dev \ librados-dev \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162558399691784.50906346315207; Tue, 6 Jul 2021 08:06:36 -0700 (PDT) Received: from localhost ([::1]:41894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meh-0002Si-LW for importer@patchew.org; Tue, 06 Jul 2021 11:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX9-0004sV-Vq for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWz-00025P-CI for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: by mail-wr1-x434.google.com with SMTP id f17so1840668wrt.6 for ; Tue, 06 Jul 2021 07:58:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y19sm3287863wmj.33.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD6791FF99; Tue, 6 Jul 2021 15:58:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=q7ndubA4R6lUyedVGgXg6NdEBbsItZchYncSIqWcBN6/g7yDLTJwQyExgTuoqMSpzh i2gB3DdGptai5/STOHFAbiHo7DlOgV/pU35xyx5vjEI4aOIbT9mVPOpHWZGANTUpDpO1 3P4QY0r7vcwfTmgeFSWGi4VxPJunarxcIkSxATE1UwPa+lALY+WwAKMGrxkVHDEYFcqf s9eB0iS/4c+kqa8gqtVEfwLZ2YHAvFZ+WaZTO6LvxMqiLYuMo+yLHTYFBsHSqTa/qI5k s3pNBBfgFfOx6T1u5/VMC7o74/ZVMpyxsVpAn6CvP8D7JwE/VZC9HBoosD8M7n6ZBHfm QULg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=V1Om+U7U+JgOX0jJwUrn+4nQyKBOo7G6/Eac3YEHBnATexkCBSKVWT7Flu0PKtftWD ZZzqPTRGvSj9HIHt8MlfvLmTaSuKLiQ4FlYvyubeqauEmmh3Qi9mm1mYdBp030eJ7r+B AJUN0XV7UcfwUKTUb1GUXQhlltN/yGKCFbC78z0g3IibdRwlBqfJoTaYMR6muwdOHzSO J0utTaAL5aeJMBltT/SuzemrpgEhd0qZWMkPh9NsnMjnFB2an9bgrshlcjQcDjWcDcAF sHcme7iej76sISLlUdux036pc2NXCrsmJwGaVa1c8Kg6WQ1ZYRTFtEE6LxoBz3Z+8ASA RoFA== X-Gm-Message-State: AOAM530r7trV5CouOZ5HwVC1+JRpd6QGgINJcBPuMZwv5cRZATYVJ/G+ w7sA3Wtl3tFN5U85DhNuSt6Prw== X-Google-Smtp-Source: ABdhPJzPTsGBSnI0YSSE3JevZRCtcn+v6FK69k57jNgzTHVeaaJNkjbxAF+56YD527Rsc/a5tJb2JQ== X-Received: by 2002:adf:b605:: with SMTP id f5mr22424323wre.419.1625583514364; Tue, 06 Jul 2021 07:58:34 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/39] tests/docker: don't use BUILDKIT in GitLab either Date: Tue, 6 Jul 2021 15:57:48 +0100 Message-Id: <20210706145817.24109-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584024615100007 From: Daniel P. Berrang=C3=A9 Using BUILDKIT breaks with certain container registries such as CentOS, with docker build reporting an error such as failed to solve with frontend dockerfile.v0: failed to build LLB: failed to load cache key: unexpected status code https://registry.centos.org/v2/centos/manifests/7: 403 Forbidden Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4d9bb7c7ed..78dd13171e 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -228,7 +228,9 @@ class Docker(object): def __init__(self): self._command =3D _guess_engine_command() =20 - if "docker" in self._command and "TRAVIS" not in os.environ: + if ("docker" in self._command and + "TRAVIS" not in os.environ and + "GITLAB_CI" not in os.environ): os.environ["DOCKER_BUILDKIT"] =3D "1" self._buildkit =3D True else: --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584276331162.56359616050452; Tue, 6 Jul 2021 08:11:16 -0700 (PDT) Received: from localhost ([::1]:59266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mjD-0005rF-J3 for importer@patchew.org; Tue, 06 Jul 2021 11:11:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXA-0004vq-Qz for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:37628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWv-00024V-Pg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: by mail-wr1-x430.google.com with SMTP id i94so26452895wri.4 for ; Tue, 06 Jul 2021 07:58:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h8sm17027619wrt.85.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B91E1FF9A; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=KqI9jAVlm6IxDc0+v4NdLJCDL2SWt4Y34TjwQApiiNvWwwH4rvHLtGnD5Sx1i8ywiu MS81BMddekGr/P/vpIaW1OIqCtbieGNmvIISjm7XIPpaXHHnO/qMqXSGfCietHxWoRMx DSnZI81CThd08nOD50A9RTVBULqlV0SMb+3++gF8jQZog6356VHOp6EQT27Wjssy3cbt iflvrf1YSFAjBceS1THIr4FL0SHSBz6UGQTASuUUNzkK7dWlJdTMjaZ5P3fbz6PcXEmT pKgBO71KNYkqHgch7AxaWp453fq+KbMhWRrVEnJW1rGcZX1S0z3PB/5SbcXyNY3Eiak3 a2oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=fDphdkOWskBa5MZ6LxNy8MmV1st8DMLJR1J9IvFgMfzfCVjNaZk/A9aL2dMAAKPlKv CGrERE+tib1a7nHjpQ++ezkA2mDaQLGEVFIldx87lvIdnqRHVMsz4Tz6ugyuxQIFT82K I7wK9UWzwxLEdrDk9xmdhJGPFzHLY6Gmc1k28GwzCvh4l3G/LVgolnKLGk8xgXd1BeqE H20HH/uMbbvJNvhm3TXNuQpvmVYFoTsqtjKnHjYRjDso5+iw3sw8Nszqju7sovWEUOpV XpXfeVs6pUHTPHX48VBqkfXMDgD3So4gFv6s0GOJHtPO8AizVomTJztrOGlqJ+mJDTMI d9MA== X-Gm-Message-State: AOAM531liohkbfqKiXAeOfZYtdwbt6sbuzr6Ie8cjG2tc0snjHiPZCVe 1TqHwVI9B3pS7InpAW2M5+4iww== X-Google-Smtp-Source: ABdhPJxabqJH331JlIXQY1/wxuF6ojmB077bRaIVFDAtKkqzlBLWGaWDFvKK2AQ4TxugVaG9ucZSVQ== X-Received: by 2002:a05:6000:12d1:: with SMTP id l17mr22256519wrx.225.1625583511829; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/39] tests/docker: use project specific container registries Date: Tue, 6 Jul 2021 15:57:49 +0100 Message-Id: <20210706145817.24109-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584276846100001 From: Daniel P. Berrang=C3=A9 Since Docker Hub has started to enforce pull rate limits on clients, it is preferrable to use project specific container registries where they are available. Fedora and OpenSUSE projects provide registries. The images in these registries are also refreshed on a more regular basis than the ones in docker hub, so the package update should generally be faster. While CentOS also has a registry it is considerably outdated compared to docker.io, and also only provides x86 images, while docker.io images are multi-arch. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-4-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora-cris-cross.docker | 2 +- tests/docker/dockerfiles/fedora-i386-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/dock= er/dockerfiles/fedora-cris-cross.docker index 1dfff6e0b9..91c373fdd3 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -2,7 +2,7 @@ # Cross compiler for cris system tests # =20 -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/dock= er/dockerfiles/fedora-i386-cross.docker index 8004fd8ee5..dbb8195eb1 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 ENV PACKAGES \ bzip2 \ ccache \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index a638afb525..9fed35f4e1 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index f53007ac86..fb641f6104 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 9dde3f6a78..a506e68d33 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:33 +FROM registry.fedoraproject.org/fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index f7e1cbfbe6..7ebff1b3a8 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,4 +1,4 @@ -FROM opensuse/leap:15.2 +FROM registry.opensuse.org/opensuse/leap:15.2 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625583998439100.30838841118714; Tue, 6 Jul 2021 08:06:38 -0700 (PDT) Received: from localhost ([::1]:42090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mej-0002b3-D7 for importer@patchew.org; Tue, 06 Jul 2021 11:06:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004jt-Fo for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWv-000248-PP for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: by mail-wm1-x333.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1983150wmh.2 for ; Tue, 06 Jul 2021 07:58:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm15754753wmf.9.2021.07.06.07.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F8181FF9B; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=efa2nTxktRp7zXniq746JdLr742k0jtnT2gf5cBc47kIxAz9+s5prHEzHJzxhAfHm0 xoY8s9p5oDV3q8OR5ZyZlLGQ8gQowwqAdM8rAwVSOp3f69EI3D5HjcvgBIl3WPM5TbLx P701xtt8jgni3DSCHI2TS2A9NQamlsGQIbmt4uUyKSphTZw+d71PfprJuRx4k86lvyCr gYhn4JUzbGdtnswk33OCTI4QPb3ZKQhcwS6wSeCyDJhmzvMNwDg8xh7fue0Uedf/BT+9 snzqdHzUlb84QGPTmlTDGnHxE75/HH0W/LEMN49zn2Cy79f1Z7DfVkAo5cg7mPoyB3xE wpfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=pYytinO00byzst5d52Zs3hU3yFKgQ0RB1MBoab12FfRrIlUiwCRo5B3u1AHtn47dtX JYd5wvmuC5m/v3VI3PtjKlRc/Z0arv8D2zu4+ri53KGl5rxPk4MNNU71kGRJJInhTGLP KztEjVOnYyl/umE8blayzVIsuZUsHh2BWu7Mf78hcf4gq8hN0IJd+qUicOHeuwN3vOEY u4/Dz9ZGa3pp66laPwzGzQPUC2VQObM97WqC2Y8FmgbClzQVny+P/ZExuhRBpLy9kyKx +JVRhMxjHbF42xOrTpaVhZnXrfw6NPOcE/ndzwfDjpkJ7vjjQ+GC+XtAgy/0+Chdr6HW 1Uig== X-Gm-Message-State: AOAM532GQ2zp1NAJYjzH0hPAnZxfj4SSwjM7DoSGhf3xdh+t68PaJV+4 8tNxHlr+oRECMglhcdN0smYUfg== X-Google-Smtp-Source: ABdhPJw0gcXmxKcrLMjbqRq2GgxelGTmxmfZQmddwIvkVzg0PpqppLc4hhWTuEthcBZ0XKrybf5ItQ== X-Received: by 2002:a05:600c:3794:: with SMTP id o20mr16425042wmr.0.1625583511015; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/39] tests/docker: use explicit docker.io registry Date: Tue, 6 Jul 2021 15:57:50 +0100 Message-Id: <20210706145817.24109-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584026148100013 From: Daniel P. Berrang=C3=A9 It is good practice to use an explicit registry for referencing the base image. This is because some distros will inject their own registries into the search path. For example registry.fedoraproject.org comes ahead of docker.io. Using an explicit registry avoids wasting time querying multiple registries for images that they won't have. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-5-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian11.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 03e0440e03..8f810810f3 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,4 +1,4 @@ -FROM centos:8.3.2011 +FROM docker.io/centos:8 =20 RUN dnf -y update ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index ba4148299c..2f11b3b7bc 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -5,7 +5,7 @@ # using a prebuilt toolchains for Xtensa cores from: # https://github.com/foss-xtensa/toolchain/releases # -FROM debian:stretch-slim +FROM docker.io/library/debian:stretch-slim =20 RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index 4ffe47671e..a27b88df55 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -7,7 +7,7 @@ # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:buster-slim +FROM docker.io/library/debian:buster-slim =20 # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/docker= files/debian11.docker index 5adfd62d55..febf884f8f 100644 --- a/tests/docker/dockerfiles/debian11.docker +++ b/tests/docker/dockerfiles/debian11.docker @@ -8,7 +8,7 @@ # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:bullseye-slim +FROM docker.io/library/debian:bullseye-slim =20 # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index 100cfa76e3..e0ff425c01 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -9,7 +9,7 @@ # system won't pick up that it has changed. # =20 -FROM ubuntu:20.04 +FROM docker.io/library/ubuntu:20.04 ENV PACKAGES \ ccache \ clang \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 86114be23a..adcdef8244 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM docker.io/library/ubuntu:18.04 ENV PACKAGES \ ccache \ clang \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index b33ed139d9..78755bc2e3 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM docker.io/library/ubuntu:20.04 ENV PACKAGES flex bison \ bsdmainutils \ ccache \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584259603340.24948483806315; Tue, 6 Jul 2021 08:10:59 -0700 (PDT) Received: from localhost ([::1]:57976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0miw-00051m-Pf for importer@patchew.org; Tue, 06 Jul 2021 11:10:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXK-00055m-Jo for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:59 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mX3-00025e-QC for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:58 -0400 Received: by mail-wr1-x42a.google.com with SMTP id q17so6045285wrv.2 for ; Tue, 06 Jul 2021 07:58:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm3128179wmi.1.2021.07.06.07.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6152F1FF9C; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=dxN3O2shUBDveDdRza5Kbsx1GJWEDtP+psl3NNbeSj6rZaC3G5/87jalX6OkOJz8tq POg/oqqcG60V6R6DDNQyJqcaJuaJxFrHrtkzOiBD4xzisKIOAjffNPTccYSEOesiSas/ Gi45/GPJxnfVdgLnsExP2PjPcRQyDfHUuGro7idzxpyF7Es5yG/uQKSbRjHqiMKfdXzg aVsRfwc7pfIIwXg2DxMWdtox8tywGp4kNeaL/aSgXB4IozhupAaJV2DsWs1zqFidx0aI UQ/qE2YevcaecW/lVgPEBwxvX6eD1lp88sqDohmUWDVZITRIZvjtgcaOxxu2lnF45o5z wJug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=i8kzf70bkd6USlZ9iVpP5DdUA8h+HoZsYmDxAXQeYnwqnyNGRwIP0nIi4UQlFgYJSW ss7M3njZOI5SSv68a7Jsv/rQ+7DvBz6zOvOQuA77XhneCnkfdM5zMApkuKLQah3zh8L5 nVURV5k/lxb19kb6T+lENToaNXiVCJaHStLTnp2WYhZglDY8XzBXu9K7D+Peou/J+OUP c5tXuw6NvGbSi2mwT+QH3yAYe5nf6cI50cFBsHNquyXwDG2zpwnfu9Yeql0UoTvlwplN kVZL1/DXHOP1TSyTJcy8QhYHESsv9KGNyam7IIRVuIX4FFqxDFqaoQjt6kqwjVPuoG2O ettg== X-Gm-Message-State: AOAM531umjOXOY2oRZ1Mmj2Rfe1RyQsa1LnQh0a7vusl2fdCYRfAoQFB FY0ACVkdkZhtCTEWSVDwU2jLLg== X-Google-Smtp-Source: ABdhPJx8x2LiMlBfKhicabnxrNHqW8vAtSAG2gwgOvyMZM+g8ds4nVvFV1G3kB9xVIDlYAZ/GJ18Zw== X-Received: by 2002:a05:6000:154c:: with SMTP id 12mr22722209wry.97.1625583516293; Tue, 06 Jul 2021 07:58:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/39] tests/docker: remove FEATURES env var from templates Date: Tue, 6 Jul 2021 15:57:51 +0100 Message-Id: <20210706145817.24109-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584260928100001 From: Daniel P. Berrang=C3=A9 In preparation for switching to auto-generated dockerfiles, remove the FEATURES env variable. The equivalent functionality can be achieved in most cases by just looking for existance of a binary. The cases which don't correspond to binaries are simply dropped because configure/meson will probe for any requested feature anyway. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-6-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/common.rc | 19 ++++++++++++++----- tests/docker/dockerfiles/debian10.docker | 2 -- .../dockerfiles/fedora-win32-cross.docker | 1 - .../dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/docker/run | 3 --- tests/docker/test-clang | 2 +- tests/docker/test-debug | 2 +- tests/docker/test-mingw | 3 ++- tests/docker/test-misc | 2 +- tests/docker/test-tsan | 2 +- 14 files changed, 20 insertions(+), 21 deletions(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index ebc5b97ecf..c5cc33d366 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -15,14 +15,23 @@ # overriden by TARGET_LIST if the user sets it. DEF_TARGET_LIST=3D${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"} =20 -requires() +requires_binary() { + found=3D0 for c in $@; do - if ! echo "$FEATURES" | grep -wq -e "$c"; then - echo "Prerequisite '$c' not present, skip" - exit 0 - fi + for d in /bin /usr/bin /usr/local/bin + do + if test -f "$d/$c" + then + found=3D1 + fi + done done + if test "$found" !=3D "1" + then + echo "Prerequisite '$c' not present, skip" + exit 0 + fi } =20 configure_qemu() diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index a27b88df55..b414af1b9f 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -35,5 +35,3 @@ RUN apt update && \ python3-sphinx \ python3-sphinx-rtd-theme \ $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[al= l]' | cut -d\ -f2) - -ENV FEATURES docs diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 9fed35f4e1..5a03e1af43 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -37,7 +37,6 @@ ENV PACKAGES \ =20 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw =20 # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-w64-mingw32- diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index fb641f6104..ff706040c4 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -33,7 +33,6 @@ ENV PACKAGES \ =20 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw =20 # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32- --disable-cap= stone diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index a506e68d33..64a413f5e0 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -117,4 +117,3 @@ ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt ENV PATH $PATH:/usr/libexec/python3-sphinx/ -ENV FEATURES mingw clang pyyaml asan docs diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index e0ff425c01..f0e0180d21 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -69,4 +69,3 @@ ENV PACKAGES \ RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml sdl2 docs diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index adcdef8244..0acdb0d9ad 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -55,7 +55,6 @@ ENV PACKAGES \ RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml sdl2 docs =20 # https://bugs.launchpad.net/qemu/+bug/1838763 ENV QEMU_CONFIGURE_OPTS --disable-libssh diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 78755bc2e3..88b3cfa136 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -70,7 +70,6 @@ ENV PACKAGES flex bison \ RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang tsan pyyaml sdl2 =20 # Apply patch https://reviews.llvm.org/D75820 # This is required for TSan in clang-10 to compile with QEMU. diff --git a/tests/docker/run b/tests/docker/run index 8edc7026ee..421393046b 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -30,9 +30,6 @@ mkdir -p $TEST_DIR/{src,build,install} =20 # Extract the source tarballs tar -C $TEST_DIR/src -xf $BASE/qemu.tar || { echo "Failed to untar source"= ; exit 2; } -if test -f $TEST_DIR/src/Makefile; then - export FEATURES=3D"$FEATURES dtc" -fi =20 if test -n "$SHOW_ENV"; then if test -f /packages.txt; then diff --git a/tests/docker/test-clang b/tests/docker/test-clang index 8c51ead518..b57e0119d9 100755 --- a/tests/docker/test-clang +++ b/tests/docker/test-clang @@ -13,7 +13,7 @@ =20 . common.rc =20 -requires clang +requires_binary clang =20 cd "$BUILD_DIR" =20 diff --git a/tests/docker/test-debug b/tests/docker/test-debug index c050fa0d93..f52f16328c 100755 --- a/tests/docker/test-debug +++ b/tests/docker/test-debug @@ -14,7 +14,7 @@ =20 . common.rc =20 -requires clang asan +requires_binary clang =20 cd "$BUILD_DIR" =20 diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index c30eb654eb..0bc6d78872 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -13,7 +13,8 @@ =20 . common.rc =20 -requires mingw dtc +requires_binary x86_64-w64-mingw32-gcc +requires_binary i686-w64-mingw32-gcc =20 cd "$BUILD_DIR" =20 diff --git a/tests/docker/test-misc b/tests/docker/test-misc index cc94a738dd..2a3c2c2e1c 100755 --- a/tests/docker/test-misc +++ b/tests/docker/test-misc @@ -14,7 +14,7 @@ =20 . common.rc =20 -requires docs +requires_binary sphinx-build-3 sphinx-build =20 cd "$BUILD_DIR" =20 diff --git a/tests/docker/test-tsan b/tests/docker/test-tsan index eb40ac45b7..53d90d2f79 100755 --- a/tests/docker/test-tsan +++ b/tests/docker/test-tsan @@ -17,7 +17,7 @@ =20 setup_tsan() { - requires clang tsan + requires_binary clang tsan_log_dir=3D"/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS=3D"${EXTRA_CONFIGURE_OPTS} --enable-tsan \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585211808383.7266409114816; Tue, 6 Jul 2021 08:26:51 -0700 (PDT) Received: from localhost ([::1]:54560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0myI-0006Pi-KA for importer@patchew.org; Tue, 06 Jul 2021 11:26:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfS-0005fx-0q for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:22 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfP-0007Hd-VN for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:21 -0400 Received: by mail-wr1-x42c.google.com with SMTP id n9so9126644wrs.13 for ; Tue, 06 Jul 2021 08:07:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm3151308wmi.1.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E8431FF7E; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=HiJngSbqS6k+mUQCr3YV666d/elEh1N2PJdFFPMLBN9Okjv17qAXcSse+XOSFN93y7 6SAmrBwJBRoZN2u+Vbk/ejY1m+YARlMNgJpj9o1+OupJLBV8ENbU58P1GqSw+yZGVHN+ 5l3/smIaChJmyEYvONPE+EsKAB6dgLeX72isp5AnONZqRzNDndY446pLe0sDxPcfr2p4 LD85R/2AocMT1FDqcIZYLHirbLqMIoNKpIPEffIPTtkIoH4Dvub1FJm+RwNQi5XMQy2c 9Onm6SWcs5ObmryQ51zbmnMYrj3PCNq4rRWgPKkc/ymwrxo4I2J/4KF4G70Xkt7vsPvs 0pMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=C9jDZCjNll1Qvvbi6/e54NH0Ieif6PJMctxghpoKRgSAS4yyPWL2EoSI6YGB37iNiu SG9gH4Q1DTiq/ifFlOgkO4dWOOg+k3dIUv0lffmq3snlviqqUPAFugozl5gGOhUXW9aW i/8VxmW7bvpJD0HPxF76NGvv/G4zriB0zkG4sOb1NCWvyzcG3cnZSRt9Yl8/LiETijvt 9PeVM9Aib9zJBneOMUUPf6/RpQWwfiiPeuXeY808Y9jHCknofiYmX5P0iRdzLxzYOU9D QzNeUPmKroVkx3j5NzZ3qPwaT2ux3kelOAse1cEqchSskEAm5fnsnfy8EEJuzifTSpnf LgPg== X-Gm-Message-State: AOAM5335P6WXxUxMOfLl1SbGsJso8u/3yEDm0hywtSmDmCtUbsFCwJUl yHr2m9TJ+B+sGK7DzrDj5xb9cCmL6iu5nw== X-Google-Smtp-Source: ABdhPJwWWByY5FV6iJdzxzGQqQpNp86dcAtDGcs1RmacgHGRTutz1Vw6+9gZ85pUOz03gZSesZQMDA== X-Received: by 2002:a5d:4906:: with SMTP id x6mr22805718wrq.387.1625584038555; Tue, 06 Jul 2021 08:07:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/39] tests/docker: fix sorting in package lists Date: Tue, 6 Jul 2021 15:57:52 +0100 Message-Id: <20210706145817.24109-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585215767100001 From: Daniel P. Berrang=C3=A9 This will make diffs in later patches clearer. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-7-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/docker/dockerfiles/opensuse-leap.docker | 16 ++++++++-------- tests/docker/dockerfiles/ubuntu1804.docker | 4 ++-- tests/docker/dockerfiles/ubuntu2004.docker | 8 +++++--- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 8f810810f3..ee52305646 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -22,9 +22,9 @@ ENV PACKAGES \ lzo-devel \ make \ mesa-libEGL-devel \ - nmap-ncat \ nettle-devel \ ninja-build \ + nmap-ncat \ perl-Test-Harness \ pixman-devel \ python36 \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 64a413f5e0..4a0a84eb43 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ + SDL2-devel \ bc \ brlapi-devel \ bzip2 \ @@ -79,10 +80,10 @@ ENV PACKAGES \ mingw64-pixman \ mingw64-pkg-config \ mingw64-SDL2 \ - nmap-ncat \ ncurses-devel \ nettle-devel \ ninja-build \ + nmap-ncat \ numactl-devel \ perl \ perl-Test-Harness \ @@ -97,7 +98,6 @@ ENV PACKAGES \ python3-sphinx_rtd_theme \ python3-virtualenv \ rdma-core-devel \ - SDL2-devel \ snappy-devel \ sparse \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 7ebff1b3a8..6011447181 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -9,46 +9,46 @@ ENV PACKAGES \ cyrus-sasl-devel \ gcc \ gcc-c++ \ - mkisofs \ gettext-runtime \ git \ glib2-devel \ glusterfs-devel \ - libgnutls-devel \ gtk3-devel \ + libSDL2-devel \ + libSDL2_image-devel \ libaio-devel \ libattr-devel \ libcap-ng-devel \ libepoxy-devel \ libfdt-devel \ + libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ + libnuma-devel \ + libpixman-1-0-devel \ libpmem-devel \ libpng16-devel \ librbd-devel \ libseccomp-devel \ + libspice-server-devel \ libssh-devel \ lzo-devel \ make \ - libSDL2_image-devel \ + mkisofs \ ncurses-devel \ ninja \ - libnuma-devel \ perl \ - libpixman-1-0-devel \ python3-base \ python3-virtualenv \ rdma-core-devel \ - libSDL2-devel \ snappy-devel \ - libspice-server-devel \ systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ virglrenderer-devel \ - xen-devel \ vte-devel \ + xen-devel \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3.6 =20 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 0acdb0d9ad..a50a35e6fe 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -46,10 +46,10 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ - python3-yaml \ + ninja-build \ python3-sphinx \ python3-sphinx-rtd-theme \ - ninja-build \ + python3-yaml \ sparse \ xfslibs-dev RUN apt-get update && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 88b3cfa136..eee2ef3cac 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,8 +1,10 @@ FROM docker.io/library/ubuntu:20.04 -ENV PACKAGES flex bison \ +ENV PACKAGES \ + bison \ bsdmainutils \ ccache \ clang-10\ + flex \ gcc \ gcovr \ genisoimage \ @@ -65,8 +67,8 @@ ENV PACKAGES flex bison \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ - xfslibs-dev\ - vim + vim \ + xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584701101323.7682678339105; Tue, 6 Jul 2021 08:18:21 -0700 (PDT) Received: from localhost ([::1]:51670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mq3-0002iV-N5 for importer@patchew.org; Tue, 06 Jul 2021 11:18:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfD-0005Fm-F3 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:07 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfB-00076H-65 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5373780wmq.1 for ; Tue, 06 Jul 2021 08:07:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r3sm14574113wrz.89.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 95D8C1FF9D; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=vlhPRknyqzBI7ZbWNCRYZDhIHAwbm/vqLyV01gjTmZ1PprWsjv82Nh2qz3P9CpOkWH 7pvMaCXV8WN8w56dyiEg7BGHnpHv1cv40ORElHC+mfmc+0zeXSDM/q5AtLyZ10UsP3Vv 8SXO00A51wGnDPWZlV1SM8UzRi/vp8K/Q6Z1flBWs2SfNYZq1jLKjOAm8tI4If5L0IZ/ QtHImcEma/J027xCcydmHKUMMK2tcnOXaNU5PcK7KApp+i376TITE1crgrPsSjoddvPI AGHwHNP34bwPsFLKDr5VOEkknlvqnDoktwgw4yA25hmmD6lBuJQk9aIM/CLfEHP75p2r yaeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=t1QHVwwOoZh8SWCbgY185kUeD+UewqB2cZYATez098wsd57jrEv1hQzEAF45208lqE TKm7RZCYKY8gYsj5aHJqASxMxk/OYD5PGfzrYrwSvXDBiI46WoJdx6fac4FLHgF9Ee+Z zN8VAsQyvssokApSwFlMHidWFt1P0zKhvgzjIn5sGkWKRDMgowXbA2II0EVM6UtHCosx jY5VPHWjK79b7BsPX3QjbA9Ew3cQhRHvARL2VeDs+zbThZonBj2f5Ap/yHD/9M02JwvP 9CMxgS5cJD7PN9PixY5t58eEpTRVENpUV3zGvsMP+1Io/0tnyfpnZJhiJLOnf6G9T9kK T+WQ== X-Gm-Message-State: AOAM530hlADX/v7L9wQTqai63ezWPmrfhzbZ87Fbu0IFHh0oRhajddJ1 7dQ/59YZfHK6s88tuHCyfO4gXg== X-Google-Smtp-Source: ABdhPJwzxOV7DvOEnVaReG3OaGbLFMMy/GBRPjreVfbqImci/bsyyL4tLu/26MIMzraHa/nGuPiH+A== X-Received: by 2002:a7b:c949:: with SMTP id i9mr4070373wml.168.1625584022611; Tue, 06 Jul 2021 08:07:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 15/39] tests/docker: fix mistakes in centos package lists Date: Tue, 6 Jul 2021 15:57:53 +0100 Message-Id: <20210706145817.24109-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584703264100001 From: Daniel P. Berrang=C3=A9 mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is. spice-glib-devel is not use in QEMU at all, but spice-protocol is. We also need the -devel package for spice-server, not the runtime. There is no need to specifically refer to python36, we can just use python3 as in other distros. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-8-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/centos8.docker | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index ee52305646..5f1c57b4ad 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -21,16 +21,16 @@ ENV PACKAGES \ libgcrypt-devel \ lzo-devel \ make \ - mesa-libEGL-devel \ + mesa-libgbm-devel \ nettle-devel \ ninja-build \ nmap-ncat \ perl-Test-Harness \ pixman-devel \ - python36 \ + python3 \ rdma-core-devel \ - spice-glib-devel \ - spice-server \ + spice-protocol \ + spice-server-devel \ systemtap-sdt-devel \ tar \ zlib-devel --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585069852562.4291215617178; Tue, 6 Jul 2021 08:24:29 -0700 (PDT) Received: from localhost ([::1]:46554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mw0-0001B5-QW for importer@patchew.org; Tue, 06 Jul 2021 11:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfO-0005Yf-Ql for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfL-0007Fq-If for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:17 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l5so9712099wrv.7 for ; Tue, 06 Jul 2021 08:07:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y8sm16932969wrr.76.2021.07.06.08.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC4681FF9E; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7hYG9gx99ZdrMKH78PnqlgUjRUSFo9m2QUAYrIofBos=; b=XY/WQuKsFNQcZHYMfzje3q7DeLZyFSNZtDd0YXinlaNv+kKwQJBSuZCGSc7NVFquHP DWZuw5nNfeH+XrvaIkoShB4ylWNdqBAowEVIGRlD/Laqy2VoKzJt14wETQ16O2bqmbI7 kBb9NvJpoh05FpeQ39O1aYSrqUxBteRmj7Nl3WDhoXi8U/e33TIMspnfmYDG8bp5jNKZ H1N3VpWISZ5fHalnb4F6vCk9gnHQbxh2jkLFjrW/u8+21oSiilNsOZQwik/5ATWKmcB8 soVVVST7oTaOO04ADmqqJUZzW5Q6DhiEkqVdQLRCpUERUutOp4jPH2iRh8Kp/2GSTX5K uUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7hYG9gx99ZdrMKH78PnqlgUjRUSFo9m2QUAYrIofBos=; b=oAfYadtuBIYszLxZSeBh+MexvVn3xodSlTrLdVFQF89otEHMbbjacZNVw3f9hSWRku XQiZ5o0uiu9zM4jZzT8wsMm2ZaqQU0gDkZCR77hJj57Rj4hRDFgcGAOn4btwZtZnn5uP H8rxkfDK3D5mrc4i8hLX/gWgT1vVRexgkDY9Ksl/LMCSzHKClfdHvZDeKTWDDpMRfKvn EtotwEp8VwxDjnNcq7EFYwj6HEYvpRvcO3gzhF6/SQtsbHEDUx9ERkd7V2qAI6zniNYs mXfbKiR71sK6u6IwafwKNEvoBfXq5pBLwxEXEJDwbop5mPeu01ccuFtafku8k4gUc52K 6eng== X-Gm-Message-State: AOAM532l1OW1ifWL7mXj5okqO17tCKUGeiAlc8P7LF7Zt3nx0vvbdlaJ CIT4n5K6OMdmnfP1lre7Hxrtrw== X-Google-Smtp-Source: ABdhPJxSW7/WnGuyJ2ixczRkDual0GXNcD13Tmpx+nxFT1Q23YMZECWBnwKau2k9r5U+hkYQS09tvw== X-Received: by 2002:adf:ba43:: with SMTP id t3mr17193812wrg.184.1625584034186; Tue, 06 Jul 2021 08:07:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list Date: Tue, 6 Jul 2021 15:57:54 +0100 Message-Id: <20210706145817.24109-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585075934100001 From: Daniel P. Berrang=C3=A9 libblockdev-mpath-devel is not used by QEMU, rather it wants device-mapper-multipath-devel. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-9-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 4a0a84eb43..f667f03cc5 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -28,7 +28,6 @@ ENV PACKAGES \ libaio-devel \ libasan \ libattr-devel \ - libblockdev-mpath-devel \ libcacard-devel \ libcap-ng-devel \ libcurl-devel \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585780216122.94998832329486; Tue, 6 Jul 2021 08:36:20 -0700 (PDT) Received: from localhost ([::1]:56422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n7T-0001Ld-2U for importer@patchew.org; Tue, 06 Jul 2021 11:36:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moo-0002MN-37 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mol-0004qH-OU for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:01 -0400 Received: by mail-wr1-x435.google.com with SMTP id a8so14819045wrp.5 for ; Tue, 06 Jul 2021 08:16:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i2sm3199147wmq.43.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C65C51FF9F; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=xEESpXov2DK9hBWSxMI2qWVcTc5c59j/GHKKdstorTXWATFqJ2sg7b721EWKvPFqbc KbMsU9NpV0GOGsGRRQPoPn4FNg036bDZevseXQtexhmqBL4W2TTwoFzb2yW43UtjBzdz jaEp+bMpEVxP8dbWnt2bOpvCUn6iwoygg/xddxzxzfEPzdXonBIDBdzVP15SX3MBJeqL pATtaUUVcESWz//QpHKdJ8kLa/TZbGADH0+mWK9X8/aaNtLRQ6WM3kGD6uvUmmNfGnFI N9Ydx14XqQxgJGOmYnUp6pLBzmBDe0XPmqxoA39NuvF6bwQzlLUYufY+HR1Z1NCqeOsf Pkxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=mjVMgB6o8q3P6xr7aPM/+IqgoVI2UyAASXcnm8hvSpIdSvQhAS/J4b12YkJJZGV+lQ cUkhL1A+LMAV/tsQfIiZ0ReWPGQlnYwJ5sScTsglCS1O5Nu2IPFqXF4rriX/eloMM44r jIp91f5jlyfDW6kCcDnq9/JM8Rxxf3TSsx8GhART4iMxA88PZZYT0m0GzEami457J/dM eCkTe5lfptCf1kNpGsSRiAgwfW1GsP+ETC6dPHGIXOH2W9M4lcPFHeMpl+LWHVg66Iw3 9uRcCJzIsQXr2TDz6ovnM7D6YOyTB3mopiqkO7aP5sNUxiHXuBltbwoNUU2bepQoh/Qk U2Lw== X-Gm-Message-State: AOAM533zHdKIdtXlJCYUB6T7AqdUDd377lHkYuoQmi6EldAgfR4U5aDY N4Oi646qS6QTEaz9fpjVXQCr7A== X-Google-Smtp-Source: ABdhPJzF+JQr65O41bxMxiKeYcjTTP1+7HEoPv2xiS5GM4YrAxc0vSTjfrlp3DbwjqGLel9yREZn4g== X-Received: by 2002:a05:6000:1361:: with SMTP id q1mr22046681wrz.179.1625584616705; Tue, 06 Jul 2021 08:16:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists Date: Tue, 6 Jul 2021 15:57:55 +0100 Message-Id: <20210706145817.24109-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585785405100001 From: Daniel P. Berrang=C3=A9 librados-dev is not required by QEMU directly, only librbd-dev. glusterfs-common is not directly needed by QEMU. QEMU uses ncursesw only on non-Windows hosts. The clang package is clang 10. flex and bison are not required by QEMU. Standardize on nmap ncat implementation to match Fedora/CentOS. Remove vim since it is not a build pre-requisite and no other containers include it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-10-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu1804.docker | 3 --- tests/docker/dockerfiles/ubuntu2004.docker | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index a50a35e6fe..ee8545e4b1 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -5,7 +5,6 @@ ENV PACKAGES \ gcc \ gettext \ git \ - glusterfs-common \ libaio-dev \ libattr1-dev \ libbrlapi-dev \ @@ -24,12 +23,10 @@ ENV PACKAGES \ libjemalloc-dev \ libjpeg-turbo8-dev \ liblzo2-dev \ - libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ libpixman-1-dev \ - librados-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index eee2ef3cac..25f56adfb2 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,16 +1,13 @@ FROM docker.io/library/ubuntu:20.04 ENV PACKAGES \ - bison \ bsdmainutils \ ccache \ - clang-10\ - flex \ + clang \ gcc \ gcovr \ genisoimage \ gettext \ git \ - glusterfs-common \ libaio-dev \ libattr1-dev \ libbrlapi-dev \ @@ -30,12 +27,10 @@ ENV PACKAGES \ libjpeg-turbo8-dev \ liblttng-ust-dev \ liblzo2-dev \ - libncurses5-dev \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ libpixman-1-dev \ - librados-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ @@ -53,7 +48,7 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ - netcat-openbsd \ + ncat \ ninja-build \ python3-numpy \ python3-opencv \ @@ -67,7 +62,6 @@ ENV PACKAGES \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ - vim \ xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585926837974.9837085537858; Tue, 6 Jul 2021 08:38:46 -0700 (PDT) Received: from localhost ([::1]:38172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n9p-0007q5-Mb for importer@patchew.org; Tue, 06 Jul 2021 11:38:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mp7-0002QN-UC for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:22 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mop-0004sn-So for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id q17so6122491wrv.2 for ; Tue, 06 Jul 2021 08:17:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c10sm15617088wmb.40.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD5961FFA5; Tue, 6 Jul 2021 15:58:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P9Upb7I6HMRjCcJjpxGvstVHkB7w6Pb+oVKK25wH7Y4=; b=xbd43Pk52PsokX/c1MFMChCGHn58nclzeHXQ6KjlU1U0A5wNRxPi3910ekQrO3zsBf 6B0ic89Egk5xgpsqr/nwNao1Jok+zD59DgdFqXc9yEgXmnESfaDljE/FBOW7R/G+sjjh QiEO3o8l2SlmpZEEs1IQqONPcY4cO3fcvayz/6oNIYT07z7inYTRHQYl1kSK9ur/gRFG X8mM3EP5PNn+8DB/bPjX5q/D1gXbAqrjZAwLjykLS00PJSso0GxeVjU3LgKb0KDyKw0k zykkkO8XtUn9zeq9vpGQ2wJu3tYok2FJskuF22h4cdFY+wcVjWDBAsOfsNOSh+tj8Yia r5tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P9Upb7I6HMRjCcJjpxGvstVHkB7w6Pb+oVKK25wH7Y4=; b=FglaToSw5k5DTewORu04MYzwz6mEtCk1Qi74g52b5iyrXj4r2nNH0sbWbYF8F12cZc bjzA5tl80WF0nC4gQUcU8hnBkwZSVOIxTtKvh5XkaYMcQGnbsBTvoGzQnf59UcGq4/ky d5HENPKZgDecnXUuXJJojd53IRatx3ywce2R4wFb9JWfpEUES1dJ3x2MvlfLF0X9Qbn7 V+1EUhxu0zKU0dNm4aTQCDEV4OIZ71LHDr8c4L7d1FcFrdsc+5bR0OrW+G4Pv2Rfa6YC ELjfZHG3ds0JUVCrF3tFbNVXD6hhXEnLoVd9t/6Z+X0244nCzKXYEmNUgr2rwS7LH3tt Qmcw== X-Gm-Message-State: AOAM530Etkr9IROuNY2MEjUJmuwgLEcp/iS8m5EARW+/JnelazQ5u2mA S3Dh0FBwAZ99nU7cDW82n5bfSQ== X-Google-Smtp-Source: ABdhPJynr/yZTk/3jGQVjE5b9AdYxMwsKEPbSOrey0i6AJt3XHl0DMYHU/Cth8pJ18XCZeGoAWQbMA== X-Received: by 2002:a5d:64c3:: with SMTP id f3mr20888424wri.101.1625584621818; Tue, 06 Jul 2021 08:17:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora Date: Tue, 6 Jul 2021 15:57:56 +0100 Message-Id: <20210706145817.24109-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585934588100001 From: Daniel P. Berrang=C3=A9 There are dedicated containers providing mingw packages for Fedora. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-11-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 27 -------------------------- 1 file changed, 27 deletions(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index f667f03cc5..5849ea7617 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -52,33 +52,6 @@ ENV PACKAGES \ lzo-devel \ make \ meson \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-glib2 \ - mingw32-gmp \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config \ - mingw32-SDL2 \ - mingw64-bzip2 \ - mingw64-curl \ - mingw64-glib2 \ - mingw64-gmp \ - mingw64-gnutls \ - mingw64-gtk3 \ - mingw64-libjpeg-turbo \ - mingw64-libpng \ - mingw64-libtasn1 \ - mingw64-nettle \ - mingw64-pixman \ - mingw64-pkg-config \ - mingw64-SDL2 \ ncurses-devel \ nettle-devel \ ninja-build \ --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162558484852156.58006453190626; Tue, 6 Jul 2021 08:20:48 -0700 (PDT) Received: from localhost ([::1]:59438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0msR-0007vA-Lo for importer@patchew.org; Tue, 06 Jul 2021 11:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfJ-0005RA-NY for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:37791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0007D7-Oi for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:13 -0400 Received: by mail-wm1-x32e.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009691wmh.2 for ; Tue, 06 Jul 2021 08:07:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m18sm15728584wmq.45.2021.07.06.08.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0141C1FFA6; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=bh0vCDd4ys4vhyrP0NOBDo5lY1mEJvTGuVTX0PlfJ2IVgSH8SOAt4pSC7tXAhR1CDw 72Mau83TyUodva77bXQJwO8rwPHHX5DgOxy+gtvkL7No6wCCgB02dPqjBe8YHxsW+nWO pOK108lW4H47bSwtUAMQ2dFN9rh5Nfi7+HnCzoJY2dAnNSG4W+mLPT+ZdTUDParN6VBc DuUBuDiClFWas0KR+ZJRD1fz5VBf3O8ya2z47uNlLXAV8V0xvOqaAqcrhQbMAGylEwW7 HIQ10DoTwIqKCLZfZO0U1tEmDdswHv3BlLMe74fO9oCY7GUJV0PQzJ9t88wCyEg2q1gj UkIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=HdaGbNcfURauEZ1bo4hx6xW7TDBJisA12J6ltPcE6T/zMthnMu/d/1nJoAZyLlRJ9j 1cRFNY21M8HCw6jhMqx/31lhAbY2QF/SlqH5iCfYIFBunBrN7fpJSvsCMfiWn4AEOwxS An4V6i4iLlBLsMGaobJ53nFv/46QOhp+6JnJo/+pdFkv/6+PJRKxrZTGXOBq5JPG7qj5 HVg5KZ5t51ism48CxPOVdRLIEp+nErf2bZ1puoVbZQ3fAiHy5aaS8W7bh8G42uLbq206 J2Lo/6wqZuzkrPpZk6PtXrZewE9UA/NhvyUel8cDMevyGpoU5E5RBZyuEZyw9nKLKi2u gzSA== X-Gm-Message-State: AOAM532Y9bqZleKE5cUkHlAPOnUjVcTcfFASlpjHxp29Vp1rlifTCqLx AuvxfPp0kmBDnp6d+IwFU4J9fg== X-Google-Smtp-Source: ABdhPJyHd1wTsu7wRfCeJsIEzB9nwCAPbK1IY9n6MgI/v/Hfu+Cc/TdqcmzfnbTO7w6ZCweZe+YNuA== X-Received: by 2002:a7b:c5d2:: with SMTP id n18mr1298361wmk.97.1625584030310; Tue, 06 Jul 2021 08:07:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 19/39] tests/docker: expand centos8 package list Date: Tue, 6 Jul 2021 15:57:57 +0100 Message-Id: <20210706145817.24109-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584852451100001 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20210623142245.307776-12-berrange@redhat.com> Reviewed-by: Alex Benn=C3=A9e [AJB: added centos-release-advanced-virtualization/epel-release] Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/centos8.docker | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 5f1c57b4ad..46398c61ee 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -3,39 +3,109 @@ FROM docker.io/centos:8 RUN dnf -y update ENV PACKAGES \ SDL2-devel \ + alsa-lib-devel \ + bc \ + 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 \ gcc \ gcc-c++ \ genisoimage \ gettext \ git \ glib2-devel \ + glibc-langpack-en \ + glibc-static \ + glusterfs-api-devel \ + gnutls-devel \ + gtk3-devel \ + hostname \ + jemalloc-devel \ libaio-devel \ + libasan \ + libattr-devel \ libbpf-devel \ + libcacard-devel \ + libcap-ng-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 \ + libslirp-devel \ + libssh-devel \ + libtasn1-devel \ + libubsan \ + libudev-devel \ + libusbx-devel \ + libxml2-devel \ + libzstd-devel \ + llvm \ lzo-devel \ make \ mesa-libgbm-devel \ + ncurses-devel \ nettle-devel \ ninja-build \ nmap-ncat \ + numactl-devel \ + openssh-clients \ + pam-devel \ + perl \ perl-Test-Harness \ pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ python3 \ + python3-PyYAML \ + python3-numpy \ + python3-pillow \ + python3-pip \ + python3-setuptools \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + python3-virtualenv \ + python3-wheel \ rdma-core-devel \ + rpm \ + sed \ + snappy-devel \ spice-protocol \ spice-server-devel \ + systemd-devel \ systemtap-sdt-devel \ tar \ + texinfo \ + usbredir-devel \ + util-linux \ + virglrenderer-devel \ + vte291-devel \ + which \ + xfsprogs-devel \ zlib-devel =20 RUN dnf install -y dnf-plugins-core && \ dnf config-manager --set-enabled powertools && \ + dnf install -y centos-release-advanced-virtualization && \ + dnf install -y epel-release && \ dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584583387922.059482090032; Tue, 6 Jul 2021 08:16:23 -0700 (PDT) Received: from localhost ([::1]:48190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0moA-0000Lj-Ea for importer@patchew.org; Tue, 06 Jul 2021 11:16:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfE-0005Iw-RL for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:46965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfC-00077n-J8 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: by mail-wm1-x32d.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so2481668wms.5 for ; Tue, 06 Jul 2021 08:07:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r9sm11662485wmq.25.2021.07.06.08.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 19CFF1FF87; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=MRrSwHtaqQbHLJ5hNSBszU3KUyVW8WG4vlq2J9qkMgnc00BFkbafCg4vDAqBeG+2LR DRDZco5ff34zRDr67dVN9f2P/tcNwKw8AfNDrwGnmMyVLabFod4tCNt6KtoS5yWcsCUL ZAKRZtu91+yr84Fvgk3Fl1YeR2uesaysOeZObGQneTg5qhvp6Igjgxh6R3oYgFEVm0VZ RlbjaG3y6g3y0qDoq9SCRBWFAC5Eow+cmVqK/Qppx2b0AB3bprZ47C3t9hGZDIG0G/v8 duGT+b51WylIkhxXNtu/sYTb9CKhLNt2lDvcVTaVO/DYN14HQVyQ0p0BghM13GfD4U+U cOdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=C3xILZ2Z1xpD7X05XWzeN+q4vu/1g7q4Ee3Tjfr4CqBBdXQKxtEz9b+nRgdxYRXEW3 +cBHQdJc94334MdrNqFNo11UmDceDT1Tm49Q657j4cJkPqzwcFi8QKnoc3LceE3nrCwP O8dw+3hjKCecqLr8jrVEZfnHBSUl2N+f11lvKMCbV79ZTscdy7L2CVSjyHhPMzRM0hI3 fFE2nO0kzNgZJQ9IOcD/yX2QVInnNt+HLCEV9tZr0a97Obpkca2a/g0Cri9/y2UzGG+I bUnIPX9yhG1KK7tw5vwYdZetYGCbi4p37/Nzo8UT0ZzZ1EvR8hv18ksJiAJvMSLg/v3l onWQ== X-Gm-Message-State: AOAM532SMUA6MayCBA4lGMtG7gHNuSAF/tvKd2ldfzYdQvkOifvCOWXv /fMjwcvN6UFaHj2uXGKUbKcZDg== X-Google-Smtp-Source: ABdhPJyfaJUdHglH2bGCNDp+th0q30QQ83d5Dxyn5Ii0cEStwUYH4jQxJHpp1GIU+E//hMJIiMgRoA== X-Received: by 2002:a7b:c214:: with SMTP id x20mr20636505wmi.171.1625584025168; Tue, 06 Jul 2021 08:07:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 20/39] tests/docker: expand fedora package list Date: Tue, 6 Jul 2021 15:57:58 +0100 Message-Id: <20210706145817.24109-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584584617100001 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-13-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/fedora.docker | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 5849ea7617..eec1add7f6 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -3,63 +3,83 @@ FROM registry.fedoraproject.org/fedora:33 # Please keep this list sorted alphabetically ENV PACKAGES \ SDL2-devel \ + SDL2_image-devel \ + alsa-lib-devel \ bc \ 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 \ gcc \ gcc-c++ \ + gcovr \ genisoimage \ gettext \ git \ glib2-devel \ + glibc-langpack-en \ + glibc-static \ glusterfs-api-devel \ gnutls-devel \ gtk3-devel \ hostname \ + jemalloc-devel \ libaio-devel \ libasan \ libattr-devel \ + libbpf-devel \ libcacard-devel \ libcap-ng-devel \ libcurl-devel \ + libdrm-devel \ libepoxy-devel \ libfdt-devel \ - libbpf-devel \ libffi-devel \ + libgcrypt-devel \ libiscsi-devel \ libjpeg-devel \ + libnfs-devel \ libpmem-devel \ libpng-devel \ librbd-devel \ libseccomp-devel \ libslirp-devel \ libssh-devel \ + libtasn1-devel \ libubsan \ libudev-devel \ + liburing-devel \ libusbx-devel \ libxml2-devel \ libzstd-devel \ llvm \ + lttng-ust-devel \ lzo-devel \ make \ + mesa-libgbm-devel \ meson \ ncurses-devel \ nettle-devel \ ninja-build \ nmap-ncat \ numactl-devel \ - perl \ + openssh-clients \ + pam-devel \ perl-Test-Harness \ + perl-base \ pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ python3 \ python3-PyYAML \ python3-numpy \ @@ -70,19 +90,25 @@ ENV PACKAGES \ python3-sphinx_rtd_theme \ python3-virtualenv \ 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 ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3 =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585447684600.3160356380623; Tue, 6 Jul 2021 08:30:47 -0700 (PDT) Received: from localhost ([::1]:37730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n26-0005UD-F8 for importer@patchew.org; Tue, 06 Jul 2021 11:30:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0005N1-II for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:37796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfE-00079p-H7 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: by mail-wm1-x334.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009533wmh.2 for ; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d3sm8861862wrx.77.2021.07.06.08.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31DF51FFA9; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=ZrshiQV5Fw96d/n7aPY9mlByj+APGo4TkHHi2e1Su74zTwNykq29sqC5EfaqDlFsdp 7OZ53zSHBJwZ6vsv4v4ddDc4HlmFZSjHrOa9ZkhTwkj0YyNYGPts8Jz5ZuQu9Pis/W+3 UfScjVfne/f2wqrZpF6I8sFpXM7eJN0qsTi07Ke8J7hNKb5RvZ9xInn1kP5XUjJ8j96j 5L0xWS0PooT7vuDgLEDPvDAAFpxeOg6RmSKOd36gGcGURmXPBdUrTOTlJO2hLhjgBNPB bgEz2XSJIDZZzdmKancuW9MF7YbJuIR8JuLxYM/PAOVH+F5NcgidsNqhfhc2YGbXwM3B JHeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=bYe/NgbJpISMaJgC7ZlQkAQaHUyVhTFQJS6HdaNo5QLD5sPP2a129USGdSTLrnghcU 2ZTVnIfMjt49ZiEOe89lw5zUD7MI6WMS3my6wKqAl4iZi9OL2CunpWsMT7opwgcPWl06 oDL3sOQ2K7+Y7H4ZdnVI7U/jiVaciCjKi05w7UiWjOfD/r9O8cxo8/WkPTwfLxz+6Nfx k3sOHgBeQa/1/H4MInItI/U+3d1Zw6+V1R+DKto86DhtslFqR8Kdd8YLVSUMin5HLQVC RrrIr/U0kdh4A06Tz7tS7EqtrK3nNe1tWzEnhnkputAEBLZ9L9RosoKxavamxKwi2c3k YsFw== X-Gm-Message-State: AOAM533taEU2gI8/JgAyMGHnUYUHicaKkSEigng64xAYUIOGY4gYXTpw bbLA82HqcCfSDHpeet+5IDdBug== X-Google-Smtp-Source: ABdhPJwX5hvTkaFYtBsfop8eTUoIF16o0CHZlYitlIa7lWYpDmK5hyhz04zwCmTOnVcJgwTzyUWubA== X-Received: by 2002:a7b:cd06:: with SMTP id f6mr1372689wmj.64.1625584027047; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 21/39] tests/docker: expand ubuntu1804 package list Date: Tue, 6 Jul 2021 15:57:59 +0100 Message-Id: <20210706145817.24109-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585457038100001 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-14-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu1804.docker | 61 +++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index ee8545e4b1..0880bf3e29 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,54 +1,113 @@ FROM docker.io/library/ubuntu:18.04 ENV PACKAGES \ + bc \ + bsdmainutils \ + bzip2 \ + ca-certificates \ ccache \ clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + g++ \ gcc \ + gcovr \ + genisoimage \ gettext \ git \ + glusterfs-common \ + hostname \ libaio-dev \ + libasan5 \ + libasound2-dev \ libattr1-dev \ libbrlapi-dev \ libbz2-dev \ + libc6-dev \ libcacard-dev \ libcap-ng-dev \ + libcapstone-dev \ libcurl4-gnutls-dev \ + libdaxctl-dev \ libdrm-dev \ libepoxy-dev \ libfdt-dev \ libffi-dev \ libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libgnutls28-dev \ libgtk-3-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ libjpeg-turbo8-dev \ + liblttng-ust-dev \ liblzo2-dev \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ + libpam0g-dev \ libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ libsdl2-dev \ + libsdl2-image-dev \ libseccomp-dev \ libsnappy-dev \ libspice-protocol-dev \ libspice-server-dev \ libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libtest-harness-perl \ + libubsan1 \ + libudev-dev \ libusb-1.0-0-dev \ libusbredirhost-dev \ libvdeplug-dev \ + libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ + libxml2-dev \ libzstd-dev \ + llvm \ + locales \ make \ + multipath-tools \ + netcat-openbsd \ + 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 \ - xfslibs-dev + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584984286326.19146120401115; Tue, 6 Jul 2021 08:23:04 -0700 (PDT) Received: from localhost ([::1]:38960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0muc-0004eO-UI for importer@patchew.org; Tue, 06 Jul 2021 11:23:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfL-0005Tj-EW for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:17 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:45611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfJ-0007Dp-DZ for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:15 -0400 Received: by mail-wm1-x32e.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso2482498wmj.4 for ; Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm11546440wrx.40.2021.07.06.08.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ACD51FFAA; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7OPU4as02HZtXljAleSB6EF+rLr9JRR7CPBqu3EwDbk=; b=ohPrejXjLeV55gw1mRp0b29hETRRbm5+G4BLd81qlFVWwSx7r6Mdmseo1J5SAaa2Kz ZCCY+YAUuic2gy0RXnVVzWGOhQl+P12gSKhXCw/LaYN2NGni94oelWbJ7qLQkht+Fvet 7pyejERx4ijkoXZmTu4hEssQTdHeh9+Q1pAwBlGqR+s48pkdkaFC6hosGIoaH8rnqdkK W7YZnZ/KOdXwBxDSOC5Ub1ARaNgC3AqaMGJs+KBQDkU+uBE1ISkKY6OLKsKUIDGZf3gX JiBypZvdgfvrCf6i8DVUeydd5H2kp3D09pBqr26GXtaOSZB5yPQGqrsyRBQwe5wXdGo1 DDwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7OPU4as02HZtXljAleSB6EF+rLr9JRR7CPBqu3EwDbk=; b=uXih66psGSeGDsB4ncJaSOICQOjbyj8Mdieduef9LTFgLPk6yU6I04BK9qKSbm9faO SEVV7c7+lnv2GdVa7xN86hopVLH5YR44V1VW/7vNE1WNdyxNTUsF+YQNrpHZ5JcmqhIW +Hz3UBzh4YHmbrXoWIsSguwTa015OGVENvZXZ9U0cZm7+H0dT/aCKUYhHm8QUdWYhEQs XzoNkkI8/swARbA+HbbxqI46GJBBwOGyT4QNIeFYRmUbpmIx5jEfvuC8vM44U3D+j4u4 eHrDRqg9Ox5OGWdTmh3TwSGMq9QE1AhfY1YERyMMtGS+VFdevMIVPDQVxXveE9KpHknL DSLw== X-Gm-Message-State: AOAM53199reAM9c2yzSSqpM1V8I7wWsTXuf8J9MUa0geRGGrbn7a/kpE XmVQyAaPlOjxmALZklQQmF7Iyw== X-Google-Smtp-Source: ABdhPJxXgKL1k4tMXii4UWGITwMqjJLAVxKIuR1KgHtWF0OdmuYAF9FEsohHbrwTwrO6wo5D7TBqvQ== X-Received: by 2002:a05:600c:2251:: with SMTP id a17mr1071553wmm.153.1625584032064; Tue, 06 Jul 2021 08:07:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 22/39] tests/docker: expand ubuntu2004 package list Date: Tue, 6 Jul 2021 15:58:00 +0100 Message-Id: <20210706145817.24109-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584988073100001 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-15-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/ubuntu2004.docker | 50 +++++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 25f56adfb2..39de63d012 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,25 +1,44 @@ FROM docker.io/library/ubuntu:20.04 ENV PACKAGES \ + bc \ bsdmainutils \ + bzip2 \ + ca-certificates \ ccache \ clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + 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 \ libcurl4-gnutls-dev \ + libdaxctl-dev \ libdrm-dev \ libepoxy-dev \ libfdt-dev \ libffi-dev \ libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ libgtk-3-dev \ libibverbs-dev \ libiscsi-dev \ @@ -30,39 +49,66 @@ ENV PACKAGES \ libncursesw5-dev \ libnfs-dev \ libnuma-dev \ + libpam0g-dev \ libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ librbd-dev \ librdmacm-dev \ libsasl2-dev \ libsdl2-dev \ + libsdl2-image-dev \ libseccomp-dev \ libslirp-dev \ libsnappy-dev \ libspice-protocol-dev \ libspice-server-dev \ libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libtest-harness-perl \ + libubsan1 \ + libudev-dev \ libusb-1.0-0-dev \ libusbredirhost-dev \ libvdeplug-dev \ + libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ + libxml2-dev \ libzstd-dev \ + llvm \ + locales \ make \ + multipath-tools \ ncat \ + nettle-dev \ ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ python3-numpy \ python3-opencv \ - python3-pil \ + 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 \ - xfslibs-dev + texinfo \ + xfslibs-dev \ + zlib1g-dev RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584505696797.8933155282347; Tue, 6 Jul 2021 08:15:05 -0700 (PDT) Received: from localhost ([::1]:44990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mmu-0006ar-JO for importer@patchew.org; Tue, 06 Jul 2021 11:15:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf9-0005AG-O4 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:03 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf7-00074d-MK for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:03 -0400 Received: by mail-wm1-x32a.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5373174wmq.1 for ; Tue, 06 Jul 2021 08:07:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m18sm15728514wmq.45.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 60A271FFAB; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=IQplr5yF907z8zyHJDfrO1Ew4B4d/05xIyq4rbpCxS+r3+m/wlvyHKIIZ0pAxj/bGD TDo+KlqUsrQUeGa5w5WrOpB41tFx/2vh35FmnfRoOQ4NWMWFhutRgO05Eu4x26w+Ki03 oDkr1yiUd0C12D0ZAUou3ZtrA4nkjuGfe3DL7CqzCAlpFE7q/UNvAkg04uONgH1RbuTx 37OgccFJ67V3eOMsgbcvbVGk03nGVLJ0sMsukX90iqzFyUlcCOt0CUBpN/kPbBGUZvkZ 70vm0seW7y0t2iGrX6bIiyaF6PAdc95C1KfzD6iWURLX460V88CY+AbJNiqgwLi+C1QN g35A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=c59j362HxV4thmjUo0Vin9IV5RE9OUblH3IqVCwcg6zvy5k4xtgzliZ+lHF09FvkN9 ve8mCYr15eNTmJxhEzqwluGnKG9w0kfQK6ByGgoQ958QYns7daTgyaEeYgbS3bkq3JYW 1DwVlIVxTDMgJardFHyMwpGpgYsCoo5vKDAtamSNSqHvpEoKXTeMZyAY4ZRwmbuZPBqa 2V2NM8MjbCt9CoKghbRKncmz+chS4SrzudzKQixcrK1l3BpdplehOr+wPQp0U+P4Wy+0 T2puK7Y4tYVm5zjvlOANqqP/CFsvFVPYty+WpMCMjnSrykZpQIQLIhLra69XiWjMK4lf z85Q== X-Gm-Message-State: AOAM530VXS4bkbLqkYfEYTPS3zkfl2S9qFCeBbosF4Tx6y50r09SQaIL cxZZUPm5jWL5PO54p5hsN8kxDsQh2sK5sA== X-Google-Smtp-Source: ABdhPJzeJoe2IUcOkaBsttQieQu6OBAvyBWqcOxtwRrBxtWPvC1Wxd47tYdicCNwDqA6gps5kDBYhQ== X-Received: by 2002:a1c:f613:: with SMTP id w19mr20948447wmc.141.1625584019895; Tue, 06 Jul 2021 08:06:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 23/39] tests/docker: expand opensuse-leap package list Date: Tue, 6 Jul 2021 15:58:01 +0100 Message-Id: <20210706145817.24109-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584507893100003 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-16-berrange@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- tests/docker/dockerfiles/opensuse-leap.docker | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 6011447181..5a8bee0289 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -2,53 +2,110 @@ FROM registry.opensuse.org/opensuse/leap:15.2 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ + Mesa-devel \ + alsa-lib-devel \ bc \ brlapi-devel \ bzip2 \ + ca-certificates \ ccache \ + clang \ + ctags \ cyrus-sasl-devel \ + dbus-1 \ + diffutils \ + findutils \ gcc \ gcc-c++ \ + gcovr \ gettext-runtime \ git \ glib2-devel \ + glibc-locale \ + glibc-static \ glusterfs-devel \ gtk3-devel \ + hostname \ + jemalloc-devel \ libSDL2-devel \ libSDL2_image-devel \ libaio-devel \ + libasan6 \ libattr-devel \ + libbpf-devel \ + libbz2-devel \ + libcacard-devel \ libcap-ng-devel \ + libcurl-devel \ + libdrm-devel \ libepoxy-devel \ libfdt-devel \ + libffi-devel \ + libgcrypt-devel \ libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ + libndctl-devel \ + libnettle-devel \ + libnfs-devel \ libnuma-devel \ libpixman-1-0-devel \ libpmem-devel \ libpng16-devel \ + libpulse-devel \ librbd-devel \ libseccomp-devel \ libspice-server-devel \ libssh-devel \ + libtasn1-devel \ + libubsan1 \ + libudev-devel \ + libusb-1_0-devel \ + libxml2-devel \ + libzstd-devel \ + llvm \ + lttng-ust-devel \ lzo-devel \ make \ mkisofs \ + ncat \ ncurses-devel \ ninja \ - perl \ + openssh \ + pam-devel \ + perl-Test-Harness \ + perl-base \ + pkgconfig \ + python3-Pillow \ + python3-PyYAML \ + python3-Sphinx \ python3-base \ + python3-numpy \ + python3-opencv \ + python3-pip \ + python3-setuptools \ + python3-sphinx_rtd_theme \ python3-virtualenv \ + python3-wheel \ rdma-core-devel \ + rpm \ + sed \ snappy-devel \ + sparse \ + spice-protocol-devel \ systemd-devel \ systemtap-sdt-devel \ tar \ + tesseract-ocr \ + tesseract-ocr-traineddata-english \ + texinfo \ usbredir-devel \ + util-linux \ virglrenderer-devel \ vte-devel \ + which \ xen-devel \ + xfsprogs-devel \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3.6 =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585756619618.0143296539726; Tue, 6 Jul 2021 08:35:56 -0700 (PDT) Received: from localhost ([::1]:54604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n75-00009C-He for importer@patchew.org; Tue, 06 Jul 2021 11:35:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moo-0002Mb-S9 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:03 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mom-0004qO-0M for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:02 -0400 Received: by mail-wm1-x32a.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so2019291wmb.3 for ; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r16sm20301818wrx.63.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 759DE1FFAC; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=gARORN8AFiQ86ohPNMOAfzjb3+YsOohcxtV7DiiLwrSV9fwK983DoztMHlsXbg3+dW n4KItquriE+W7j8WfzYkfQV3Hy5srpZdD1jNksTsoE2laiq+ndKU0mScdevwXCYWyUrl JkwBWe0fj7IIWE3IAQX+P6bj3E0fAPGDz3ze7l1ET5YduPa/mmzzi9N1V1/P7b4/D1cP QHavbaqJ8NfdbTmWf+l6MLIgMiPBsfgJhAZQHi6nhfR8Iyp0/QFg2fHjIWYZmWUHwp9M Nn8Bwen6rD4vMKWNw8rTFBv/UalQGIxrbdTdFOx3taVVdD6Yw8VOIlYBaSBqhcRppBpV HT5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=Cfk7G+zNJeisM6G573XMbD/DlLN3FDfti0JSWnGkst+sgrbWFSX/LQf/Th+2klldt2 wsb4Wj/8GcIAleYBoWjYw3u8QBgUjE59dlLdsk9RbaOBih/9UpwUZmOMu6JtJ7r0OOKr fCGJmrAKbAWmGpfblYzmxRtJ2Md1LHTANlQYsE0pWtc+TbEpBG/bf7s5eK+pEYVRsJdi c7EqKEdA/Fy+A6IMEvNJ56BnGg3HMF4nJSSJKlTM3Q+xm6aijpMoxdw8JitJFQ8qltw8 /w5pNkb0alHdCsdWxQZpUazALj5KQTEL0H+YdiRdQOi68bMlGAvcKzvSR6lb3OU1Crt6 bGPg== X-Gm-Message-State: AOAM533Tz4QxrVyGtqvYRZIQ0ef2/cHuhYhFyxliOckmdx4rtLWX8WOE b7cQ9CQPoEEfyLLZ7L/LUoJjfg== X-Google-Smtp-Source: ABdhPJwNnLVKNOpSl//CkILbLpUwO2yOp2q50EHiK2eQLEbTJ5TrB2iVCB5YdhT+Vq3GHKJEhqOvSg== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr21156737wmh.104.1625584617557; Tue, 06 Jul 2021 08:16:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 24/39] tests/vm: update NetBSD to 9.2 Date: Tue, 6 Jul 2021 15:58:02 +0100 Message-Id: <20210706145817.24109-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Kamil Rytarowski , Reinoud Zandijk , Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Ryo ONODERA , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585761094100001 From: Brad Smith tests/vm: update NetBSD to 9.2 Signed-off-by: Brad Smith Message-Id: Tested-by: Gerd Hoffmann Reviewed-by: Wainer dos Santos Moschetta Acked-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e --- tests/vm/netbsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index b9efc269d2..4cc58df130 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -22,8 +22,8 @@ class NetBSDVM(basevm.BaseVM): name =3D "netbsd" arch =3D "x86_64" =20 - link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.1/images/NetBSD-9= .1-amd64.iso" - csum =3D "65bddc95945991c3b2021f9c8ded7f34c25f0a7611b7aa15a15fe23399e9= 02307e926ae97fcd01dc1662ac67b5f6e4be643c6a2b581692ddcb616d30125066f9" + link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/images/NetBSD-9= .2-amd64.iso" + csum =3D "5ee0ea101f73386b9b424f5d1041e371db3c42fdd6f4e4518dc79c4a08f3= 1d43091ebe93425c9f0dcaaed2b51131836fe6774f33f89030b58d64709b35fda72f" size =3D "20G" pkgs =3D [ # tools --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585164183122.46671269812941; Tue, 6 Jul 2021 08:26:04 -0700 (PDT) Received: from localhost ([::1]:51816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mxT-0004e7-84 for importer@patchew.org; Tue, 06 Jul 2021 11:25:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moz-0002Q4-OK for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:45662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mor-0004u0-I2 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:13 -0400 Received: by mail-wm1-x330.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso2505814wmj.4 for ; Tue, 06 Jul 2021 08:17:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l7sm16412461wry.0.2021.07.06.08.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8D9521FFAE; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DPKLxk04De7Sb5Hr8SfgY3P9LZx+smJYFH9/zYZ+ZF0=; b=Lqbh9cyB4tKdGWFGvfgio/p++gXxhtFWWILhc8OpdFWEOS+sPDJCFJVRIgcVUsJYLq hftQgdGAIx4knV4rfYVhzyPcbWxJotxS7BqNpYAUB+acLMIQePh1uxhyHByrk3MiVN2D 1UJN+780whMtwbtMXZ+FJmicmc3jIrQBvTH3E1bu3cZBVjnw6OuPo0cnR6EBmhdI+1b1 CUrAsK/7bVRz0j1+3YsLRGgPJmCuoA9xmuiUg3NbCQw0T+VtbJmDfBDnsLKSk3n6QsIY ruJgntVJ48lvFp436SjkqN+4whB08w5/sNFjgJE9jt4LYBhvUUq/qF5qEICik1wJOGOO uOdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DPKLxk04De7Sb5Hr8SfgY3P9LZx+smJYFH9/zYZ+ZF0=; b=LqNn1A+u6kMLyXoG2223EIsItGh0s4IOVkxsnsE0WX3swrpWmBn4OByjFvFWxzTzqG tkE8zjkYVYLNFllmbhuevtzGGqivfOQuNYBzLJzbeUxyQrcOSgHu7Jqqj8wuGkmfXC3i hDTXqa7RY0vLl8k6yvemKdCP90iw3lp2xCEmLNwyMIrrt6TTQXOuK1V5LpCpwKk0ShKz HG4e5VYYPXpWzBXUPHu1mjo7iLSI8HOX+cScP3hDPUKCVcAYtlwjNgOJ+jlhiaZE4FA7 5kWjbTfg8EQrnlLnrLcoGosZjTi2Ye58+ORAteoZtQ9TDl2aesf/b9wSAWXs1Sa5btHe Mnuw== X-Gm-Message-State: AOAM532PJ60jxRkn5I8pUdHZ5ivRXWSU8k+v7uV5VwuNdx+5WxYmfEs/ T0JuCKrYHz/OBpgyOcBdxxYtmg== X-Google-Smtp-Source: ABdhPJzH5tBUgjVHuiofaTwjHGJB4vX8VMOuQlXn0g8QoMeiLgXdPCqdjhaKZw/NiWxETimItgW1Hg== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr1397435wmb.27.1625584624221; Tue, 06 Jul 2021 08:17:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 25/39] tests/vm: update openbsd to release 6.9 Date: Tue, 6 Jul 2021 15:58:03 +0100 Message-Id: <20210706145817.24109-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585169162100001 From: Brad Smith tests/vm: update openbsd to release 6.9 Signed-off-by: Brad Smith Tested-by: Gerd Hoffmann Acked-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Alex Benn=C3=A9e --- tests/vm/openbsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 4d1399378e..c4c78a80f1 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM): name =3D "openbsd" arch =3D "x86_64" =20 - link =3D "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso" - csum =3D "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f6= 2b6c" + link =3D "https://cdn.openbsd.org/pub/OpenBSD/6.9/amd64/install69.iso" + csum =3D "140d26548aec680e34bb5f82295414228e7f61e4f5e7951af066014fda2d= 6e43" size =3D "20G" pkgs =3D [ # tools --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162558554646267.24028879373577; Tue, 6 Jul 2021 08:32:26 -0700 (PDT) Received: from localhost ([::1]:44444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n3h-0001h0-61 for importer@patchew.org; Tue, 06 Jul 2021 11:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfI-0005Nn-2H for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfF-0007A0-HR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: by mail-wr1-x430.google.com with SMTP id d2so2833216wrn.0 for ; Tue, 06 Jul 2021 08:07:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm1539983wru.6.2021.07.06.08.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A30A61FFAF; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=MfgABMvmaqVxUuAF5tu39k+ZssGDi6H6fx9AaroqhAVkUkJM8lPHiAsGxEIFE4X3hZ df9XOCFqPs0OHnJQ9mWTMEAXT86Yv1I+Z9/pLlbdELNbQFcwBORF2/C4fnyB1e1xteWw SSc8GARJ3L6E0+XxmCFyhX6eg4dJ5ttaSi7OyNDv9Ue124gHUgAoL9cJU3ZhTx1lyD9+ 1/x0QlQNwuFbZOoVqmN6P1Gqu4E4h3R2ctKulnWtgzkEkFSrJGft49VP1+rt/XqjmmcO 0ZM27RVNNCHeUEh+EoAl3+N6BG3ArTGwtrV5WnSjxH1A9G79OhP2c1BrYqB4mZRhUkxh dckw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=CkZEPZupzSa+xrNohpd6SU/5SENxvY/8CG3r+GAJKi9lBN+ybG92A6o53MJETluiLo gvaPQCiYQWQX0cASsbaadcoHm1QRuGchA2/MZ01C8c9F8qh+vufqAbxsLUpZU7ebRRla oUrzVNx4LCvV9/oL4BUe6q24f0YBAKGYJilxAoWTkhN+XwWwCEhhZphCTKDyu3NMR+eT ENw4nKkfMezvkgmrfdL8Y6ogEhRwtGAGNdwqkc8Y24knu0z+sihNPXg0c2jdeb76AKqy joLjRku1JQjXAqxZFEX5eqRTuNQWf9jKIipN4EMwLoN1brugsOutlCJ62ubVH2TJbLMo 06tg== X-Gm-Message-State: AOAM533INq+/2wUKKHpILdj0bRGKR6JrJpxmpoK6hHLJF65vjPhR/jR6 mUw4ZOCExw/YSmC+quKQnGIQ0o5DI/j3FA== X-Google-Smtp-Source: ABdhPJz4A5i9aXSAhBwPOLiRW1eFZCIppSPHJjV4kB8E0qvi/ArbNwF+yNng1E1kQADYF8HG+OxG1g== X-Received: by 2002:adf:f710:: with SMTP id r16mr20807316wrp.124.1625584027743; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 26/39] tests/tcg: make test-mmap a little less aggressive Date: Tue, 6 Jul 2021 15:58:04 +0100 Message-Id: <20210706145817.24109-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585553870100001 The check_aligned_anonymous_unfixed_mmaps and check_aligned_anonymous_unfixed_colliding_mmaps do a lot of mmap's and copying of data. This is especially unfriendly to targets like hexagon which have quite large pages and need to do sanity checks on each memory access. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/multiarch/test-mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index 11d0e777b1..b77deee37e 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -58,12 +58,12 @@ void check_aligned_anonymous_unfixed_mmaps(void) int i; =20 fprintf(stdout, "%s", __func__); - for (i =3D 0; i < 0x1fff; i++) + for (i =3D 0; i < 0x1ff; i++) { size_t len; =20 len =3D pagesize + (pagesize * i & 7); - p1 =3D mmap(NULL, len, PROT_READ,=20 + p1 =3D mmap(NULL, len, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); p2 =3D mmap(NULL, len, PROT_READ,=20 MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); @@ -142,7 +142,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(vo= id) int i; =20 fprintf(stdout, "%s", __func__); - for (i =3D 0; i < 0x2fff; i++) + for (i =3D 0; i < 0x2ff; i++) { int nlen; p1 =3D mmap(NULL, pagesize, PROT_READ,=20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585353310674.5674211103152; Tue, 6 Jul 2021 08:29:13 -0700 (PDT) Received: from localhost ([::1]:34288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n0a-0003GT-7i for importer@patchew.org; Tue, 06 Jul 2021 11:29:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfU-0005kJ-Kg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:24 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfO-0007GU-HS for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:24 -0400 Received: by mail-wm1-x329.google.com with SMTP id w13so13807617wmc.3 for ; Tue, 06 Jul 2021 08:07:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm16160991wmq.3.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BD5A01FFB1; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2VymeSF+HdKxVWyy9+ZA+5+qTRIVWKC1/sXMZ3ShAgc=; b=inVrLCvZ3um+Z2JhemhX7Y8shk+Q07CoD/IXnPguGjLTHHS1+UktHhmrfEZv0Ai1f/ 6twbYCFI3tes/EdKfUTfl1TKHfv+8i51tcZA/eUh7NG0jrg6EC5dpGILTdpNtapG2nRV p5/lvk8FghHdeP2HSAQ7EI9WhHAqsbkhqO5ItQp9dv4rSYtalxA+nB9SA18UzWQJHSKu PDizFgag5szAbPrdpooEpY9FfE5Hj1XSxVYn7gvZ8WN+coVdsWgPd+Qxj5vJzJb1hEVP RM+bJrcFkkpdIcmWE2SO/j87ZxenEyURwVCp/EblbtWA2koDJSoCPKltoZiG2qE5hmQ8 czyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2VymeSF+HdKxVWyy9+ZA+5+qTRIVWKC1/sXMZ3ShAgc=; b=gO9ltncqLK6+nWueUDpuq9W9nGrxRiEjI5Kd1GCKaDCzuFowqLdY14Pp4e6UdP7U8U 5EVFZG3f3qG9kZumYUuALRTSGgKo1Ei/CzL/EUjY3SSY3cb2wT9EIIZ+GqHOAD0mWV8o aD2qaQS+Zis1u6BwWWOb7OUzjdZtCVD54n5GWGw9alODoR0ISgWJ9CGPg66aBJ8O37Bj 6eVTJr85kNGBwGm/+HqI5nHQXVG320il60bYUcie3uvaWjCU8FSPQy51i76S5kQOZLef nYsTLkhGaolPmFn73/fkWqXI3hFZE1h36UZQRj8RIULk7I+juxuNIQW7oAl1kCGsm3DK Kc6Q== X-Gm-Message-State: AOAM532HHzp3oRR+fgHlLzmV2qHPC/tCwa6AGroJNiKWmK2+V+57X5Ug g4yeD0aj4ysiCwiDGgwGXMLDFQ== X-Google-Smtp-Source: ABdhPJySLtRg7qlQbYIk2Wpq9BQ0b8QDS+KSKXS9nsvyUVx/Hjzn2PxA5b+ZoPE7zdP0YYy1BWEvEg== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr1276378wmq.181.1625584036751; Tue, 06 Jul 2021 08:07:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Date: Tue, 6 Jul 2021 15:58:05 +0100 Message-Id: <20210706145817.24109-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585357317100001 The compiler rightly complains when we build on 32 bit that casting uint64_t into a void is a bad idea. We are really dealing with a host pointer at this point so treat it as such. This does involve a uintptr_t cast of the result of the TLB addend as we know that has to point to the host memory. Signed-off-by: Alex Benn=C3=A9e --- include/qemu/plugin-memory.h | 2 +- accel/tcg/cputlb.c | 2 +- plugins/api.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h index b36def27d7..0f59226727 100644 --- a/include/qemu/plugin-memory.h +++ b/include/qemu/plugin-memory.h @@ -18,7 +18,7 @@ struct qemu_plugin_hwaddr { hwaddr offset; } io; struct { - uint64_t hostaddr; + void *hostaddr; } ram; } v; }; diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index b6d5fc6326..b4e15b6aad 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1728,7 +1728,7 @@ bool tlb_plugin_lookup(CPUState *cpu, target_ulong ad= dr, int mmu_idx, data->v.io.offset =3D (iotlbentry->addr & TARGET_PAGE_MASK) + = addr; } else { data->is_io =3D false; - data->v.ram.hostaddr =3D addr + tlbe->addend; + data->v.ram.hostaddr =3D (void *)((uintptr_t)addr + tlbe->adde= nd); } return true; } else { diff --git a/plugins/api.c b/plugins/api.c index 332e2c60e2..78b563c5c5 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -308,11 +308,11 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qe= mu_plugin_hwaddr *haddr) if (!haddr->is_io) { RAMBlock *block; ram_addr_t offset; - void *hostaddr =3D (void *) haddr->v.ram.hostaddr; + void *hostaddr =3D haddr->v.ram.hostaddr; =20 block =3D qemu_ram_block_from_host(hostaddr, false, &offset); if (!block) { - error_report("Bad ram pointer %"PRIx64"", haddr->v.ram.hos= taddr); + error_report("Bad host ram pointer %p", haddr->v.ram.hosta= ddr); abort(); } =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584893181315.18218289820334; Tue, 6 Jul 2021 08:21:33 -0700 (PDT) Received: from localhost ([::1]:35078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mtA-00024m-EI for importer@patchew.org; Tue, 06 Jul 2021 11:21:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfE-0005HR-03 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfC-00077j-0h for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id f17so1875580wrt.6 for ; Tue, 06 Jul 2021 08:07:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s7sm17518597wrp.97.2021.07.06.08.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D40931FFB3; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xE0TnieLHvCOXePCMLwmdgueEmPs2D/V6rLGpH6wEAg=; b=ya+TBbNbb8CqVpGPyP0rhz/m/cYtPoevzikVbePStoKnagVdAJNopA4ZICqTRfIpt3 xDep0Bx0kTpNVbZRlTuMdQANpG/iakrjtc+U0xZvJukf4LTh+lGmFTCnnanbc717i0KF twtJiqHHxyROlF8h+fl/FVRqZ9jj9W6FYxQ+PSdA9OD0mhBaVNLbyOWuWwkMIVHiLJCi Aj33W6XajAaNWSYWTPj58z0/piwHW4/cT/ZtGHiFkt0jAC2KtlwPKwy1RRBe+3yg/Q4G XfNu4NsEfMChPomCPwZB3tCcK5A+lJVI6v+tHhkxBwjDoAG9xh1Cut3arVWLIxXrsSFG 0FCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xE0TnieLHvCOXePCMLwmdgueEmPs2D/V6rLGpH6wEAg=; b=EWy2vID/FQHPQVSglKASeinQpWb1EZqOkMEknrlXFgjM+ZL4MMT00ED7BqSJy49xOe fqEtTJRs4l9QVsIe/b5EokWo7hnXwFeNvmLcAkN5uoLduygvaEAivFyV9g1JLWA4CU2t T3lmpEJv2LrkEsepoT8MS1LxD0AKQJ95i3H+tesz7kUmrzRzqxi72deDCo7hpy82TPqG pOWlbSykC2Gct4c00BDUs7JjQSITxHgw0eftAIat2WYYAfr1QjG22qCXlfpjyO43Qlr8 tpYvkdQHBjBQF3bgWXWsK1GFuP2x+XDIB7/gtKzw4ltlHaestNdoR2aSF3IbSS4Q4frC VT7w== X-Gm-Message-State: AOAM532gaYZzkHjIBFWgRLJuPAU+CLO3OEdCM/eieBSOT/gDReHDQGVe 5AqrtoLH6qMO6qZLB1yi09cgZQ== X-Google-Smtp-Source: ABdhPJzGXWdELpfuNNnU0rjnGFYLDtdTaEBrRcgl4ArUQ9qXqOExDzdQvfzFw4by01JT28sEhMkdGA== X-Received: by 2002:a5d:5043:: with SMTP id h3mr22431888wrt.333.1625584024623; Tue, 06 Jul 2021 08:07:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 28/39] meson.build: move TCG plugin summary output Date: Tue, 6 Jul 2021 15:58:06 +0100 Message-Id: <20210706145817.24109-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584894737100002 Let's put it with the rest of the TCG related output with the accelerator. Signed-off-by: Alex Benn=C3=A9e --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2748721d71..9b5d53b6d0 100644 --- a/meson.build +++ b/meson.build @@ -2737,7 +2737,6 @@ summary_info +=3D {'module support': config_host.h= as_key('CONFIG_MODULES')} if config_host.has_key('CONFIG_MODULES') summary_info +=3D {'alternative module path': config_host.has_key('CONFI= G_MODULE_UPGRADES')} endif -summary_info +=3D {'plugin support': config_host.has_key('CONFIG_PLUGIN= ')} summary_info +=3D {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} if have_system summary_info +=3D {'Audio drivers': config_host['CONFIG_AUDIO_DRIVER= S']} @@ -2853,6 +2852,7 @@ if config_all.has_key('CONFIG_TCG') else summary_info +=3D {'TCG backend': 'native (@0@)'.format(cpu)} endif + summary_info +=3D {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')} summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEBU= G_TCG')} endif summary_info +=3D {'target list': ' '.join(target_dirs)} --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585833004325.0434182612047; Tue, 6 Jul 2021 08:37:13 -0700 (PDT) Received: from localhost ([::1]:32988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n8K-0004Sm-1c for importer@patchew.org; Tue, 06 Jul 2021 11:37:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mox-0002Of-E4 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:13 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:52008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mon-0004qv-Nw for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:07 -0400 Received: by mail-wm1-x329.google.com with SMTP id n33so6339185wms.1 for ; Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm3431687wmq.1.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B161FFB4; Tue, 6 Jul 2021 15:58:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ENyXaMzzV2Ct/ffxbfGuryIh/2WlVNyrhj+GTD00beA=; b=KxJKHU/f7yEJwpqEW449SsFDo6m7RjtifVdsVK9VJao7cQqdlB/tDotiUqtYKrIQeR O2VORTWBkmeBh+RIEK7KupT06DSA4qDv2eu7ma4LizEbOIYFtZcAr2VEjOisfPQMkJWj 040KqwNB1gLs1p2oZ9gdGx+gNa6BM8GAn5ZJ+wjBh+zF86/z6iWAERMQde/BbgWUvrRh nR7VO3cYIs+YqPuKZybk0YZy/x+cpCvbcHDZJ6lX4R971twfrBZvH+lithkl61rtRT2B 9Pe2urmdDU1QWDJq968ob8Zk1L0z1EpY0YEk5TScwiJn84iq/pxtS9lCcd+YnHQT2FhS zriQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ENyXaMzzV2Ct/ffxbfGuryIh/2WlVNyrhj+GTD00beA=; b=ApcehMCe+qF1Q7jhg/Hl4UPBhS+wXzhSRxFalMxx7+Lgp9WH/gBfcVU6e/Bus5w0av ImMqat78B6nDy+GuDxqTE6rVbsIennVSvuzyN+aqnIRg31LeI6BbgqdaLjR5bovXwYTE jyN5owU19DMbEZ2dgyWiUPCMIcnwqnDjkafDiSV7o1usHFhT5OhU1RwMxgRFoCuncBUT ZcMvNCiOmLxFhiAdc7jSR3Jzp1AJUApNepmeMU4T78CSPKEMRWkdqEAACku1MYuUmYaK sgjowgk77Nr/HCmZKrCIWTvPLQ8xMNO/ICDrKtzGNZjmSpMGFJ0f4b7mp5Z/AwgpTWQp L2Ng== X-Gm-Message-State: AOAM531U/MjHlw6TdWxSlQJepb6ilooZCdD9fPe46Twan8xuY13vlAl6 vvG3ODyKvAxYwZguni2to1H6kg== X-Google-Smtp-Source: ABdhPJwl+AjrloMotHme5eJQ0EKlP58BzESkeIX3U2+S1ImHXLIE0TxqL/OPPoCuIUeXKkrZZmgIqw== X-Received: by 2002:a1c:38c7:: with SMTP id f190mr21476013wma.30.1625584619967; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build Date: Tue, 6 Jul 2021 15:58:07 +0100 Message-Id: <20210706145817.24109-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585838468100001 Signed-off-by: Alex Benn=C3=A9e --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 650d9c0735..44a487e090 100755 --- a/configure +++ b/configure @@ -1098,6 +1098,7 @@ for opt do --enable-cap-ng) cap_ng=3D"enabled" ;; --disable-tcg) tcg=3D"disabled" + plugins=3D"no" ;; --enable-tcg) tcg=3D"enabled" ;; @@ -1509,7 +1510,11 @@ for opt do ;; --disable-xkbcommon) xkbcommon=3D"disabled" ;; - --enable-plugins) plugins=3D"yes" + --enable-plugins) if test "$tcg" =3D "enabled"; then + plugins=3D"yes" + else + error_exit "Can't enable plugins on non-TCG builds" + fi ;; --disable-plugins) plugins=3D"no" ;; --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162558479434981.73444302688165; Tue, 6 Jul 2021 08:19:54 -0700 (PDT) Received: from localhost ([::1]:55614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mrY-0005MZ-HJ for importer@patchew.org; Tue, 06 Jul 2021 11:19:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfI-0005P7-MR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0007AS-0P for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: by mail-wr1-x435.google.com with SMTP id a8so14776817wrp.5 for ; Tue, 06 Jul 2021 08:07:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b11sm17255710wrf.43.2021.07.06.08.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A10E1FFB5; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8aMzBTIJfLBRFTgmCGKFYY8ArIkOG6uB9avvuOEJOSo=; b=rQ/YoxriyBreQNX3veqZwrn2xRkhc/VGvj9D60JLPeuVWhv209UF1zV1gm8LaTYq1V mz8D6kBGlscnIZ6bSMTOq7RoZsgn+Q/XVMx6jaRvCVuYrKESCd8jhLlqgaagNURZF55z 5ocA8X5obtNZTFcXfMK/5mKCo3+VbeHgNCOOoIN7/e9pKuG1ormKoGNcCuNhfH5vv7yo JKg0pvfdbPQbTKYc/cKlDwBSTjbKFK1Fe3JA4wTnepsfFOGQbdIni84sItx4BduhRb+g BgRZ7s9V939bjdj/DbKR3lRt/PsmkpT5sAMcCFZ18rP60U6qFFsRimdJknY+tLGaWmrA nDoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8aMzBTIJfLBRFTgmCGKFYY8ArIkOG6uB9avvuOEJOSo=; b=B+MsWc8qrRuTBDvYiaUs2pGKjTkM36Xnobex6GIWgpu6A66DaAx9aDdHNuUJZIzqsK lloyS9DZ4o+GRsHscFxfbWU4LlvvR21ariTpXHY2zMtTnecDhI6Mwa/jbYBuFYiaAZDO 9KoAJesqpNp4tYz6zslbj8fOVD76j/LfF6jgKR7ZxDnyNVE1O5S7X4iGze/O/sWlS+4/ RRENaHowf/t/exIi1aHhBw/2nx6zu4roAwzasFGMBJKRXbvjUw3PLkrJdiOAFEXjCj32 NnaIjMLPV4t8sMIlqHhjVzFPTqHka6aJXV2q4KRii649v8tNrrikhCAPiF3IbtRsaLKb yu5A== X-Gm-Message-State: AOAM533EwebVe2Mhiq379dm7luzVZFpprIPMl3ykEBJpne4GQXooMtP8 Tzolv9+FWCF8O/wDhve1wroCaQ== X-Google-Smtp-Source: ABdhPJxXOWZBRsEmLcNoEPsc//ioODYgE2VgoFWPUWxO4JxUpGAFoP8xiqnmf9TZmYoeUnhh3MtKmw== X-Received: by 2002:adf:f04a:: with SMTP id t10mr22059527wro.318.1625584029671; Tue, 06 Jul 2021 08:07:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now Date: Tue, 6 Jul 2021 15:58:08 +0100 Message-Id: <20210706145817.24109-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, Yonggang Luo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584796328100001 There are some patches on the list that enable plugins on Windows but they still need some changes to be ready: https://patchew.org/QEMU/20201013002806.1447-1-luoyonggang@gmail.com/ In the meantime lets stop the user from being able to configure the support so they don't get confused by the weird linker error messages later. Signed-off-by: Alex Benn=C3=A9e Cc: Yonggang Luo --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index 44a487e090..9d72b31a9f 100755 --- a/configure +++ b/configure @@ -707,6 +707,11 @@ MINGW32*) else audio_drv_list=3D"" fi + if "$plugins" =3D "yes"; then + error_exit "TCG plugins not currently supported on Windows platforms" + else + plugins=3D"no" + fi supported_os=3D"yes" pie=3D"no" ;; --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585318989791.6956269326887; Tue, 6 Jul 2021 08:28:38 -0700 (PDT) Received: from localhost ([::1]:60468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n01-0001vw-Te for importer@patchew.org; Tue, 06 Jul 2021 11:28:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moz-0002Q2-NM for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mor-0004t6-HG for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:11 -0400 Received: by mail-wm1-x32b.google.com with SMTP id w13so13831220wmc.3 for ; Tue, 06 Jul 2021 08:17:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm15802616wmf.9.2021.07.06.08.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 248791FFB7; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGLYNasVaMqPdnpUXMw96sJwNeDV9lGD9J/c+8i/lvM=; b=aYCs0D+oBBMj0j8/7G0G5qv68fZTdXSU6eS/pNh02BhGHQ/7ggCJzZUa6wX6uvim9S Rs65S2QVVheE34DlzFStrmVMC14D93asM/lurYris1tSjbDsY4BowzJAF++VVrzjd3ix AEU3+s6P3hxvXh2ojEhc6sfTevFHl0aRQvx0u5hdTW4a33RS0no8CCVlGbZylsW4F4ym 1CEaEI3fZ4z6uzuRsJDQd8wsE3JLCkFYSPV6KXhBHhRd+bEpitG2+1SXoJugUM5Q7hKD vZo+MA9z6AJNkX5ybCmqJu7Y5aItOnsDbcSN4bK2aPXknM39dlprhaf/ZJYSSr/H8Uc3 4e+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sGLYNasVaMqPdnpUXMw96sJwNeDV9lGD9J/c+8i/lvM=; b=BEUxGjM08OqHfLmuDKFqnUZTumpk0vgIb8RnaipYGt91xl/XDNBJJoRJwZiGeKEg3+ //4S2cs6GOwcIm2DoiSh9IaiWDCQ5pYAyw3mHc24r4XVSYJ8LVI83CUFSRQleOPv5Mxe 0wtjuvI0KJJMU6USe7gqSjnH/AGk5cqZ3qIz+k5GXFhu7OJHTxv5EOd+86lfFb+8WOw4 CF8YsAKiM1biQzPCIi0ixIhx42+gH1NgpSX/zOr3jq8K5sqH32wvbagNiwt0g1q2OkC1 ez+7yst4X1LE+bBcy0Ac1EGFcwpr7M3NLN5zXHk/3cW0O6Oi4vpuxryHUNnjPoracuF1 rueg== X-Gm-Message-State: AOAM533HyX2s5+JqHaTce12ynFUAWu9CRkmqE9FfDeCm60UuoqNotY4D yXchhoByx+vC09UamR44eyV3xg== X-Google-Smtp-Source: ABdhPJw7xrf4bcKbQ8i68o0qwW1PGNaEUFuc2KehVF8eS1PSP2hUABZBZ0RPLN1mzU30VOxglOmD4w== X-Received: by 2002:a7b:c206:: with SMTP id x6mr1456430wmi.114.1625584623319; Tue, 06 Jul 2021 08:17:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds Date: Tue, 6 Jul 2021 15:58:09 +0100 Message-Id: <20210706145817.24109-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585323492100001 Aside from a minor bloat to file size the ability to have TCG plugins has no real impact on performance unless a plugin is actively loaded. Even then the libempty.so plugin shows only a minor degradation in performance caused by the extra book keeping the TCG has to do to keep track of instructions. As it's a useful feature lets just enable it by default and reduce our testing matrix a little. Cc: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- v2 - properly handle plugins being "" - make the test for linker support handle default case - move linker tests to before the glib-modules test --- docs/devel/tcg-plugins.rst | 3 +- configure | 125 ++++++++++++++++++++----------------- .gitlab-ci.d/buildtest.yml | 23 ------- 3 files changed, 71 insertions(+), 80 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 18c6581d85..0cd77c77d2 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -71,7 +71,8 @@ API Usage =3D=3D=3D=3D=3D =20 -The QEMU binary needs to be compiled for plugin support:: +Any QEMU binary with TCG support has plugins enabled by default. +Earlier releases needed to be explicitly enabled with:: =20 configure --enable-plugins =20 diff --git a/configure b/configure index 9d72b31a9f..0ce6c1ff65 100755 --- a/configure +++ b/configure @@ -429,7 +429,7 @@ libxml2=3D"auto" debug_mutex=3D"no" libpmem=3D"auto" default_devices=3D"true" -plugins=3D"no" +plugins=3D"$default_feature" fuzzing=3D"no" rng_none=3D"no" secret_keyring=3D"$default_feature" @@ -3085,6 +3085,73 @@ for drv in $audio_drv_list; do esac done =20 +########################################## +# plugin linker support probe + +if test "$plugins" !=3D "no"; then + + ######################################### + # See if --dynamic-list is supported by the linker + + ld_dynamic_list=3D"no" + if test "$static" =3D "no" ; then + cat > $TMPTXT < $TMPC < +void foo(void); + +void foo(void) +{ + printf("foo\n"); +} + +int main(void) +{ + foo(); + return 0; +} +EOF + + if compile_prog "" "-Wl,--dynamic-list=3D$TMPTXT" ; then + ld_dynamic_list=3D"yes" + fi + fi + + ######################################### + # See if -exported_symbols_list is supported by the linker + + ld_exported_symbols_list=3D"no" + if test "$static" =3D "no" ; then + cat > $TMPTXT < $TMPTXT < $TMPC < -void foo(void); - -void foo(void) -{ - printf("foo\n"); -} - -int main(void) -{ - foo(); - return 0; -} -EOF - - if compile_prog "" "-Wl,--dynamic-list=3D$TMPTXT" ; then - ld_dynamic_list=3D"yes" - fi -fi - -######################################### -# See if -exported_symbols_list is supported by the linker - -ld_exported_symbols_list=3D"no" -if test "$static" =3D "no" ; then - cat > $TMPTXT < Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162558439315830.318073020473093; Tue, 6 Jul 2021 08:13:13 -0700 (PDT) Received: from localhost ([::1]:37314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0ml4-0001Xy-EQ for importer@patchew.org; Tue, 06 Jul 2021 11:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf7-000579-6q for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:01 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:36523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf5-00072h-6x for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:00 -0400 Received: by mail-wm1-x32b.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5372667wmq.1 for ; Tue, 06 Jul 2021 08:06:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h15sm16525030wrq.88.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3A8011FFB8; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R6IU1p4TeEKJjoh2orwJx/m6ECV4RVPwTG8bCIFZfuI=; b=sXKlS7QMjSJftIpdVRMAQM1orzJ5oKvcGPZFGNBrOmKMfvQRqe9QNT+00dmRx27kks j9jCd+OcwNbW3BaPRYDrThxiXBcjoyLBgo1iK9rUKz6ztNd8uIgsIoyWeF7k+1EM0zlj EEPr8G1For7VGTKNggDPXsOt5kPd4WsugoTMxZE9W1vYlgzhgjRcAh0UZM42P3eSvbw5 mohAH7pjhLZHflfeMeOlmaF69eFjhk9c+rziZ7/hHcE3RlDB6zJmwDDEGLmA4EHQz98s 4c2yj/yLZAe0GY5aLdFxZT8nABbpP7td0H91goIuZMPA3Ib1Pw23uTWCzoOaN4WefvKF Qo4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R6IU1p4TeEKJjoh2orwJx/m6ECV4RVPwTG8bCIFZfuI=; b=d/9vEGXHlKWGgw+YxIAMpiQbC52u4wV5gV21V3J4aK1Tbr7AVNvEoAa42iNNx8Ekqv l/owx9Jlvt/8l1zLWJSwC9R/9aqNWT966Wlvv7IesfY78MwN21hsZA2HDBFzK7hfxYFk LtPluKQ/SJiG3xQnutY/fnwwdP+pyRnbjTVXrU+NlPbAbpOz/P6S4HNT2DB3zOKAxnu5 Ep8aPT+wLUt0gXTtw9C1yYALtBlIo9S0JHRP0KTOEFjzySHATM4XnTxCqaq4b33rSiOW IxUYCf71KdWKYwR70ze5VdROVagNk0AZazpOAbCi4Srvxt4tSX8Qut1yClpgCtAoXlp5 BCXQ== X-Gm-Message-State: AOAM530r3NL+VCpAK6sC/wpPwavYmfgofvbC1Cy6AJ+kCxxohXWw3mh/ Gnad9I43fNbcuwobcMMSSY21oA== X-Google-Smtp-Source: ABdhPJyNxv4hsHIY/LADbXx9dVfxKJhwPnXo1I8LKHSGvY0zyUkLrvHyAD3IL8Qu0RX0hZL9gJbfkQ== X-Received: by 2002:a7b:cb53:: with SMTP id v19mr20605224wmj.127.1625584017818; Tue, 06 Jul 2021 08:06:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 32/39] contrib/plugins: enable -Wall for building plugins Date: Tue, 6 Jul 2021 15:58:10 +0100 Message-Id: <20210706145817.24109-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584394620100001 Lets spot the obvious errors. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- contrib/plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b9d7935e5e..17e6e2ec4f 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -24,7 +24,7 @@ SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) # The main QEMU uses Glib extensively so it's perfectly fine to use it # in plugins (which many example do). CFLAGS =3D $(GLIB_CFLAGS) -CFLAGS +=3D -fPIC +CFLAGS +=3D -fPIC -Wall CFLAGS +=3D $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) CFLAGS +=3D -I$(SRC_PATH)/include/qemu =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585293621702.8112865706624; Tue, 6 Jul 2021 08:28:13 -0700 (PDT) Received: from localhost ([::1]:59032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mzc-0000uE-Iq for importer@patchew.org; Tue, 06 Jul 2021 11:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfA-0005Bd-AT for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf8-00074p-3M for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id o22so13829826wms.0 for ; Tue, 06 Jul 2021 08:07:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a12sm2942694wrh.26.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 56B711FFBA; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cuu/+/i+aE9OJCzoepBYKpRGSdrNqPNpgdExXOyA0HU=; b=dxI468LD9eFnEdL2WauVBfS++cx+JUM9NJqXLrquTiqzq7y7PO3wshPqfnxj/rs7wS S+SNCJdioXp0uVe3qW1EmOLWHy5EjgfD/muc/bLKJtd1H81pVrrNHDjGlWyGnw2SgXY8 mV+kjQ4b4umPmnVYTQbY4M+6AnW1+shsgRJ1yhnfBWt90L60piSvJCflnxKHjuUN80Op 1h9TUvmaGyFmuIDq0jie5QFO6TZLAMAhkIww0Cb70bV0PnYGyr3c1c1J+EjMvxY8A1LN 6IZFwvIBQ8S8LICh/GcuQaCzji1sbUDsp3OWmsv/jcWqDNAa+YtTm1eiwde8PYS+g6ip o0jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cuu/+/i+aE9OJCzoepBYKpRGSdrNqPNpgdExXOyA0HU=; b=F7yeBiqg/e4D2CaLXZKt1h6F1+iyDZAhW5xEn/zu+cbTaRySifsieBAQxhHNbAtrQS oeM6g9CWs8NmFKOscDtbkLQU/NQ8N5iS2yf1phg1qJ9lrhuH1T83h+ShC/98O6ok6OyY 4i7MolroQZIJ5z7Ii8LM2rOgvsLGcX0fr0bp7olbSZdYDd6tikM2cyDOPHsGHjrzeCj/ qefOPrEgqCqtL8QONDJVg4JQi1228DVm9m0Bk+5l0HklRNk78o+6TTpS25Xdkn09Stth fBkfBwnBr3/4Adi0yQ7JrELy7Gk7SEb5dGGIxROX0dtlHIevxJn4T7+MO+ITpdz/Zxeg Zr9w== X-Gm-Message-State: AOAM532TG2pgm6s4k9+7X0HNAjJXyBLdZj34F24i5asxPbJb9Gz/LU8z LK437tFxqGJvp4c4TyN9E83QOg== X-Google-Smtp-Source: ABdhPJzaBKh1ML7Z9W+KJRWfhn6lLNRfAPB0HlvIr6Ji7trjfYWchB7ULd8sahiCSt6J5V+FQkaxGg== X-Received: by 2002:a05:600c:b48:: with SMTP id k8mr1339787wmr.180.1625584020590; Tue, 06 Jul 2021 08:07:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 33/39] contrib/plugins: add execlog to log instruction execution and memory access Date: Tue, 6 Jul 2021 15:58:11 +0100 Message-Id: <20210706145817.24109-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585299045100001 From: Alexandre Iooss Log instruction execution and memory access to a file. This plugin can be used for reverse engineering or for side-channel analysis using QEMU. Signed-off-by: Alexandre Iooss Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210702081307.1653644-2-erdnaxe@crans.org> Signed-off-by: Alex Benn=C3=A9e --- contrib/plugins/execlog.c | 153 ++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + contrib/plugins/Makefile | 1 + 3 files changed, 155 insertions(+) create mode 100644 contrib/plugins/execlog.c diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c new file mode 100644 index 0000000000..2de9f0d7d4 --- /dev/null +++ b/contrib/plugins/execlog.c @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2021, Alexandre Iooss + * + * Log instruction execution with memory access. + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include +#include +#include +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; + +/* Store last executed instruction on each vCPU as a GString */ +GArray *last_exec; + +/** + * Add memory read or write information to current instruction log + */ +static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t info, + uint64_t vaddr, void *udata) +{ + GString *s; + + /* Find vCPU in array */ + g_assert(cpu_index < last_exec->len); + s =3D g_array_index(last_exec, GString *, cpu_index); + + /* Indicate type of memory access */ + if (qemu_plugin_mem_is_store(info)) { + g_string_append(s, ", store"); + } else { + g_string_append(s, ", load"); + } + + /* If full system emulation log physical address and device name */ + struct qemu_plugin_hwaddr *hwaddr =3D qemu_plugin_get_hwaddr(info, vad= dr); + if (hwaddr) { + uint64_t addr =3D qemu_plugin_hwaddr_phys_addr(hwaddr); + const char *name =3D qemu_plugin_hwaddr_device_name(hwaddr); + g_string_append_printf(s, ", 0x%08"PRIx64", %s", addr, name); + } else { + g_string_append_printf(s, ", 0x%08"PRIx64, vaddr); + } +} + +/** + * Log instruction execution + */ +static void vcpu_insn_exec(unsigned int cpu_index, void *udata) +{ + GString *s; + + /* Find or create vCPU in array */ + while (cpu_index >=3D last_exec->len) { + s =3D g_string_new(NULL); + g_array_append_val(last_exec, s); + } + s =3D g_array_index(last_exec, GString *, cpu_index); + + /* Print previous instruction in cache */ + if (s->len) { + qemu_plugin_outs(s->str); + qemu_plugin_outs("s\n"); + } + + /* Store new instruction in cache */ + /* vcpu_mem will add memory access information to last_exec */ + g_string_printf(s, "%u, ", cpu_index); + g_string_append(s, (char *)udata); +} + +/** + * On translation block new translation + * + * QEMU convert code by translation block (TB). By hooking here we can the= n hook + * a callback on each instruction and memory access. + */ +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + struct qemu_plugin_insn *insn; + uint64_t insn_vaddr; + uint32_t insn_opcode; + char *insn_disas; + + size_t n =3D qemu_plugin_tb_n_insns(tb); + for (size_t i =3D 0; i < n; i++) { + /* + * `insn` is shared between translations in QEMU, copy needed data= here. + * `output` is never freed as it might be used multiple times duri= ng + * the emulation lifetime. + * We only consider the first 32 bits of the instruction, this may= be + * a limitation for CISC architectures. + */ + insn =3D qemu_plugin_tb_get_insn(tb, i); + insn_vaddr =3D qemu_plugin_insn_vaddr(insn); + insn_opcode =3D *((uint32_t *)qemu_plugin_insn_data(insn)); + insn_disas =3D qemu_plugin_insn_disas(insn); + char *output =3D g_strdup_printf("0x%"PRIx64", 0x%"PRIx32", \"%s\"= ", + insn_vaddr, insn_opcode, insn_disas= ); + + /* Register callback on memory read or write */ + qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem, + QEMU_PLUGIN_CB_NO_REGS, + QEMU_PLUGIN_MEM_RW, NULL); + + /* Register callback on instruction */ + qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, + QEMU_PLUGIN_CB_NO_REGS, out= put); + } +} + +/** + * On plugin exit, print last instruction in cache + */ +static void plugin_exit(qemu_plugin_id_t id, void *p) +{ + guint i; + GString *s; + for (i =3D 0; i < last_exec->len; i++) { + s =3D g_array_index(last_exec, GString *, i); + if (s->str) { + qemu_plugin_outs(s->str); + qemu_plugin_outs("\n"); + } + } +} + +/** + * Install the plugin + */ +QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, + const qemu_info_t *info, int ar= gc, + char **argv) +{ + /* + * Initialize dynamic array to cache vCPU instruction. In user mode + * we don't know the size before emulation. + */ + last_exec =3D g_array_new(FALSE, FALSE, sizeof(GString *)); + + /* Register translation block and exit callbacks */ + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + return 0; +} diff --git a/MAINTAINERS b/MAINTAINERS index 684142e12e..ee456e5fb4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2981,6 +2981,7 @@ F: include/tcg/ =20 TCG Plugins M: Alex Benn=C3=A9e +R: Alexandre Iooss S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 17e6e2ec4f..6ac67aacaf 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -13,6 +13,7 @@ include $(BUILD_DIR)/config-host.mak VPATH +=3D $(SRC_PATH)/contrib/plugins =20 NAMES :=3D +NAMES +=3D execlog NAMES +=3D hotblocks NAMES +=3D hotpages NAMES +=3D howvec --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584777706770.6176331438122; Tue, 6 Jul 2021 08:19:37 -0700 (PDT) Received: from localhost ([::1]:54796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mrI-0004on-TJ for importer@patchew.org; Tue, 06 Jul 2021 11:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf6-00056a-Gx for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:01 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf4-00072Y-OU for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:00 -0400 Received: by mail-wr1-x42d.google.com with SMTP id i8so13583288wrp.12 for ; Tue, 06 Jul 2021 08:06:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm18039244wmq.14.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D9541FFBB; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0B41l8DgGSa12niyjKzHwCDTjBJNRfJGB+oGiCv7dg=; b=Ko0rze6urFLr9sEmYdV2433Xyq3fnB2Dz4FescYUFF/v4Hcg/ZIxVCvpQzk0GJNhK1 tqzwVJzlFAS+6lQtUEi4fV/ROD8JMEE9f9+PHjBCKLgJicc64QWjBF7SPynFHsxswBCQ 5Clsr0p+TUied6bkuryVLF8Xi8bDARrrWrKUmUfMGxWo8SD9QaOy3v5XVXIqYH64qNvr 0kdM0eziTacQqtDIfjDLohamo8z9FpmaJnq9svr7+tocSIduaQoKU1QFi+oNw8YwCu6S qMvk+Vn2ZkDRp8OlUfNSKYduXGTsI+RuyIQaMg+54n7yNfChlWHSkFr5lNHasCFl1gMZ W7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M0B41l8DgGSa12niyjKzHwCDTjBJNRfJGB+oGiCv7dg=; b=sbgCSaRlT6pRdRKcr7ieDBCRgOXWR2FwJPC3IYN9u9XBlDccdYBVHyeDEvQ7jNVJN+ iu/WMg7EuufAcZJua5e215T1WQ7w3nlykZ9F6zTqxufFjflkhuycDRdDAmYYmtN5uw4n 2J/iOWGyhvtDGQcuRvbWBlkCN2tyRbqTiLy8MkcHDah7If5ymPgAXKHdB9R3tTgYgBpY ysQvsWuRPOoU59rYhEWxYi49aX057S38vxAG4qpmPj0AH68eoaLaYyAM3ArMS3jnIMzp HGS4ScRuottHe3ZaOGQJCODCI4xVcWYBJfGZMLkh9SzdDWJDGa9MjrKz3CTJW8Pp9Vnx +g9w== X-Gm-Message-State: AOAM530iDVSDLvr3ROiN1/fLEN5LUh7rpquEmxdDqXB5ipDDwwI+4Qmo +Ri2RWuryrDqIVDV8aYUzZVarA== X-Google-Smtp-Source: ABdhPJwbLeQ0bsSjy2s5C5JvubWat4GfIuNVinuLgPRw9u6RzpfqddxNLQLCbNgOErUh6OesMhGl/Q== X-Received: by 2002:adf:e690:: with SMTP id r16mr8238954wrm.196.1625584016997; Tue, 06 Jul 2021 08:06:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 34/39] docs/devel: tcg-plugins: add execlog plugin description Date: Tue, 6 Jul 2021 15:58:12 +0100 Message-Id: <20210706145817.24109-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584778352100001 From: Alexandre Iooss This adds description of the execlog TCG plugin with an example. Signed-off-by: Alexandre Iooss Message-Id: <20210702081307.1653644-3-erdnaxe@crans.org> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/tcg-plugins.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 0cd77c77d2..179867e9c1 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -320,3 +320,27 @@ the user to see what hardware is accessed how often. I= t has a number of options: off:0000001c, 1, 2 off:00000020, 1, 2 ... + +- contrib/plugins/execlog.c + +The execlog tool traces executed instructions with memory access. It can b= e used +for debugging and security analysis purposes. +Please be aware that this will generate a lot of output. + +The plugin takes no argument:: + + qemu-system-arm $(QEMU_ARGS) \ + -plugin ./contrib/plugins/libexeclog.so -d plugin + +which will output an execution trace following this structure:: + + # vCPU, vAddr, opcode, disassembly[, load/store, memory addr, device]... + 0, 0xa12, 0xf8012400, "movs r4, #0" + 0, 0xa14, 0xf87f42b4, "cmp r4, r6" + 0, 0xa16, 0xd206, "bhs #0xa26" + 0, 0xa18, 0xfff94803, "ldr r0, [pc, #0xc]", load, 0x00010a28, RAM + 0, 0xa1a, 0xf989f000, "bl #0xd30" + 0, 0xd30, 0xfff9b510, "push {r4, lr}", store, 0x20003ee0, RAM, store, 0x= 20003ee4, RAM + 0, 0xd32, 0xf9893014, "adds r0, #0x14" + 0, 0xd34, 0xf9c8f000, "bl #0x10c8" + 0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585979824245.4351122981942; Tue, 6 Jul 2021 08:39:39 -0700 (PDT) Received: from localhost ([::1]:40924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0nAg-0001DX-OS for importer@patchew.org; Tue, 06 Jul 2021 11:39:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mpA-0002Rf-Fg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mot-0004ug-Q1 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: by mail-wm1-x332.google.com with SMTP id o22so13853242wms.0 for ; Tue, 06 Jul 2021 08:17:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y66sm16314795wmy.39.2021.07.06.08.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 889B31FFBC; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/yrF+ayxgdtoFcLg/iX/tWy6wtd8uBatUI5DIaKry1g=; b=Z8G+Urw5Oy8loHPpxKNmYuiNAuc7Xmmm3JbA2hQUzOJnQm/Xnq+Tk9IDgVwGuSlE47 7LXh+Zxjd/VlolPocPPNp+xjByj+tMajbJWTyjVrzSeYSrf/DHI8HRBUNEv1H1rfGPB1 m1qxzjgseITsOQ9ExNI0QY2u5sBN14CId8C9XaUihluwKpyuj02zMUsYstfrDY5rh/X+ XbUH5Z1wu4z1PMU1Nwfo6OV2UW/iCoN2gd3Q/PFtQ0UOrPDsYyztv77DR3APtHNQ8Hce uUYoVwBTrTxtt/Az/biI9JnhOtdFrSdlcLAQtNCkRXeKh1q40dWQmJw+Q4fHXEN+ikKc iZJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/yrF+ayxgdtoFcLg/iX/tWy6wtd8uBatUI5DIaKry1g=; b=PVpvcpiubsPye47LA49S1OQfEWykp+j7GoN15gimskwTlDRcgUQLfVQtUfH1OB5w5O V4hXEHS7c7Smc+xO9OfLnYimEWX2h6+g1FRN6RePmCfDprcV0xuUarMExJXjjiVzWbGP KusRejDRwSak8P49ChY4P0xZ1ZSBCWlM0EaoK7d3JEodh0AuptZkbAT+nnU8IF1JURNi hBghzowRY0TvsrFVZFJOr+KIiqf44p47dXtmvfd0wFx/SYSAJ+b4yATWQjyeOB3G4yHr rX3ctfrFPefgbauyF4lQCm2J2En4gctPlbuX6SiZvIZ/rHeqXLz/3Y5A9adkLHZSHNgF LqyA== X-Gm-Message-State: AOAM5317xO/mVNg0f2HbZIoXk1gEeL8JV5hsFaVrMVuYw684Wh2d+6sX /dGUv+o7mYEzkUEDbidDnMxX/A== X-Google-Smtp-Source: ABdhPJw8Ncdfkp//ObEPFuvbXILZFlDbo9kfqPH5iTFKtcIIGhAq6FExLU6X3KCsznbK1bN5/IiTZA== X-Received: by 2002:a05:600c:3794:: with SMTP id o20mr16552503wmr.0.1625584625989; Tue, 06 Jul 2021 08:17:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 35/39] plugins: Added a new cache modelling plugin Date: Tue, 6 Jul 2021 15:58:13 +0100 Message-Id: <20210706145817.24109-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585985693100001 From: Mahmoud Mandour Added a cache modelling plugin that uses a static configuration used in many of the commercial microprocessors and uses random eviction policy. The purpose of the plugin is to identify the most cache-thrashing instructions for both instruction cache and data cache. Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210623125458.450462-2-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 419 +++++++++++++++++++++++++++++++++++++++ contrib/plugins/Makefile | 1 + 2 files changed, 420 insertions(+) create mode 100644 contrib/plugins/cache.c diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c new file mode 100644 index 0000000000..e9955cdc3a --- /dev/null +++ b/contrib/plugins/cache.c @@ -0,0 +1,419 @@ +/* + * Copyright (C) 2021, Mahmoud Mandour + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; + +static enum qemu_plugin_mem_rw rw =3D QEMU_PLUGIN_MEM_RW; + +static GHashTable *miss_ht; + +static GMutex mtx; +static GRand *rng; + +static int limit; +static bool sys; + +static uint64_t dmem_accesses; +static uint64_t dmisses; + +static uint64_t imem_accesses; +static uint64_t imisses; + +/* + * A CacheSet is a set of cache blocks. A memory block that maps to a set = can be + * put in any of the blocks inside the set. The number of block per set is + * called the associativity (assoc). + * + * Each block contains the the stored tag and a valid bit. Since this is n= ot + * a functional simulator, the data itself is not stored. We only identify + * whether a block is in the cache or not by searching for its tag. + * + * In order to search for memory data in the cache, the set identifier and= tag + * are extracted from the address and the set is probed to see whether a t= ag + * match occur. + * + * An address is logically divided into three portions: The block offset, + * the set number, and the tag. + * + * The set number is used to identify the set in which the block may exist. + * The tag is compared against all the tags of a set to search for a match= . If a + * match is found, then the access is a hit. + */ + +typedef struct { + uint64_t tag; + bool valid; +} CacheBlock; + +typedef struct { + CacheBlock *blocks; +} CacheSet; + +typedef struct { + CacheSet *sets; + int num_sets; + int cachesize; + int assoc; + int blksize_shift; + uint64_t set_mask; + uint64_t tag_mask; +} Cache; + +typedef struct { + char *disas_str; + const char *symbol; + uint64_t addr; + uint64_t dmisses; + uint64_t imisses; +} InsnData; + +Cache *dcache, *icache; + +static int pow_of_two(int num) +{ + g_assert((num & (num - 1)) =3D=3D 0); + int ret =3D 0; + while (num /=3D 2) { + ret++; + } + return ret; +} + +static inline uint64_t extract_tag(Cache *cache, uint64_t addr) +{ + return addr & cache->tag_mask; +} + +static inline uint64_t extract_set(Cache *cache, uint64_t addr) +{ + return (addr & cache->set_mask) >> cache->blksize_shift; +} + +static Cache *cache_init(int blksize, int assoc, int cachesize) +{ + Cache *cache; + int i; + uint64_t blk_mask; + + cache =3D g_new(Cache, 1); + cache->assoc =3D assoc; + cache->cachesize =3D cachesize; + cache->num_sets =3D cachesize / (blksize * assoc); + cache->sets =3D g_new(CacheSet, cache->num_sets); + cache->blksize_shift =3D pow_of_two(blksize); + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].blocks =3D g_new0(CacheBlock, assoc); + } + + blk_mask =3D blksize - 1; + cache->set_mask =3D ((cache->num_sets - 1) << cache->blksize_shift); + cache->tag_mask =3D ~(cache->set_mask | blk_mask); + return cache; +} + +static int get_invalid_block(Cache *cache, uint64_t set) +{ + int i; + + for (i =3D 0; i < cache->assoc; i++) { + if (!cache->sets[set].blocks[i].valid) { + return i; + } + } + + return -1; +} + +static int get_replaced_block(Cache *cache) +{ + return g_rand_int_range(rng, 0, cache->assoc); +} + +static bool in_cache(Cache *cache, uint64_t addr) +{ + int i; + uint64_t tag, set; + + tag =3D extract_tag(cache, addr); + set =3D extract_set(cache, addr); + + for (i =3D 0; i < cache->assoc; i++) { + if (cache->sets[set].blocks[i].tag =3D=3D tag && + cache->sets[set].blocks[i].valid) { + return true; + } + } + + return false; +} + +/** + * access_cache(): Simulate a cache access + * @cache: The cache under simulation + * @addr: The address of the requested memory location + * + * Returns true if the requsted data is hit in the cache and false when mi= ssed. + * The cache is updated on miss for the next access. + */ +static bool access_cache(Cache *cache, uint64_t addr) +{ + uint64_t tag, set; + int replaced_blk; + + if (in_cache(cache, addr)) { + return true; + } + + tag =3D extract_tag(cache, addr); + set =3D extract_set(cache, addr); + + replaced_blk =3D get_invalid_block(cache, set); + + if (replaced_blk =3D=3D -1) { + replaced_blk =3D get_replaced_block(cache); + } + + cache->sets[set].blocks[replaced_blk].tag =3D tag; + cache->sets[set].blocks[replaced_blk].valid =3D true; + + return false; +} + +static void vcpu_mem_access(unsigned int vcpu_index, qemu_plugin_meminfo_t= info, + uint64_t vaddr, void *userdata) +{ + uint64_t effective_addr; + struct qemu_plugin_hwaddr *hwaddr; + InsnData *insn; + + g_mutex_lock(&mtx); + hwaddr =3D qemu_plugin_get_hwaddr(info, vaddr); + if (hwaddr && qemu_plugin_hwaddr_is_io(hwaddr)) { + g_mutex_unlock(&mtx); + return; + } + + effective_addr =3D hwaddr ? qemu_plugin_hwaddr_phys_addr(hwaddr) : vad= dr; + + if (!access_cache(dcache, effective_addr)) { + insn =3D (InsnData *) userdata; + insn->dmisses++; + dmisses++; + } + dmem_accesses++; + g_mutex_unlock(&mtx); +} + +static void vcpu_insn_exec(unsigned int vcpu_index, void *userdata) +{ + uint64_t insn_addr; + InsnData *insn; + + g_mutex_lock(&mtx); + insn_addr =3D ((InsnData *) userdata)->addr; + + if (!access_cache(icache, insn_addr)) { + insn =3D (InsnData *) userdata; + insn->imisses++; + imisses++; + } + imem_accesses++; + g_mutex_unlock(&mtx); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + size_t n_insns; + size_t i; + InsnData *data; + + n_insns =3D qemu_plugin_tb_n_insns(tb); + for (i =3D 0; i < n_insns; i++) { + struct qemu_plugin_insn *insn =3D qemu_plugin_tb_get_insn(tb, i); + uint64_t effective_addr; + + if (sys) { + effective_addr =3D (uint64_t) qemu_plugin_insn_haddr(insn); + } else { + effective_addr =3D (uint64_t) qemu_plugin_insn_vaddr(insn); + } + + /* + * Instructions might get translated multiple times, we do not cre= ate + * new entries for those instructions. Instead, we fetch the same + * entry from the hash table and register it for the callback agai= n. + */ + g_mutex_lock(&mtx); + data =3D g_hash_table_lookup(miss_ht, GUINT_TO_POINTER(effective_a= ddr)); + if (data =3D=3D NULL) { + data =3D g_new0(InsnData, 1); + data->disas_str =3D qemu_plugin_insn_disas(insn); + data->symbol =3D qemu_plugin_insn_symbol(insn); + data->addr =3D effective_addr; + g_hash_table_insert(miss_ht, GUINT_TO_POINTER(effective_addr), + (gpointer) data); + } + g_mutex_unlock(&mtx); + + qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem_access, + QEMU_PLUGIN_CB_NO_REGS, + rw, data); + + qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, + QEMU_PLUGIN_CB_NO_REGS, dat= a); + } +} + +static void insn_free(gpointer data) +{ + InsnData *insn =3D (InsnData *) data; + g_free(insn->disas_str); + g_free(insn); +} + +static void cache_free(Cache *cache) +{ + for (int i =3D 0; i < cache->num_sets; i++) { + g_free(cache->sets[i].blocks); + } + + g_free(cache->sets); + g_free(cache); +} + +static int dcmp(gconstpointer a, gconstpointer b) +{ + InsnData *insn_a =3D (InsnData *) a; + InsnData *insn_b =3D (InsnData *) b; + + return insn_a->dmisses < insn_b->dmisses ? 1 : -1; +} + +static int icmp(gconstpointer a, gconstpointer b) +{ + InsnData *insn_a =3D (InsnData *) a; + InsnData *insn_b =3D (InsnData *) b; + + return insn_a->imisses < insn_b->imisses ? 1 : -1; +} + +static void log_stats() +{ + g_autoptr(GString) rep =3D g_string_new(""); + g_string_append_printf(rep, + "Data accesses: %lu, Misses: %lu\nMiss rate: %lf%%\n\n", + dmem_accesses, + dmisses, + ((double) dmisses / (double) dmem_accesses) * 100.0); + + g_string_append_printf(rep, + "Instruction accesses: %lu, Misses: %lu\nMiss rate: %lf%%\n\n", + imem_accesses, + imisses, + ((double) imisses / (double) imem_accesses) * 100.0); + + qemu_plugin_outs(rep->str); +} + +static void log_top_insns() +{ + int i; + GList *curr, *miss_insns; + InsnData *insn; + + miss_insns =3D g_hash_table_get_values(miss_ht); + miss_insns =3D g_list_sort(miss_insns, dcmp); + g_autoptr(GString) rep =3D g_string_new(""); + g_string_append_printf(rep, "%s", "address, data misses, instruction\n= "); + + for (curr =3D miss_insns, i =3D 0; curr && i < limit; i++, curr =3D cu= rr->next) { + insn =3D (InsnData *) curr->data; + g_string_append_printf(rep, "0x%" PRIx64, insn->addr); + if (insn->symbol) { + g_string_append_printf(rep, " (%s)", insn->symbol); + } + g_string_append_printf(rep, ", %ld, %s\n", insn->dmisses, + insn->disas_str); + } + + miss_insns =3D g_list_sort(miss_insns, icmp); + g_string_append_printf(rep, "%s", "\naddress, fetch misses, instructio= n\n"); + + for (curr =3D miss_insns, i =3D 0; curr && i < limit; i++, curr =3D cu= rr->next) { + insn =3D (InsnData *) curr->data; + g_string_append_printf(rep, "0x%" PRIx64, insn->addr); + if (insn->symbol) { + g_string_append_printf(rep, " (%s)", insn->symbol); + } + g_string_append_printf(rep, ", %ld, %s\n", insn->imisses, + insn->disas_str); + } + + qemu_plugin_outs(rep->str); + g_list_free(miss_insns); +} + +static void plugin_exit(qemu_plugin_id_t id, void *p) +{ + log_stats(); + log_top_insns(); + + cache_free(dcache); + cache_free(icache); + + g_hash_table_destroy(miss_ht); +} + +QEMU_PLUGIN_EXPORT +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, + int argc, char **argv) +{ + int i; + int iassoc, iblksize, icachesize; + int dassoc, dblksize, dcachesize; + + limit =3D 32; + sys =3D info->system_emulation; + + dassoc =3D 8; + dblksize =3D 64; + dcachesize =3D dblksize * dassoc * 32; + + iassoc =3D 8; + iblksize =3D 64; + icachesize =3D iblksize * iassoc * 32; + + + for (i =3D 0; i < argc; i++) { + char *opt =3D argv[i]; + if (g_str_has_prefix(opt, "limit=3D")) { + limit =3D g_ascii_strtoll(opt + 6, NULL, 10); + } else { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + } + + dcache =3D cache_init(dblksize, dassoc, dcachesize); + icache =3D cache_init(iblksize, iassoc, icachesize); + + rng =3D g_rand_new(); + + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + miss_ht =3D g_hash_table_new_full(NULL, g_direct_equal, NULL, insn_fre= e); + + return 0; +} diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 6ac67aacaf..2294f889ac 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -19,6 +19,7 @@ NAMES +=3D hotpages NAMES +=3D howvec NAMES +=3D lockstep NAMES +=3D hwprofile +NAMES +=3D cache =20 SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585656378209.71678129258908; Tue, 6 Jul 2021 08:34:16 -0700 (PDT) Received: from localhost ([::1]:50394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n5T-0005sZ-CC for importer@patchew.org; Tue, 06 Jul 2021 11:34:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfP-0005ZS-8s for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:20 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:50848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfM-0007Ft-8K for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: by mail-wm1-x32a.google.com with SMTP id o22so13830354wms.0 for ; Tue, 06 Jul 2021 08:07:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm11546551wrx.40.2021.07.06.08.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A03541FFBD; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eT5up0kian05/LgF6zUXsmuwoQua1u5bvZFkNOmLsvE=; b=z2ZmcB7IOrkvFSNxrJM/15GqzpZkc1FyaEBmUdHnLjEZa/wBZ5ENUvlxM1gQPbKk0T fMGIvScz+av4k60qcWhGhQrI3OM2GJEO9br2/evaIJhgDoB9UQ1BVIE9sbIeW6kgFOWC GdhutuP4PbHSBfHn8i7m0DmCtAehpZjX2+Vdz+W77AHm7DFvv2BkmZN9C/tid+VvB+u8 QPqfDUc5OwYpmMAEBP/ENMKVOVSbiYw4o1TIsnFrs0L1scRtIK38CJxoWjOHltNOmEpA zaUHQXN0V4UcoApF8iBdwGwgpvasBYVSe6ozbcB5REGLnZOzX1FUCZOWRqkOgdJJ40ZA bVcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eT5up0kian05/LgF6zUXsmuwoQua1u5bvZFkNOmLsvE=; b=e4cSBHuOUBzSA21QQAz37y5EzMQ8rfgDwQ4M5Z6A+Qm9EargBqTiKgaA2cmpLopR6S vgkfY+oYx8uviIJ3euuEKqL2twc2MF0lcCiZFu/hOnS2TkWNe8wAMlt0o+KeCA9r13vD KnZEYaCG2Tu83OOWs9ZutWB6hn7P+r44368IURIrY7N3IrOj9kbWYe90527IwvEJQLjT DtC2oTQna7USNVE+j9goAarPZ7+TZyphM+Wp/zf0jUaCYFtnu/02xHVXq+J4gl4dzm2T QvrwtJ7OUlaogMlA/pr9XoPpBi19yCnVUtFoQAfFc9v4qo3lolmKSyrteBwphM38+Kiy 1sww== X-Gm-Message-State: AOAM532J2MdM2eyO7yWcXc6n33yimQp7UQNUclzSg9NVpL02Eb0UliFL OgnxNJh1d501+CwQJAbSvT7NQQ== X-Google-Smtp-Source: ABdhPJyRnQzJ2zrdKN7/rAncgSLqMT26pdgNdEOHfeU6XVdFuN9TnFjIm1hGnmMEdTZTbTwZxLbAMg== X-Received: by 2002:a1c:4e0b:: with SMTP id g11mr1273600wmh.167.1625584033697; Tue, 06 Jul 2021 08:07:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 36/39] plugins/cache: Enable cache parameterization Date: Tue, 6 Jul 2021 15:58:14 +0100 Message-Id: <20210706145817.24109-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585662665100001 From: Mahmoud Mandour Enabled configuring both icache and dcache parameters using plugin parameters. Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210623125458.450462-3-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 47 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index e9955cdc3a..b550ef31b0 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -99,8 +99,28 @@ static inline uint64_t extract_set(Cache *cache, uint64_= t addr) return (addr & cache->set_mask) >> cache->blksize_shift; } =20 +static const char *cache_config_error(int blksize, int assoc, int cachesiz= e) +{ + if (cachesize % blksize !=3D 0) { + return "cache size must be divisible by block size"; + } else if (cachesize % (blksize * assoc) !=3D 0) { + return "cache size must be divisible by set size (assoc * block si= ze)"; + } else { + return NULL; + } +} + +static bool bad_cache_params(int blksize, int assoc, int cachesize) +{ + return (cachesize % blksize) !=3D 0 || (cachesize % (blksize * assoc) = !=3D 0); +} + static Cache *cache_init(int blksize, int assoc, int cachesize) { + if (bad_cache_params(blksize, assoc, cachesize)) { + return NULL; + } + Cache *cache; int i; uint64_t blk_mask; @@ -397,7 +417,19 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qem= u_info_t *info, =20 for (i =3D 0; i < argc; i++) { char *opt =3D argv[i]; - if (g_str_has_prefix(opt, "limit=3D")) { + if (g_str_has_prefix(opt, "iblksize=3D")) { + iblksize =3D g_ascii_strtoll(opt + 9, NULL, 10); + } else if (g_str_has_prefix(opt, "iassoc=3D")) { + iassoc =3D g_ascii_strtoll(opt + 7, NULL, 10); + } else if (g_str_has_prefix(opt, "icachesize=3D")) { + icachesize =3D g_ascii_strtoll(opt + 11, NULL, 10); + } else if (g_str_has_prefix(opt, "dblksize=3D")) { + dblksize =3D g_ascii_strtoll(opt + 9, NULL, 10); + } else if (g_str_has_prefix(opt, "dassoc=3D")) { + dassoc =3D g_ascii_strtoll(opt + 7, NULL, 10); + } else if (g_str_has_prefix(opt, "dcachesize=3D")) { + dcachesize =3D g_ascii_strtoll(opt + 11, NULL, 10); + } else if (g_str_has_prefix(opt, "limit=3D")) { limit =3D g_ascii_strtoll(opt + 6, NULL, 10); } else { fprintf(stderr, "option parsing failed: %s\n", opt); @@ -406,7 +438,20 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qem= u_info_t *info, } =20 dcache =3D cache_init(dblksize, dassoc, dcachesize); + if (!dcache) { + const char *err =3D cache_config_error(dblksize, dassoc, dcachesiz= e); + fprintf(stderr, "dcache cannot be constructed from given parameter= s\n"); + fprintf(stderr, "%s\n", err); + return -1; + } + icache =3D cache_init(iblksize, iassoc, icachesize); + if (!icache) { + const char *err =3D cache_config_error(iblksize, iassoc, icachesiz= e); + fprintf(stderr, "icache cannot be constructed from given parameter= s\n"); + fprintf(stderr, "%s\n", err); + return -1; + } =20 rng =3D g_rand_new(); =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584115293425.06460383211515; Tue, 6 Jul 2021 08:08:35 -0700 (PDT) Received: from localhost ([::1]:50708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mgc-0008OH-HB for importer@patchew.org; Tue, 06 Jul 2021 11:08:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXB-0004z5-US for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mX5-00026C-53 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:49 -0400 Received: by mail-wm1-x333.google.com with SMTP id n33so6294864wms.1 for ; Tue, 06 Jul 2021 07:58:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o11sm15336535wmq.1.2021.07.06.07.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B63611FF8C; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=OVJ7M9exKqvDYUNcA4vrWpaO99Xl+zQQxin5pBBf1TbzEIdZ9icYqn3+kVlEu/IXiW dC333Y2+nSH+v+zVyCY653wi4VIyKwm54ReQEXyEU1EP8FnDtEUIG+k2oQ8nJA2fGS2e 1TbnhDNc849PdDK7Z9LtNC78eT3pGtzuQSrUBqi8b/JgGsOqWKlkttsaD3UO/wTl6mUh yuhBZb5VLA3TTMPW+gCVBpKfCzStctlKw+tkKxAqnGC1koy5As34Rh6pb8z+wtxl8iqv sWJjxeqhv8LzyOa/X/+akNxI3nck4xZxOhVmF/3M6oyoh+jZxeeeAxhg8B+NZylLAk+M Ke9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=Y3eBCA6VQbLDGfFTNzQmaojDenNFeSjtFGZ+pnHk2v0hB7X04a0pAR/uNaHngX7tFx ejFEpgDbvaFYvH81IslKamb7lWLxaG7xHuhyrMbB1mrtEB363u/tkmDGy0bQEnhlnCx3 /W33Uo8CrH11wX7M6KIrg0dUWnxyuupRrZXWzK+DjavIO3fMyc+edWbAJjBw+hejJgzv WYXDbCCaWclGSfD1a41e/QVQsbL5mb2lWnSwJ1H3XGA11fM0uFDqeXguW7TKoXpvfcTo 6Cgqr8OJOcyoGumJLpg0w8dmmveNGC6UqbfRRULsgu5aNKRTp6Bc+a0UWk/8fgyPy2j1 k6+Q== X-Gm-Message-State: AOAM533Z6az4HU+5Ho4GAiL8d+CvThj7EzBPgOub/5J+SR6r90sHvpIk 7MuQSDTQeTzhHwGGRxT9p4UjvQ== X-Google-Smtp-Source: ABdhPJysrlygsNy+44e2NtrhYT3eJoccXtqoh2eKbbRaD7xXUVJn086q96tMgoaJAzZfDMb2xTd6rg== X-Received: by 2002:a05:600c:1c19:: with SMTP id j25mr1295989wms.166.1625583517660; Tue, 06 Jul 2021 07:58:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 37/39] plugins/cache: Added FIFO and LRU eviction policies Date: Tue, 6 Jul 2021 15:58:15 +0100 Message-Id: <20210706145817.24109-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584117266100002 From: Mahmoud Mandour Implemented FIFO and LRU eviction policies. Now one of the three eviction policies can be chosen as an argument. On not specifying an argument, LRU is used by default. Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210623125458.450462-4-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 203 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 190 insertions(+), 13 deletions(-) diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index b550ef31b0..bf0d2f6097 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -29,6 +29,14 @@ static uint64_t dmisses; static uint64_t imem_accesses; static uint64_t imisses; =20 +enum EvictionPolicy { + LRU, + FIFO, + RAND, +}; + +enum EvictionPolicy policy; + /* * A CacheSet is a set of cache blocks. A memory block that maps to a set = can be * put in any of the blocks inside the set. The number of block per set is @@ -48,6 +56,8 @@ static uint64_t imisses; * The set number is used to identify the set in which the block may exist. * The tag is compared against all the tags of a set to search for a match= . If a * match is found, then the access is a hit. + * + * The CacheSet also contains bookkeaping information about eviction detai= ls. */ =20 typedef struct { @@ -57,6 +67,9 @@ typedef struct { =20 typedef struct { CacheBlock *blocks; + uint64_t *lru_priorities; + uint64_t lru_gen_counter; + GQueue *fifo_queue; } CacheSet; =20 typedef struct { @@ -77,6 +90,12 @@ typedef struct { uint64_t imisses; } InsnData; =20 +void (*update_hit)(Cache *cache, int set, int blk); +void (*update_miss)(Cache *cache, int set, int blk); + +void (*metadata_init)(Cache *cache); +void (*metadata_destroy)(Cache *cache); + Cache *dcache, *icache; =20 static int pow_of_two(int num) @@ -89,6 +108,103 @@ static int pow_of_two(int num) return ret; } =20 +/* + * LRU evection policy: For each set, a generation counter is maintained + * alongside a priority array. + * + * On each set access, the generation counter is incremented. + * + * On a cache hit: The hit-block is assigned the current generation counte= r, + * indicating that it is the most recently used block. + * + * On a cache miss: The block with the least priority is searched and repl= aced + * with the newly-cached block, of which the priority is set to the current + * generation number. + */ + +static void lru_priorities_init(Cache *cache) +{ + int i; + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].lru_priorities =3D g_new0(uint64_t, cache->assoc); + cache->sets[i].lru_gen_counter =3D 0; + } +} + +static void lru_update_blk(Cache *cache, int set_idx, int blk_idx) +{ + CacheSet *set =3D &cache->sets[set_idx]; + set->lru_priorities[blk_idx] =3D cache->sets[set_idx].lru_gen_counter; + set->lru_gen_counter++; +} + +static int lru_get_lru_block(Cache *cache, int set_idx) +{ + int i, min_idx, min_priority; + + min_priority =3D cache->sets[set_idx].lru_priorities[0]; + min_idx =3D 0; + + for (i =3D 1; i < cache->assoc; i++) { + if (cache->sets[set_idx].lru_priorities[i] < min_priority) { + min_priority =3D cache->sets[set_idx].lru_priorities[i]; + min_idx =3D i; + } + } + return min_idx; +} + +static void lru_priorities_destroy(Cache *cache) +{ + int i; + + for (i =3D 0; i < cache->num_sets; i++) { + g_free(cache->sets[i].lru_priorities); + } +} + +/* + * FIFO eviction policy: a FIFO queue is maintained for each CacheSet that + * stores accesses to the cache. + * + * On a compulsory miss: The block index is enqueued to the fifo_queue to + * indicate that it's the latest cached block. + * + * On a conflict miss: The first-in block is removed from the cache and th= e new + * block is put in its place and enqueued to the FIFO queue. + */ + +static void fifo_init(Cache *cache) +{ + int i; + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].fifo_queue =3D g_queue_new(); + } +} + +static int fifo_get_first_block(Cache *cache, int set) +{ + GQueue *q =3D cache->sets[set].fifo_queue; + return GPOINTER_TO_INT(g_queue_pop_tail(q)); +} + +static void fifo_update_on_miss(Cache *cache, int set, int blk_idx) +{ + GQueue *q =3D cache->sets[set].fifo_queue; + g_queue_push_head(q, GINT_TO_POINTER(blk_idx)); +} + +static void fifo_destroy(Cache *cache) +{ + int i; + + for (i =3D 0; i < cache->assoc; i++) { + g_queue_free(cache->sets[i].fifo_queue); + } +} + static inline uint64_t extract_tag(Cache *cache, uint64_t addr) { return addr & cache->tag_mask; @@ -139,6 +255,11 @@ static Cache *cache_init(int blksize, int assoc, int c= achesize) blk_mask =3D blksize - 1; cache->set_mask =3D ((cache->num_sets - 1) << cache->blksize_shift); cache->tag_mask =3D ~(cache->set_mask | blk_mask); + + if (metadata_init) { + metadata_init(cache); + } + return cache; } =20 @@ -155,12 +276,21 @@ static int get_invalid_block(Cache *cache, uint64_t s= et) return -1; } =20 -static int get_replaced_block(Cache *cache) +static int get_replaced_block(Cache *cache, int set) { - return g_rand_int_range(rng, 0, cache->assoc); + switch (policy) { + case RAND: + return g_rand_int_range(rng, 0, cache->assoc); + case LRU: + return lru_get_lru_block(cache, set); + case FIFO: + return fifo_get_first_block(cache, set); + default: + g_assert_not_reached(); + } } =20 -static bool in_cache(Cache *cache, uint64_t addr) +static int in_cache(Cache *cache, uint64_t addr) { int i; uint64_t tag, set; @@ -171,11 +301,11 @@ static bool in_cache(Cache *cache, uint64_t addr) for (i =3D 0; i < cache->assoc; i++) { if (cache->sets[set].blocks[i].tag =3D=3D tag && cache->sets[set].blocks[i].valid) { - return true; + return i; } } =20 - return false; + return -1; } =20 /** @@ -188,20 +318,28 @@ static bool in_cache(Cache *cache, uint64_t addr) */ static bool access_cache(Cache *cache, uint64_t addr) { + int hit_blk, replaced_blk; uint64_t tag, set; - int replaced_blk; - - if (in_cache(cache, addr)) { - return true; - } =20 tag =3D extract_tag(cache, addr); set =3D extract_set(cache, addr); =20 + hit_blk =3D in_cache(cache, addr); + if (hit_blk !=3D -1) { + if (update_hit) { + update_hit(cache, set, hit_blk); + } + return true; + } + replaced_blk =3D get_invalid_block(cache, set); =20 if (replaced_blk =3D=3D -1) { - replaced_blk =3D get_replaced_block(cache); + replaced_blk =3D get_replaced_block(cache, set); + } + + if (update_miss) { + update_miss(cache, set, replaced_blk); } =20 cache->sets[set].blocks[replaced_blk].tag =3D tag; @@ -308,6 +446,10 @@ static void cache_free(Cache *cache) g_free(cache->sets[i].blocks); } =20 + if (metadata_destroy) { + metadata_destroy(cache); + } + g_free(cache->sets); g_free(cache); } @@ -395,6 +537,28 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) g_hash_table_destroy(miss_ht); } =20 +static void policy_init() +{ + switch (policy) { + case LRU: + update_hit =3D lru_update_blk; + update_miss =3D lru_update_blk; + metadata_init =3D lru_priorities_init; + metadata_destroy =3D lru_priorities_destroy; + break; + case FIFO: + update_miss =3D fifo_update_on_miss; + metadata_init =3D fifo_init; + metadata_destroy =3D fifo_destroy; + break; + case RAND: + rng =3D g_rand_new(); + break; + default: + g_assert_not_reached(); + } +} + QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, int argc, char **argv) @@ -414,6 +578,7 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu= _info_t *info, iblksize =3D 64; icachesize =3D iblksize * iassoc * 32; =20 + policy =3D LRU; =20 for (i =3D 0; i < argc; i++) { char *opt =3D argv[i]; @@ -431,12 +596,26 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qe= mu_info_t *info, dcachesize =3D g_ascii_strtoll(opt + 11, NULL, 10); } else if (g_str_has_prefix(opt, "limit=3D")) { limit =3D g_ascii_strtoll(opt + 6, NULL, 10); + } else if (g_str_has_prefix(opt, "evict=3D")) { + gchar *p =3D opt + 6; + if (g_strcmp0(p, "rand") =3D=3D 0) { + policy =3D RAND; + } else if (g_strcmp0(p, "lru") =3D=3D 0) { + policy =3D LRU; + } else if (g_strcmp0(p, "fifo") =3D=3D 0) { + policy =3D FIFO; + } else { + fprintf(stderr, "invalid eviction policy: %s\n", opt); + return -1; + } } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; } } =20 + policy_init(); + dcache =3D cache_init(dblksize, dassoc, dcachesize); if (!dcache) { const char *err =3D cache_config_error(dblksize, dassoc, dcachesiz= e); @@ -453,8 +632,6 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu= _info_t *info, return -1; } =20 - rng =3D g_rand_new(); - qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); =20 --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625585043241851.1143594697186; Tue, 6 Jul 2021 08:24:03 -0700 (PDT) Received: from localhost ([::1]:43928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mva-0007tP-7W for importer@patchew.org; Tue, 06 Jul 2021 11:24:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mor-0002N7-RO for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:06 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mom-0004qS-Iw for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id p8so26529507wrr.1 for ; Tue, 06 Jul 2021 08:17:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j12sm16956881wro.82.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CBF401FFBE; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cMVwh6QFPhcW20oytqkL/ZaRLLYb/mCB+qE4FLLNhgM=; b=wPrzNDWcK/rPQraUuYadVoljxxWxyY0PWxcJzumMP1ks9c3wSw39GE+s+S1Ye0RwYl KKoPDhwPZS2yLaJCHVSKekd6jVWGjUmFecymjWFWEOt+AJx8PNnvq1WkG9w6Vc/p3Hxn aDect8po3EST6NrnvQPNT96Qj53MqZxNmzzvW6EYlJDmPz17ozXOHCHvbI0Yyg2bll1K +Vex/F2HdT+wzrz67bjE6Byc74Safb48iRYDY+dcv3q5eGvIMvE3e2M79UJZ2rzOnFub zY8lV+JeACqYH4lG5WUe9YeqmI57Ddbb3jVFQo4wlKOjRVLv3aErKapVdTkVUQQfEuCZ WMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cMVwh6QFPhcW20oytqkL/ZaRLLYb/mCB+qE4FLLNhgM=; b=GKM40KounDji4/hvaZ+TL/xNifrlXUgn2GdT48uypdMaa3ZcrH4SPbn2tWanVfRGtm BDwsfDZ8reVkXEgxIq2Jzq98A2ieqGSFtN2zzVltO4G/phvagLvbacJx2UTCYiTv3G3s 0EXaplZU8YXDadnWUxqDNpoqeTpDqGxWjW0tRyUHjCOyvepbI5N9n4t61vmAb1Mdl7MT KKRSuhWqM2Xwuwarr5pmZl+eveJSHKs93KrKUJfdtW4Ma1bWnfnbSsTuF1Rk+qGcCsUm hkyhCDA8dE8X99fWTeqXOjCS5MddRTPM7TtqtRRskobKl9AyoICTFU05IxTvJHjOzQws AEXw== X-Gm-Message-State: AOAM531uV4M5x+9wu1V09tHop5NWoUfvVjshNOWvHuDyXhl9IEIzMNwu +BVzyh06eqk/V8FGnBhG8I/ffw== X-Google-Smtp-Source: ABdhPJxdedEebOs0zROJOdktWAtU3rJ8E/9N3ZA/3VC0SNvBTDLd7j3T5/vP0nW0ltnEB36QTz8/dA== X-Received: by 2002:a05:6000:1379:: with SMTP id q25mr21970030wrz.188.1625584619231; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs Date: Tue, 6 Jul 2021 15:58:16 +0100 Message-Id: <20210706145817.24109-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625585050443100001 From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Message-Id: <20210628053808.17422-1-ma.mandourr@gmail.com> Signed-off-by: Alex Benn=C3=A9e --- docs/devel/tcg-plugins.rst | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 179867e9c1..7e54f12837 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -344,3 +344,62 @@ which will output an execution trace following this st= ructure:: 0, 0xd32, 0xf9893014, "adds r0, #0x14" 0, 0xd34, 0xf9c8f000, "bl #0x10c8" 0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM + +- contrib/plugins/cache + +Cache modelling plugin that measures the performance of a given cache +configuration when a given working set is run:: + + qemu-x86_64 -plugin ./contrib/plugins/libcache.so \ + -d plugin -D cache.log ./tests/tcg/x86_64-linux-user/float_convs + +will report the following:: + + Data accesses: 996479, Misses: 507 + Miss rate: 0.050879% + + Instruction accesses: 2641737, Misses: 18617 + Miss rate: 0.704726% + + address, data misses, instruction + 0x424f1e (_int_malloc), 109, movq %rax, 8(%rcx) + 0x41f395 (_IO_default_xsputn), 49, movb %dl, (%rdi, %rax) + 0x42584d (ptmalloc_init.part.0), 33, movaps %xmm0, (%rax) + 0x454d48 (__tunables_init), 20, cmpb $0, (%r8) + ... + + address, fetch misses, instruction + 0x4160a0 (__vfprintf_internal), 744, movl $1, %ebx + 0x41f0a0 (_IO_setb), 744, endbr64 + 0x415882 (__vfprintf_internal), 744, movq %r12, %rdi + 0x4268a0 (__malloc), 696, andq $0xfffffffffffffff0, %rax + ... + +The plugin has a number of arguments, all of them are optional: + + * arg=3D"limit=3DN" + + Print top N icache and dcache thrashing instructions along with their + address, number of misses, and its disassembly. (default: 32) + + * arg=3D"icachesize=3DN" + * arg=3D"iblksize=3DB" + * arg=3D"iassoc=3DA" + + Instruction cache configuration arguments. They specify the cache size, = block + size, and associativity of the instruction cache, respectively. + (default: N =3D 16384, B =3D 64, A =3D 8) + + * arg=3D"dcachesize=3DN" + * arg=3D"dblksize=3DB" + * arg=3D"dassoc=3DA" + + Data cache configuration arguments. They specify the cache size, block s= ize, + and associativity of the data cache, respectively. + (default: N =3D 16384, B =3D 64, A =3D 8) + + * arg=3D"evict=3DPOLICY" + + Sets the eviction policy to POLICY. Available policies are: :code:`lru`, + :code:`fifo`, and :code:`rand`. The plugin will use the specified policy= for + both instruction and data caches. (default: POLICY =3D :code:`lru`) --=20 2.20.1 From nobody Mon Feb 9 17:07:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625584893338288.0558469105123; Tue, 6 Jul 2021 08:21:33 -0700 (PDT) Received: from localhost ([::1]:34960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mt9-00020S-2E for importer@patchew.org; Tue, 06 Jul 2021 11:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfQ-0005ZU-7r for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:20 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfN-0007GA-KM for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: by mail-wm1-x335.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009957wmh.2 for ; Tue, 06 Jul 2021 08:07:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b12sm4783230wrt.78.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E07F61FFBF; Tue, 6 Jul 2021 15:58:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oS1S2allDRCwTqJLfgxd4YbJAktd2ptss87hkbFVJp0=; b=vd28U50abaB0K+EHlla1Z4ey6uf78Usr8ds32f7Ge058vfisF55SWoSk1jIg2YRtcC IywZyCY/cbk99+SqFKgKpGKboEtsdtN8Zjo8QrMjqxWytXpQqpJiHH/bXUjPsEYreyN/ djSvlXGaS/J7IgUZS62DtdvLC8MxPf7585ZvHRO2eDElOgV/ITqxjMiRWvb0lblt5T5I 6m+A+J/s9ZLPtK1o4vFjLAMxjvhGRoPxJ9LAD7dAOy0zNW9Hljh6KjMi9wlOPRHnlZhr CSOb2silf0/bqfyGiZkntSI3gP6VMY+CJvjUh0x87Ej2SpswDTBwu4Rf5j+DYDQwzus6 6P6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oS1S2allDRCwTqJLfgxd4YbJAktd2ptss87hkbFVJp0=; b=l2bNscW1c3CeMyWdSmYmLVrJ4kTFqs/sBgbKN+mqtB7B9PMYzHeQVGbQDaSewH2kyM QC4VOFFBOPWj6OkVb3ErLTI12Sl6a9Ryd+As7E0o4PQOqhKJWX1L083uY0ealZ/Y2Lio Yy4aEmIP9n0Gxzd5Kd+u4WV4vO84MeOD7ONUp/RWF42jPD734BUglrHS+glnFALAqZdf FyXTVX+vZUQ5QNMJFplqj3NF+OkjlO0e+v60GLSPvst6AlKVFwNdqQPVuijBsZitgPdu IotUy25hiiWqHbevPeSRrmMgJJLvSxlpM3yPtIObrzXThSV9oV98EsN3JfHIO3pxhWZP TJEw== X-Gm-Message-State: AOAM532R3QkPn/SMOs5pxDoArZ+CPNbhnaZibRdHZsFPaAbSA4Z2f2Q1 RqW45ThnACRk/wckN0VAjV06RQ== X-Google-Smtp-Source: ABdhPJyukiALebnwYY6SjGQoj0Hsh5cRJgkwuROwRb06WRazoFvnL5DbTMlyY4dJS0Abp/olrBBmCg== X-Received: by 2002:a05:600c:1992:: with SMTP id t18mr1316164wmq.165.1625584036134; Tue, 06 Jul 2021 08:07:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins Date: Tue, 6 Jul 2021 15:58:17 +0100 Message-Id: <20210706145817.24109-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1625584894730100001 From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210623125458.450462-6-ma.mandourr@gmail.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ee456e5fb4..77b304afac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2982,6 +2982,7 @@ F: include/tcg/ TCG Plugins M: Alex Benn=C3=A9e R: Alexandre Iooss +R: Mahmoud Mandour S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ --=20 2.20.1