From nobody Mon Feb 9 10:39:25 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 162584125710261.8070193399343; Fri, 9 Jul 2021 07:34:17 -0700 (PDT) Received: from localhost ([::1]:40868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ra4-0004Zf-4o for importer@patchew.org; Fri, 09 Jul 2021 10:34:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rW8-0004bE-2W for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:12 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:41599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rW6-0005U3-8c for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:11 -0400 Received: by mail-wr1-x42a.google.com with SMTP id k4so6122607wrc.8 for ; Fri, 09 Jul 2021 07:30:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r4sm5571881wre.84.2021.07.09.07.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 059021FF87; Fri, 9 Jul 2021 15:30:06 +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=kSDYhL43Ppum3i4gkMxu5Ca8JF/VERRMrnfxtgPdTlLawNadS/Zk10xKFH1RVCDHg3 XTBGlXWDVUtcNUlITSN/GHVmZ3zj3Qr9KJOyy+pFjuGeNf93mV5Zb2xdUQ54YX3yjtrA Sm/FS9XBN6da/RiudZDWIlbVEcFDuCcGhkonvXZJxmh7/kHyfWW38l8E+lX6cv8BD26B U75vSodNX9EkwlbC+kde5A4YzvEDMpNYkIIpOCypFQLT9pJcPaep91Tt4m8E3pqOP75y 4MxhSvhrtm/nw5wrZ9+f2EKTRbmkUeUiP3dGp1CSZROrdhlofkakQZUpAwV+hOTG4c0h GTgA== 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=tYwSD4pvmTXlE1IKa1bbj8MYIvTdWPWUvboajMIaZJq7o/2QoBDtAVYpbDKs2IZwjp d1LQg+prMg/AXKlzHFrasF8uchFmYctVO3kmW20+jo2QZq0XQ04efqLmML7rjspN15be e7MKM3Ae6Yo7q1f5j2WqPTwsZ1aet8c2R0F1LaTUIqPQDGsY/6S0bntI8j6fCCn2HH7N ZxnoNKVXurjx3k0GEbl2gdZHYXD7kiwo5+HaP9KippAsapqu8ZXDb0W0BHXrUdgRIASo OfxNtWx5NWhnNCwY/897q8/bP/qhs2L5R6EAPfF1+oMEejfjBBmnY3/Zerp2QN48u1ZO hePQ== X-Gm-Message-State: AOAM5339FnKY5H7l+8PQGwFYPWZbsssl3A6z+D8mTiLkUuDYVzwRMCAH Ird+IOI8+TK84drZcJjY0OBbnA== X-Google-Smtp-Source: ABdhPJxBvZWNHvCiGF2eRV465udNmdWbJk2JABeEmzZu7bSxvrsHXJp0rzhH89dPFSuctFbSiEsZvg== X-Received: by 2002:a5d:6a05:: with SMTP id m5mr5099293wru.253.1625841009010; Fri, 09 Jul 2021 07:30:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 01/40] Jobs based on custom runners: documentation and configuration placeholder Date: Fri, 9 Jul 2021 15:29:26 +0100 Message-Id: <20210709143005.1554-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841257880100001 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 10:39:25 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 1625841151237631.813532538744; Fri, 9 Jul 2021 07:32:31 -0700 (PDT) Received: from localhost ([::1]:60654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rYL-0007Sf-Ra for importer@patchew.org; Fri, 09 Jul 2021 10:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWB-0004bw-2V for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:15 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rW7-0005Uf-Pt for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:14 -0400 Received: by mail-wr1-x42e.google.com with SMTP id k4so6122719wrc.8 for ; Fri, 09 Jul 2021 07:30:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j1sm11909218wms.7.2021.07.09.07.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 422921FF8C; Fri, 9 Jul 2021 15:30:06 +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=mraBFQRMnVVE8kt9oc7nef0ggzxeGVq9tutNkaHBssFAgBSeElspKSmKJXCT+vEEGm nh7/KFxpNRPUDQVX+V9Ha9Mm36NfTe1XbMF4pKfRkAn+/4g+BloogUISc7QZju5T4xFG DM3HIPq7MZ0+GX5QfsAIVhpkyGnG1UvV88BycCLdpZTChqvDuao+rmjh8f62Gi2xXv1N jpWMxKMMna3ZM7Hmwc7Y2KA6lFLipI0W4McYb92xUk0WHmH8riiB/8sX7JUO+EdRBZ34 CHYluGhYA6KhcP+mzlA3l17LJDgissvRk1ivDG8I2OHvsFG4xd/s2JdFGNaWkG3r9iSQ FW0w== 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=eaun7r6CBc3ITGQfYkIKgx1QaY/UCssB5S0ih+ijO/c+2WnINpPKaqZGDMvf9uegh2 FG52Tk4H5agMNaexeoZgloKZPuDE1sKUSQXh3fzFa1nTaNDn6UpGiJTVgSoQTpdLDKRg XPO7o0/lCCzUPUbAYkT728tYmTla40pOTGcCcwPqtsF7k+Z6GtSvtd5tXtzAjtXkDxC2 WaGkefF5yb2v9SbBok2lhGFZg3+2ARPC2/CkN+tLD6dT3M4yDz7SaU9JAUQazZ+An6FB tPrBAbS+uWLePUc8g9q6ZWteSwfoVnZU2tT5GoeF298FvzUATFayq4cgLYMUKnlrIvVD E9JQ== X-Gm-Message-State: AOAM532LL7D6o32Yvy2dzKVpReZL7iXH0QbyODXupTiSDfXIG+etcIsm N1NjlMhVFFRMGJRoeuJpuSPBrQ== X-Google-Smtp-Source: ABdhPJx7EFnDSsJas5TXmoc6jbVs0sszVYDEcPX3UszrB2GhdV8I8xYyAaGaYtxe3yKNLfR/mrMOXA== X-Received: by 2002:a5d:6984:: with SMTP id g4mr11185495wru.381.1625841010420; Fri, 09 Jul 2021 07:30:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 02/40] Jobs based on custom runners: build environment docs and playbook Date: Fri, 9 Jul 2021 15:29:27 +0100 Message-Id: <20210709143005.1554-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842054705100001 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 10:39:25 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 1625841259620741.0326066132643; Fri, 9 Jul 2021 07:34:19 -0700 (PDT) Received: from localhost ([::1]:41076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ra6-0004hN-B6 for importer@patchew.org; Fri, 09 Jul 2021 10:34:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWE-0004gu-6t for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:19 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:43793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWA-0005W7-NY for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:17 -0400 Received: by mail-wm1-x32a.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so6415208wmc.2 for ; Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm12293048wmq.48.2021.07.09.07.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 79E651FF8F; Fri, 9 Jul 2021 15:30:06 +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=z1hi8+KecpliAXLahEM7oLEwrqMRt6BbQqKmCQtcIZhGFlCAy9gaRshe+vdkt/Y7Ki fOFaGwm1fswiJ02gRRJsnWcqfeZ+1IoWqfC2cd52AtajMzSF7qsKTbSq2uFsb31+O4HU DJiZjFlIjfsbUST2JclwRoMqdBbRWdLAlyJ1cXfDnFm/D6F8rYHG1iB7ccd5Pp4LrrMW k+9tf3uWu5RRYQULYlWG0I9mETkeFYM97RafTNWPpt4LcyNKV4VIXQnwc1gd04PBQ8Ka i7L0VbnkwsjR6Zh8U+4612BwOb5eC7Lbtim8kd6Icd76yAdPkPZ6/Q2OzRGBCJYVabAp zOrw== 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=c13I22JX3fDCw/az1CnCxq50CN9I0qpTa441S2gWqu9LTSIndLGxKQ3PEBAtTUFw8O Yi1NFBC9WigpnzlTOhISAZLbSjJvwcr5ynDX/21JBLJ52xUW6CcmT71detwDj9/8hfpI BAc2JCvN528++tKPSssx5ykkaIsqkxkhMVgfGCQAija7C+RFrNGNR5lKmwo6nlWDz2Al /YmwMI5Z/6IOwZMMuVP4Z9hyhJzfh2hIWAULV3fqF92ga5gMkW0zd456zIhkWIdspzv+ Fbx9BAxR0+iBeeVOEydRF/y1OJduIG9HfcyHgRc/DgHtQxQr3mUUhqY+bnpO8y/AjOC0 ZfUw== X-Gm-Message-State: AOAM5333R7SQY13oknYLTI4HvJ1JocwmGjBSz2SUJcpbGgquEVV9NKQn hQWHZRCsgtFa/3PsZP1TIk28bA== X-Google-Smtp-Source: ABdhPJwLP5sV0bsUhklHsSdV47Rv97SIxoPmJB/d4wdUL/sLoZM59+NrHsMLKpMfX2gcXquQC8vJbA== X-Received: by 2002:a7b:c316:: with SMTP id k22mr12119758wmj.56.1625841013021; Fri, 09 Jul 2021 07:30:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Fri, 9 Jul 2021 15:29:28 +0100 Message-Id: <20210709143005.1554-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841260288100003 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 10:39:25 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 1625841182406187.53404401242233; Fri, 9 Jul 2021 07:33:02 -0700 (PDT) Received: from localhost ([::1]:35524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rYr-00014J-95 for importer@patchew.org; Fri, 09 Jul 2021 10:33:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWC-0004eM-NY for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:16 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWA-0005VT-2R for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:16 -0400 Received: by mail-wr1-x433.google.com with SMTP id g16so2518529wrw.5 for ; Fri, 09 Jul 2021 07:30:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v21sm1322368wml.5.2021.07.09.07.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A60461FF90; Fri, 9 Jul 2021 15:30:06 +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=FfWFLbMk9ybGSNQ9h3U1tOQD6i4xtHo0H6O3hQhDR3ebi+9jvuwKeAilCVsVvrGoaj IJQxmfYl6+qym4h4y6hiaJ4zMuzNgw48c8bzFzJ31K1BMKRqXWDRljUNiEDhLBIvPBOl SWRtv7YODQPPgcamBlSsfgEa5OFoFZNqMs4mVOJxNiFvsoGIiRnx+O1CCzmj9CABVDJL SSRrn4bdR4pK6wj+qILosMYMp/lJJzfI4G93/kEl4B/SGagUmgTgLeuP84E8Ny6Lkmb4 qcBwhyZsk85RnqaC8AAtYJcT641nbRbf9cE6SdB+SkhaxRWrWtKqsn4yG01H7UB6vFjo TDlg== 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=XgrIi0Li780v9+2vlMJCMJB+/9okS4IPpkWC7xQ9izgGm2FuzrEiQLpIdpL68IxrN/ 9RdM2a+/qZS5/DzRSdrMiy4DTO3zEUr9myGPcm991h3srZzHRi44HPxKO2v1i4uUMqbn ZtNxHt9daUTez+GIXnc0uEJ5yimCslSedfgJOOO7jZarYLlas58wxAWNJ8udkIzEpqid KCqWEArGfcOzB2ehctXOYKQ9/mP9Ra8DPBtVZEgh7KUL3jMvRP4L6WYyYVs/WEo1LRxZ sdbL5UwQQ254LegeRw0sAJEIRtZnXTHixNQILT9h5a+wOE365ogGHuSp/ZSWY8PQ3L5d ah+A== X-Gm-Message-State: AOAM530W6LRW3dYeDwhKazPhlsv7QNmjMY46maWM4o5VCOAmCCGd+sgK VtTeC6hzlROT42TimPK89bEycQ== X-Google-Smtp-Source: ABdhPJytwh4Nq/27EbsyqVLixnDRME9IYmRjUpN006ZrcfipUtuJj/PQiMr5L9BaUW+BLmfMOz6yOQ== X-Received: by 2002:adf:ed07:: with SMTP id a7mr9338889wro.70.1625841012321; Fri, 09 Jul 2021 07:30:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Date: Fri, 9 Jul 2021 15:29:29 +0100 Message-Id: <20210709143005.1554-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841183764100001 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 10:39:25 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 1625841385295267.91060002839777; Fri, 9 Jul 2021 07:36:25 -0700 (PDT) Received: from localhost ([::1]:49680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rc8-0001zp-3W for importer@patchew.org; Fri, 09 Jul 2021 10:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWF-0004h4-Fx for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:19 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:55859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWD-0005XH-7w for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:19 -0400 Received: by mail-wm1-x32a.google.com with SMTP id j34so6440451wms.5 for ; Fri, 09 Jul 2021 07:30:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n18sm10222489wms.3.2021.07.09.07.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D9CB31FF91; Fri, 9 Jul 2021 15:30:06 +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=0T57Dc3nW1plGWjw3nuVtK4UawlZ6tR8xwYyvQKWOq4=; b=yCBcgxwwU71Oa62Prvjvu8HXufc8O+ICYrwoZ0YDi7sSAxfs9AbWliBEegDs7/Bb8L HkunK9ChUzfzjErRdCAHFSs7yw3bHGLHjYicKUSvzXfn3x6LMVfe4/y+bYtiwqh54tMy WbDklCa5T3rNV8TNq3YBxO6GOhd9/ylwwscRWqP5eioo+Oq2229rKljkrCkKx519kQp2 WRXdVXoKP4enCqkWaphsohy7eXoDOS2V/Ipp2+LYOo1iPDHgpvLP3mkuAoQg000XE6xh UrZf44EptvM7/w1M2C4m8HN9OkWjkmedf1XZJ8fRv7cmhLpWApxbqjhQZ4Z5kt+LkVxG FrFA== 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=0T57Dc3nW1plGWjw3nuVtK4UawlZ6tR8xwYyvQKWOq4=; b=G4nGsD5/G1Dbmiehl0H512gCSmmiJOh1b66yGjRmWSIdzFWXEbMx5Lf9h/k/VQ7gkd ZfL3+sWaMjYRJ1qVDBAkuVQy5LCJrn0wMfMjkIOrSioMy3xU1SYbnnAQMcbyfPeEefGP 6lwgbiw7i/iQ9qWOSEJD6oa4+TP5aMrRQ67p95ekiVRjrVo0uKD8sCKViCsHM6LTex38 sjPdhNarciF/ZQiPxnhPv4nJoYPF7J+kdxdwQxqsbfGLBoXfQt4wcpsYaYqmOYQ85Pjk sCszhlssQD3whT8MHm9nEH4p6F0V8VnCJFNFMyihDQuwmBehY4r8hevUrNxcE6W8nPI0 zxIQ== X-Gm-Message-State: AOAM531dlTxGXHRgqkd3a/ppZNwNEHA4KzupTI9/aR0iTmE0D8azakkU oN6q90Tir/BH9TY9jKNnNP8ZBA== X-Google-Smtp-Source: ABdhPJxSm8n5fy101xXqFrdG1iKxYWaX3gSLsUfaI9KIeoIWNxMNwkaOhgUl+HLOkO7csjFsIlgDtg== X-Received: by 2002:a05:600c:4109:: with SMTP id j9mr40221791wmi.180.1625841015936; Fri, 09 Jul 2021 07:30:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 05/40] tests/tcg: also disable the signals test for plugins Date: Fri, 9 Jul 2021 15:29:30 +0100 Message-Id: <20210709143005.1554-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841386328100002 This will be more important when plugins is enabled by default. Fixes: eba61056e4 ("tests/tcg: generalise the disabling of the signals test= ") Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/multiarch/Makefile.target | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index d57a115873..85a6fb7a2e 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -37,6 +37,8 @@ signals: LDFLAGS+=3D-lrt -lpthread run-signals: signals $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso suppor= t") =20 +run-plugin-signals-with-%: + $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso suppor= t") =20 # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no --=20 2.20.1 From nobody Mon Feb 9 10:39:25 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 1625841151752366.00934972304174; Fri, 9 Jul 2021 07:32:31 -0700 (PDT) Received: from localhost ([::1]:60764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rYM-0007Wt-Mk for importer@patchew.org; Fri, 09 Jul 2021 10:32:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWG-0004ht-5Z for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:21 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:36367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWE-0005Xh-3o for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:19 -0400 Received: by mail-wm1-x32c.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so25877039wmq.1 for ; Fri, 09 Jul 2021 07:30:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r15sm11647557wmq.15.2021.07.09.07.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 171D41FF92; Fri, 9 Jul 2021 15:30:07 +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=kB5ETN9vQppRzYuxebDR/QhiOVXaNnIzza2HWujbjOw=; b=zO9CVSQbA1BVwyAJmATTH9PfSgtw/gnATy4Atw2RPRXNKQuNPGBASb3PFlIB3n7FHD +pZD/Pb4QZHNzvI/etfJRI2KyyBFKcFnSR1rnkeENTXo1i8ctqTOh74IDaeSfB/KojxA uaiaXm+a+MxjRI/suGCwpToXbhshvmp6BYjUVM8tmCGm3t/Q8Bbk6ERj1sSEAebxrZcu ehZnT2vydqNcD4pwZu4tTM6T2nvEmOlLIev/zhSiWc5omLcbtGnuclxFG9xMcgStcUyD BJIeFUIjg6O+n4aRg2+G7bc/8ltAck4pafhW0ZnS5pT/OpCEKMvS3l4dtFiqkFvGkh9m g9uA== 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=kB5ETN9vQppRzYuxebDR/QhiOVXaNnIzza2HWujbjOw=; b=kF9KZOiYPCQx2qSoxwdm0pffKu45PiF/JP2GIniAfZGX58mlgOCl8GWhUyPY0oTHla AY+WxZXAR5vRF+9K/H9ap1OX6+smonQndwrKQqIYU02isJ2QUAbtQ0xQl5NWIEL63H59 j7Rc5H+UO3Q73rSYFzWvERTlx5vpWO8gk3mSYH4b1GPJCX92Wz4bgBlpozDJDjiEohyj baVCvhVoqCllORH84GMFPOspMCllS0tF6nW+qb9un5vQDTYacCQIRq1bw8oZDOAeh4a8 UG3JYEWFGjP6I/SAbcgCHpuXMrfYe3Q+Nv6k9fBNTrFmYhI2A99SRDkHYjTu0+bP4Y1c nHhg== X-Gm-Message-State: AOAM531LKeaEm9xn7hErYDSntPrnzc5+Kfc3Igo0MyYwtSmgxCUr5cTe 6FZ/gXG/TMJZTVlW3LHR8k9t5A== X-Google-Smtp-Source: ABdhPJx9Qff7I7+8/ffO0gSN7r/cqnNuaXKKnu1zOB/X+cmyF9Bck4d79vi1zRwg6DkZqQ3IRPv18A== X-Received: by 2002:a1c:4d0b:: with SMTP id o11mr40261665wmh.36.1625841016629; Fri, 09 Jul 2021 07:30:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 06/40] build: validate that system capstone works before using it Date: Fri, 9 Jul 2021 15:29:31 +0100 Message-Id: <20210709143005.1554-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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=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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841153426100004 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 Reviewed-by: Richard Henderson --- v3 - fix double it. --- meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meson.build b/meson.build index 7e12de01be..ff7a9f8b4f 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 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 10:39:25 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 1625841292071547.1691577988214; Fri, 9 Jul 2021 07:34:52 -0700 (PDT) Received: from localhost ([::1]:44214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rac-0006kI-NK for importer@patchew.org; Fri, 09 Jul 2021 10:34:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWS-0004oW-5B for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:33 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:41612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWH-0005Yd-Nf for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:29 -0400 Received: by mail-wr1-x436.google.com with SMTP id k4so6123324wrc.8 for ; Fri, 09 Jul 2021 07:30:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm4797923wms.24.2021.07.09.07.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 566041FF93; Fri, 9 Jul 2021 15:30:07 +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=ltO9FSPWI0YAXHSIZJBSwCWRepXYRKE23jFtfoUHQWDHJxzMie6NsaMSxkI5MD2xqj dImB2vLG7IlswZsetMz1i7JOf7BMaZd8tJgJXDZtiRzxk4HmCg0UK5UpmzXEjE8VoZ8l nhmLK9Qxo1j9gZ58GISY8aezRzuggx3gKKDNDqHhLMLayrCQ8EEYgpjTrlUVFDyV1IKN taA1rMiGTHaqWMGIeR4Ig7MtvoI8aC09INnI23CJxyDEMjdmvyIIbr1z0oAZMYljpgEZ Z7OgwbMfpMLgPxmKCir6Zx/d6p/w7BI9Xhqhm61zAFo4X6/+lKCZ06GjLD8FcBaqAaEL OjcA== 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=cBOINyVnEqftZw9y3gzn1qiuUAeeI+hYnK146GpceVTVhi/BDsYXJCL7BR0ZlQb4F9 OnNuPwt7f8wcMxECtY/Ci49u3xFcn/eYh4v12lHTJUHk1WnQ26S8HU+HBmxeZfTCQx0i pvJrNefftVXg7gNzFD3JH8Zud5i5zRRasZ/0aJgFzmqpALOThXKeaAzr75PebeZzllOV 2t8rG9nVAnZ5AWiQn2pNubv4mhM+brwgxAji+qOnc5DNFkFHFMYfhWEsXvHQa9x6SFnr 3iVbO6vJHyEUCucDfsJaalso1Je0DuyI0a/o6QXw4SD/bnXiu4e3dsT5Nu3+smQEf3z9 H/dg== X-Gm-Message-State: AOAM5310xWKCLcX4kvW6W0EdRGtKNLP23lJmJ8VnyWgls950LjQ7vO7S 9nPahxAyY56EY2Zaz6I2hbC2Lw== X-Google-Smtp-Source: ABdhPJwI9EsyNYY0nZ8k/p+oOs4+dRucoknrrQWypONK6u1Yx4B12+AwtfWGO/T220fTwzJeUxWrOA== X-Received: by 2002:a5d:4089:: with SMTP id o9mr1295343wrp.274.1625841019427; Fri, 09 Jul 2021 07:30:19 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Fri, 9 Jul 2021 15:29:32 +0100 Message-Id: <20210709143005.1554-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841292490100001 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 10:39:25 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 1625841380719220.61622553835775; Fri, 9 Jul 2021 07:36:20 -0700 (PDT) Received: from localhost ([::1]:49460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rc3-0001qw-Fe for importer@patchew.org; Fri, 09 Jul 2021 10:36:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWU-0004rJ-Ju for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:35 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44769) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWJ-0005ZT-P4 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:33 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f9so6747620wrq.11 for ; Fri, 09 Jul 2021 07:30:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x4sm12303005wmi.22.2021.07.09.07.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8ACAF1FF7E; Fri, 9 Jul 2021 15:30:07 +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=gcyAkf6g4SeY88YSeAeuTlh4eeySnlmgNSUMlkuB4B78An52sxxGx0HLXymvZEPQMQ SBNL4gFd/ulwpeciABOMnLlmY/YBOmw4ef2r/Hxk6+NONcYKqjRa4gSqRcdFx6dmqAQR MD/lrOMrH5ZdUxxOus0Ld1QGXeXeiUWSssAcIX8J/mOL3wl8fCvcLq2PRfRdK+LUURbl yQztkWKQ11KAmA97ATT66CuDRJJuxPiChcLeF5lkXl8MlnHynCv1MBFDdWNkjWrWNIme jzBez3+HrhtdrGJVKIA7F1L8SX9/1lSJXfGq9/zxTvmjbw/ei2TQtnJcNgU+E4fwZl4h 9x6A== 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=XlA2Qnyyq5OJ6XVI/qqlYaDhIcL0qA3bIqZoAzJAA28q+p/KNu1WPaLmM3EAKp3oJG 3tX5K68T65zfyg9OXJ7frCaD1lVeQRl7o7IHLrN9HjoLHtFoav4vBzYJWXLWLH6kkO6V Z2OCwNSLS9oWGTzP3LkpxNUicR8zm2eDKujD7s+4XhmuuB/RF/sBZhlDKMaQoLvbm6OS KA/KoRgGEiQXvXaWFOthP+j6kupDhMNlQfD0MuUHTPXWez7zwvBw8nk8AhTkQ3pasFaY W7g7miL7AVpOq7rx++gdfcQbQ9UaBc3+5UWWUL6AL1zxJt+w2lpInicUh3rpYBv5iGzB KFXA== X-Gm-Message-State: AOAM5331IscsmtTGQmxaJiTpzL8gUhss5JN7H9eo+uxwOAtV2OvaGPda 0A0A4BfsybZ5qxhna1M7tXYpfA== X-Google-Smtp-Source: ABdhPJwJ+qyCtWJAu96FJzNI00Z/z0DIV7enycPMzp9njtXz8nEwbWCmGbw1ig9ny7JPIinxDblizw== X-Received: by 2002:a5d:40c7:: with SMTP id b7mr41351543wrq.169.1625841022405; Fri, 09 Jul 2021 07:30:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 08/40] cirrus: delete FreeBSD and macOS jobs Date: Fri, 9 Jul 2021 15:29:33 +0100 Message-Id: <20210709143005.1554-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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=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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Ed Maste , Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , aurelien@aurel32.net, Yonggang Luo 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: 1625841382904100001 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 10:39:25 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 1625841547600792.6423233909533; Fri, 9 Jul 2021 07:39:07 -0700 (PDT) Received: from localhost ([::1]:58230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rek-0007f6-5b for importer@patchew.org; Fri, 09 Jul 2021 10:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWU-0004rP-OY for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:35 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:43795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWI-0005Ys-Qv for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:34 -0400 Received: by mail-wm1-x32b.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so6415518wmc.2 for ; Fri, 09 Jul 2021 07:30:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm5556086wru.6.2021.07.09.07.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E730A1FF96; Fri, 9 Jul 2021 15:30:07 +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=GoaTI8ubYXAyHZBvIQIqc8k4ECHdddPSgBgsYVk+HRSnY0QtBPhWBtcUNSMIWp0vID mvsfippFGuGnMVkFvakZv8oUsRiCHoA+TtLcxvnH3BfZxzNQg/MXy6sPYTBxUMqdfzjF Y0KITLvMstps4PE6qolkBfpEGR2AHXkJ6dVUO3S1r92OtN8Dgb+pRBmj+vycEXzK/c9g i07lHSpW+f/1Q3vCyKOiGd1pBGIqm68HFIBfeN+Wxgy6OWO0G0KjGUwTEdBjRVBIv/9e C7LX0MysCKIR+UQmKjSKzBbCtVtl85ndlQkoeVZRIv6OnH/JdAJHN6yGl/OL7ZQKAOKr X6rw== 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=cYOmc8F/f4l3xjI6HL7FJERfB79bKcjOZOVl5JzBCBVa4funrLYIN1Jx7mLfspCaPn +dlhBzWj63o2tmSvpaVGI1OPszKCPl2HyAT9k2KswaAFx4VuZevcQ5Jh+uQZe/dcX5EV TEulENvnQsxSzH6vbXcGeQgUBO18stG/ouuP9pbhRvxq+MzTLFRR5UHFljCs08r9k/13 YcNEsYVxHx1D3eNjSbohkKzlNgcGTquUwouM90PAwIsZ5Jkp0+VanGDjeXQlnEbhKpw6 Ilb2rDVu1MKidCUdqSxZfrlgwQmMvvzMVE9SC5pDVC/K5+VPUkaJwf88wArNogVfWwSg a+UA== X-Gm-Message-State: AOAM533yDPKT139x0qytHfIfFqisbdzuF6CGQAWCraUY+P+CHnFUOjEW rxHZwvs3oElLM/DzarMQW0Tc5g== X-Google-Smtp-Source: ABdhPJyoV0yjUR+WBk5YdxNF9lkqdXilvBVuxa+vDAlHRIRHpp/nje6CCONiudY3t8IKchwqUG62aA== X-Received: by 2002:a1c:59c9:: with SMTP id n192mr40301053wmb.81.1625841021511; Fri, 09 Jul 2021 07:30:21 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 09/40] hw/usb/ccid: remove references to NSS Date: Fri, 9 Jul 2021 15:29:34 +0100 Message-Id: <20210709143005.1554-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Peter Maydell , Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841548412100001 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 10:39:25 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 1625841548045101.60943805561021; Fri, 9 Jul 2021 07:39:08 -0700 (PDT) Received: from localhost ([::1]:58294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rel-0007hr-2K for importer@patchew.org; Fri, 09 Jul 2021 10:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWK-0004jU-1B for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:24 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:35529) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWF-0005YU-UB for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:23 -0400 Received: by mail-wm1-x329.google.com with SMTP id k31-20020a05600c1c9fb029021727d66d33so4919951wms.0 for ; Fri, 09 Jul 2021 07:30:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm5681457wro.79.2021.07.09.07.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 20DB51FF98; Fri, 9 Jul 2021 15:30:08 +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=nJbTNK5h1kZIV4U+6fCTspiBwgtdy4dCLpaytp+G8/y/udiUGTA+cOa3SHK9TzAg+x l9RRcEWpY/zOvChCvr0xyYQCVuowxwP09Sm3tfc6wqDDK8IFzT3f6lFtICvYgEVHiYHs cHo/waZHc4PQXFatIXhsHhwXip6aG1pQTCG1R29qI0WsNgAL8RSwyWI/GhzKmGKnMzyQ v1oZ98dGTtXiW5MZF/o6LnzidRIIuE1PynNlNWnVqzi9NTIrd18gUD5qg/Ne8pHT2/we x7zeVYDOqOhCHMODyzfWwuj8CqmZY4iNR90DejtUyUAmuML6hSmHnW4Kq4RvUb60ogvd B3DA== 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=gkhUOcgBajIUDDBizUC6TK6CBSPQmJglayUBxM66g854+qXN1ie9NwxKiWXxXOszxd duNYnr0hWPPPaHBob2ZxF08RJbDVYQCq6lnsq+xOp6pYE4azGe2ObkvhE5/HDQXV7JO1 A8Y7yQLLiWjuS9/37TyWM729Im201HmHzMjXuH5SH2ztVv3QLVV5slq67l3vn6TElB9c zsl0yM/kfuCeSY4vkVeQr+i5YiMBF5vFwbJ7poACRFACY02e0FnVwdBGbLPp9xWUV+wP f/2e0usqohRvg+EC0WQ2Sya3Mbm7D4CPovuubRYgYq9EhVUml2hUVGehaHKdv3zq6n63 cYpg== X-Gm-Message-State: AOAM530+7rlN/rAvNgaoYIhUUcJBrK57BdWZ/CH01yMXKVhOf3a3+oU7 QC89VXeoyIh819FWv6+Vt/Dd+w== X-Google-Smtp-Source: ABdhPJxd/O2nvY6dW8zhKFQjAZyp3FM6eGTlzV0q39fa18hgpK3e9qxusP2YPtaKgeJz9Ez9OIVttA== X-Received: by 2002:a1c:4d10:: with SMTP id o16mr39870566wmh.160.1625841018629; Fri, 09 Jul 2021 07:30:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 10/40] tests/docker: don't use BUILDKIT in GitLab either Date: Fri, 9 Jul 2021 15:29:35 +0100 Message-Id: <20210709143005.1554-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841548509100002 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 10:39:25 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 1625842290904125.25874059801856; Fri, 9 Jul 2021 07:51:30 -0700 (PDT) Received: from localhost ([::1]:43278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rqj-0004d2-Pc for importer@patchew.org; Fri, 09 Jul 2021 10:51:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdB-0004a3-KQ for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:31 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rd9-000090-Jq for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:29 -0400 Received: by mail-wm1-x32a.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so25919975wmq.1 for ; Fri, 09 Jul 2021 07:37:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t22sm5248338wmi.22.2021.07.09.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 622331FF99; Fri, 9 Jul 2021 15:30:08 +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=v/cjfmOsTvIvTT7JJd22jN2MFyywR9UN9F6htlD910/fJN5Q/7tQ6LneDq70bdeQF4 EXpRcWvLC7P7vzEicXgO+QH1pIbgwAhD7F+OnRQndIVYxhW6nhvnyW2Kp1ZX00FNfg4s nAVX4J6INhN/m3gvQ9JIGmSGrviBuiydLI1TWjMtvs/TPfU4+byzgUGrkJXu+rjFAld+ ZURZ6wNLz96Zz+NUBe4qy+o1z08sIR89jS9tVedbqMKFaRYm4rc3t2NNfIsdxsD+GO7k jukNSqveVr7LCxK3HNvBGUuNhlMFiEWdMVHS6aKPK4TzC+VDcOoS12S6Fj8TB7AEWdZ3 /DBg== 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=UBH2+ZB0sBXR9UDBnpdlAvw4uLGniMyYXFB/eTzTyAIemWnIZ3zkhwpfnFrxG00bcE NgDNCgvMz+OGlIqrHTaEUoX4GSeWKnu26zkWSbxKxbXeiOFtjtND+P9K6lwNT1H3hwQ6 E1eB3s1U/wL/MM8stl3RzqFAIuUs5TqENBABWelX/xM28tJjNItcqOSPl03PmWGyjv1R WqkLlCAalZ96H64G4eTY86dhXJ6SSD+BnTvKpHzbHCjs5iHiLFGfUdMiGcTEyhz9hM/U d+M8y3ExzrwvHU7MytWZp1Ghqhqa8FY+lhAlBRMmFlAPPgV2Xs/b6InmaStoJbrBtoQg 94Zw== X-Gm-Message-State: AOAM533UWnbNThyIRb+1hLjprMubuLiaubUDjiJxClz3bQv4WbqSsMQ8 msndMC7WN8ZuDzMIiLPF1v26Tg== X-Google-Smtp-Source: ABdhPJzrXxtdM8cvhvxZf9Ce0JT168Glf7bQInQP14PClZMvh08ag9nUKuqFyuA083xTrmufuzF/pQ== X-Received: by 2002:a7b:c318:: with SMTP id k24mr40444322wmj.144.1625841446246; Fri, 09 Jul 2021 07:37:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 11/40] tests/docker: use project specific container registries Date: Fri, 9 Jul 2021 15:29:36 +0100 Message-Id: <20210709143005.1554-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842291709100001 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 10:39:25 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 162584148142027.2298160331934; Fri, 9 Jul 2021 07:38:01 -0700 (PDT) Received: from localhost ([::1]:53044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rdg-0004DO-7s for importer@patchew.org; Fri, 09 Jul 2021 10:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWa-0004zl-Dy for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:40 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWL-0005aD-KM for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:38 -0400 Received: by mail-wr1-x431.google.com with SMTP id i8so12382933wrp.12 for ; Fri, 09 Jul 2021 07:30:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a9sm5289092wrv.37.2021.07.09.07.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A45EE1FF9A; Fri, 9 Jul 2021 15:30:08 +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=RkoYfOLpcfdOcmrxw2sHSVVXqiyF7U/A6TSdTpsiqKl7mhBHHcQz8E5GDKpc1lHyF7 yNydVDt3NDHMAKmnaqE7bR5qyDSsGT3Va1V8/lM+agFF7HQDb2eWkGb7N3C6nKpf2n++ U82YzOKpNnUFzuOK+or1ECiFQTxetFBqSslahIrG5tNV6K/aSrnLcvHMvSPXr6tzHR/9 F3x0KTbMxrLc3W9EPIuZ2yCz7exV8AHzlHzPdu9NWjNXAIF0kpZxBb5L+/GewtLNVUdd XQXByQTAp+r9vj8J2TIWBk4oX+KZ7o7j/tQ/a2Xr4nTEE+c9jDBd7FTDF+DgSMa/FtRj KC2g== 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=Oplg2xDAqpmGcExSj6eyspFqHULaVMXxKpmEQRLgKdqWrN9s6f2usuM8vTTdnNGZ6e OeXiDtCBTeHcG3j2B86uEvPAtz1wye2u5leY/Th0HQFARYhv8l9PxyslJGgaa5L4COVg DMF7KK5JThgkFwbutLoelPOoXZtbb2qAD2reIz2D0vAvUdyRKglM6EXSBdo03fwL+7eX 69wHzymDM17lwr9QYWCTF+sY/zi1YSpE/Zq7vEW3AJabwcNmFSIvNrvMFtEa1kkD12wj co+4so4sWz/WpdY0ShseTWw6kFrpwUaWIGfWr7ZOFTk1KxgC3FcaFymQ7H8NhdM8M1qZ H6MA== X-Gm-Message-State: AOAM53228gPcLRyG6H1z7pF0LOND8sRLt3NTw7FpEgB+8gTLzFL1/tjN ENzcTg1Cynwx2TfKhtXgZHnqzw== X-Google-Smtp-Source: ABdhPJzFA9WV0NVe3S1WjybDwh31s1GF1dcYpfCfW0wj+hTFNUWK0ftkiiNp1eaSbSQj614R9TXqUQ== X-Received: by 2002:a5d:40c7:: with SMTP id b7mr41351702wrq.169.1625841024050; Fri, 09 Jul 2021 07:30:24 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 12/40] tests/docker: use explicit docker.io registry Date: Fri, 9 Jul 2021 15:29:37 +0100 Message-Id: <20210709143005.1554-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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=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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841483112100003 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 10:39:25 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 1625843065037903.5902833760852; Fri, 9 Jul 2021 08:04:25 -0700 (PDT) Received: from localhost ([::1]:51276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1s3D-0003Va-PO for importer@patchew.org; Fri, 09 Jul 2021 11:04:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdW-00051v-8I for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:51 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdT-0000HW-7L for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:49 -0400 Received: by mail-wr1-x42e.google.com with SMTP id a13so12426678wrf.10 for ; Fri, 09 Jul 2021 07:37:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b9sm6488572wrh.81.2021.07.09.07.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21A991FF87; Fri, 9 Jul 2021 15:30:09 +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=tiKPAly71W2pl9elxuhEW4K6FGc7XqzefrHciGUe06cjFZq/1Aas5CwYKWgG2g0OIH xDGCDd4EeK7lgKeXdr+9U0Q1RiNsZl5jaRDgzrJOWu0GeL/M3u/TDSkBd5KiZc1TV3a5 m9DgfiMmuKHyY/iQDvXZega0ANF8fUqEGXkMOuDtxEWIDr5+5SiXbLP+kJVWL6tWV1hm 1kR217p7YB7Oj+4GKrwsdlptLXndKu0/Ruk7j2mMe85885nEW/ZaOdFAIu1v0K7UnfKW gPPs+ZoFM/Bv6qYS2o//XjPh83LnplYSzdpNLwQ7XyvykNdrw64r+vO60gVPUsBG0u1R /07Q== 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=ZQLH5hMNDQnEkim8yv6NL4+r6BdNCxC+8V/PCifpoEEpLNSljQc3AzDbyBk5DDL91r 67gy6ZroIfmpdS8HKNWaa3VHDSaKlxofm5lShY7fbUw0VE/0DP10XWNEyHd0iJJB4wlb nOewEu9x1NMqZHIVCdGGmDy5cl19H309Vw6hebGMI6EcAaorRD21SLWL+Kwrg/TUB0CP GbjBqDV8n3SXT9CpwvRqWqMhfikl3xB58/lBPun6IyRFte4Dx9m4UA5knkNdhPxIUHeU +5fmKrdr8cktEnItvMuNC4U19bs4GFiVXih6LaQ6mQqXRDQatIGD8apyH90qrIfV0tcg kymg== X-Gm-Message-State: AOAM531qFrRzXssy/+o1Pv3LM7CC+g0V5fEuLStJDk9BjS4mKdbvcO5k FqaTC2aZKZw8qoNmSOLU+vI88A== X-Google-Smtp-Source: ABdhPJywQjwNecDV38784q00mdYzoFFJr+wFn3S65t1arO9E/OE5GzU1J6ejlhBufgd5hZxNswE4Bw== X-Received: by 2002:a5d:46c8:: with SMTP id g8mr17522206wrs.341.1625841465745; Fri, 09 Jul 2021 07:37:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 13/40] tests/docker: remove FEATURES env var from templates Date: Fri, 9 Jul 2021 15:29:38 +0100 Message-Id: <20210709143005.1554-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625843067259100001 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 10:39:25 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 1625842443957230.91352567892; Fri, 9 Jul 2021 07:54:03 -0700 (PDT) Received: from localhost ([::1]:49824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rtC-0000YN-U6 for importer@patchew.org; Fri, 09 Jul 2021 10:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdB-0004a2-8I for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rd8-00008t-U5 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:28 -0400 Received: by mail-wr1-x42e.google.com with SMTP id l7so11518872wrv.7 for ; Fri, 09 Jul 2021 07:37:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j10sm5360007wrt.35.2021.07.09.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 69A0B1FF9B; Fri, 9 Jul 2021 15:30:09 +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=NH0b7hmoxCx9S6ssFxod8LRR4YjxD85nXwDLW6iufTMqTV4p6MlDiUQfGM08hm928Y EfP1wP5sEGsLvE+p1LW7UmjMZTv3OlSdYgoYtwh4U2BunEb1rUpjhPYx3G/VuCaGlnGU lub0FKjcIycvT/mt6fEiI9/4rZU0zFJMbibsxnPXvdLm2zhuGWZYmzX4buR74Q6Uh4Dv oaR6Zr2kCabu/F7aZBHbsUALRlDyTXDaZ4FWUP4oAnnbCRpBGs5auErzV0WSLBDOwebv qliTSkvmRJVpmt+8z69B8ILfod9KfM/Rmj20BeuGhTNtN8XwHQZF40A7L1TFidLvBSHE evwQ== 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=eRpbNWt0PkTTEyC/2JbXkUn1HWUfzBSMQN64oYpYCJlBXozuVn5L61Y5PM96t6WIp/ k5oBj0dBFDhbNLk1GRR2dco5+vXFRpFQzH96O9QrccOfU9dZEOY/hIpmlMYmEyiW6mwB j4sTjU+xqxEeSmoGENxKo4yCR/swQUXS0zmkAxpDVzs59tTKn6CqEYiJI3hg/reRa4Ue XiyIXqTs8WHqRRscDxTeXzbIu2pCdCqOpkYwdf9vQta12a3bzkvsUTnaSka0vtmFHlif YAziRo+yOf39rkCKr417Y/1wOBBXA+VQp376geHEh7XjwSGCriRt9VGR6VVRtG1+7mtG 9ZRQ== X-Gm-Message-State: AOAM531fQso45/3M+jDoOx2SM183nZcUAgqfiPDaTPkFRF+zjrsyyNBF OOCUeOqPTWmRcrAvGjE2Ym3QEA== X-Google-Smtp-Source: ABdhPJzd5QVdj/kpdmdHpU1O6ybIFBEH8lK+ivXG5k1ZjsYMUIvwErQ5kB9a2nTHdvu7MdjQ+VkV5A== X-Received: by 2002:adf:f592:: with SMTP id f18mr3652097wro.179.1625841445359; Fri, 09 Jul 2021 07:37:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 14/40] tests/docker: fix sorting in package lists Date: Fri, 9 Jul 2021 15:29:39 +0100 Message-Id: <20210709143005.1554-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842445739100005 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 10:39:25 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 1625841258816114.21231900046848; Fri, 9 Jul 2021 07:34:18 -0700 (PDT) Received: from localhost ([::1]:41092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ra5-0004hq-Pn for importer@patchew.org; Fri, 09 Jul 2021 10:34:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWY-0004xc-Kc for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:38 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWP-0005aX-Di for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:38 -0400 Received: by mail-wr1-x42d.google.com with SMTP id d2so12480283wrn.0 for ; Fri, 09 Jul 2021 07:30:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm5091935wmq.3.2021.07.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E0221FF9C; Fri, 9 Jul 2021 15:30:09 +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=IQTvoIgWN/Mib15w3xCKEg0NoqPGGf32olRTjpy10ZGw1urf5vTt41XTO4oeghsFmU gxW30eF2195vBEdCY19f7T/Evm1OVnEgHtExHcrbT2fT4aHptKgOW/13nF+88XZG7jL8 B0kTgwbERhfoYEECasf7GSs98AWQELmP1MHmtvJDIxGSCQI8ftb0Fi9nSGZlH5zQv4hx aigd5bvD3ytKuyc0oziU/LK3ULvxythbDkvIofkWO64X5CMGa5k5woJIkK5yyaBn7gMm TGJQMnlXwA1r5Iym0TCNg512JWc3oHzX46XIsAsyDlCKSGYPV+ZSrCDlsepMZiBJsWkE shNw== 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=d2WUzMBr9ybfC8GmeneCPNiCNNOadeDZ8KpwKgu7Ku9y8pB8MD46OtgeSUZpMs0473 znjflrP2aX38HfYNHXkIjR1GUgCcB5wHw/S80CHWb8qCtV8YJvJUkcRjVvYg5MGN1jDK T90B37/TzFA7dgPiacSDjWSbw7AaeW1Qe0xxOLmyDV6Ik3FBWnaRVRYj3YcW68rwzMkx GcHPP8i5ZecL9wIwWjSGlf+8MOxXF3FVDUbmF4+7GAqw82x2gaxBzXsV8I6S4anWFpYD +Z18hog2OwC4vMiVxkBu6enuU4P5/C347doVGPkMyrLyzmkexw91CQ2RzM03REWuMlTz O+GQ== X-Gm-Message-State: AOAM5324CQrIBvZ0IXCt+riSJcnpPyYLtVYLxIxG2VH9fzlUAphU8+pq CScnN7e/QkWZaPnwJsgYaBNPDA== X-Google-Smtp-Source: ABdhPJzOiymkBiH/vEYpPFIxg+AsR0IdVlNjlAZKXEsKP5GwVYtwHHsoT11NMWpZ+vSkrA6LaHSTaw== X-Received: by 2002:a05:6000:180b:: with SMTP id m11mr24349410wrh.6.1625841026594; Fri, 09 Jul 2021 07:30:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 15/40] tests/docker: fix mistakes in centos package lists Date: Fri, 9 Jul 2021 15:29:40 +0100 Message-Id: <20210709143005.1554-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841260178100001 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 10:39:25 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 1625841679892599.0325584404027; Fri, 9 Jul 2021 07:41:19 -0700 (PDT) Received: from localhost ([::1]:38536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rgs-0004uC-Ob for importer@patchew.org; Fri, 09 Jul 2021 10:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWa-0004zr-GK for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:40 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:44780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWO-0005aR-Hr for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:38 -0400 Received: by mail-wr1-x436.google.com with SMTP id f9so6747826wrq.11 for ; Fri, 09 Jul 2021 07:30:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t22sm5231739wmi.22.2021.07.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D08C91FF9D; Fri, 9 Jul 2021 15:30:09 +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=O4n7Kawz7UFei5kbP3yCwe84zFkQSLEtEtIh26keQ3+6Cc4mbLr++wIoFi2Q08BQyr ZEgiHHKVhTX5TOMCYIXs/MgKUwREaekVn3ExrD/4+pm0Fup6u/KxO5tdBHZQ7CJbwI6b v+IrNV3XrCf+Py27nuU1ExRgKjCJ1XCOCpyyEpQmO5HyrVko9EWR2gbdxFPXkunBOcLb QmwceyID5shxQGrulVuvVxH6EgSDu6uk1/eD+n/eZJKaIDLxYi6lyEShgsRq6FoEXXzI wx/hOYQ4ysK/hk7RRDYUNvjocRg3A2RjKDbEsqk+XPdIgCCUP4Fd3HnI0rqYPi7J3nXx POsQ== 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=iLto9zbFPRPT4e7tZ5oYigSIcqskWwjUa3IZ2jrpdrhb2h/zDwLm5JEIlnnORFEg5G xaVWDZWx54WGGchbLDtGJ8dOI4owWk4WaKkfal846DagA4J7erjgyfmSZHWDSaIZQDYB fQTrkBgfzFnKXd8JLqEdnfpfvNLkmFEy4r0Y41Aia35xfALjKISlYh9UVle8dpvCgoqB JCPnuXXqHq0BE4h1RpBcmHQbhHZ9CAJnCzwZVVRa9sCiyRpQle2w7UrNByH1UCUz18Pe MBs0mMvzpMhDu87INcaJBJCacymqyjYlb2fsKJ+boykxqKe17VkFsKdT/UiFzCBN0bgc g0cw== X-Gm-Message-State: AOAM533ReQ3BpvYSndjFELx3+8bn7oI0zeIEiLTyfwENnmOtCnbiKlTY 2BaE/c7tE1Ugt3mz6yTc4z7eGg== X-Google-Smtp-Source: ABdhPJys1QfWeY92omwglEoMuh9wBPtX55e0tOAvevyk1S4eG7LDC25mydSw6TaNFHr29bZvTHTOMw== X-Received: by 2002:adf:dc82:: with SMTP id r2mr17206567wrj.33.1625841025902; Fri, 09 Jul 2021 07:30:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 16/40] tests/docker: fix mistakes in fedora package list Date: Fri, 9 Jul 2021 15:29:41 +0100 Message-Id: <20210709143005.1554-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841680560100001 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 10:39:25 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 1625841597154603.4597294468399; Fri, 9 Jul 2021 07:39:57 -0700 (PDT) Received: from localhost ([::1]:33504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rfY-0001WY-61 for importer@patchew.org; Fri, 09 Jul 2021 10:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWc-00051L-7G for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:43 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:46688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWT-0005cg-7e for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:41 -0400 Received: by mail-wr1-x431.google.com with SMTP id d12so11808672wre.13 for ; Fri, 09 Jul 2021 07:30:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h14sm6258957wro.32.2021.07.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 053981FF9E; Fri, 9 Jul 2021 15:30:10 +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=i3RN/tEAcpD7RS9NM8D7PRFkn2HeRutNk33d3tO3Sx04SxXpKM1UkE0vhBz0ftG/DI 2gVfGb5c7WiWS/Vry22pPa5rIyLMmBp3BHj8l/FEoMHrAvRah5xoV/RGuIv5f8s0oCMU 00PJMyxE3dVbehbxBjhGu2taePQJGNIbX096QHEiyEy2IwU5RxG0V9qAKtQrtclU3gsf PFOFhnlCD7wXTyV4NcThNRvfm75KbS9cv4uX/sPvgLBkyDlcoZsyVliY3UxdAJ0jmzra /5hs+N1krQ/pFzdU2UQhnz/LVfherWE6i8DQ5p1r0eD869FyhKMZapHDVZ/fTx+vFfil GnxQ== 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=Tkjf7RAhanQmkneEhlG5aAmbw8w9ZbsZiTJ1QMMdZx4tpHmOeDkC/gtxPRyYqJGiyr xSIkJztTkwMt6gsg02Y84ts4fpEOrbJqsYAdcDj3ZEF/92DXIVqDBJJms60pP8Pv8pG1 aeMfRGtHs+TiP5c0yMXK9jFgPIOOZoskeji5M4nMva0zEwhkSeju/xQuLdB2vSVraIvC IxmDtyMPizZgj6OObFfo6j9THj2f7klEScZ6CqucJ50WsRKHW8KMejb4G0gDnajy3TSB h9cQQ3mSurZRM6FfjKKijxoOJQxiyRDRdohGFp5UEp0h5d6fhzNQGS2rfeRP4oBhusVh xuSw== X-Gm-Message-State: AOAM5317DGDJGjTWcD2NkA+9Xiw+Vq1pgTYYuR8Uu83BchMZKzKo2Tkb xwXYduAa3S/AZheq870wNtMp/Q== X-Google-Smtp-Source: ABdhPJxSAg0VxLdL/Z6WP386A2VSCGi5WkoNT1nhCTlFHljGQ1biC/wiZqLx+02vfti3kpolyyTEig== X-Received: by 2002:a5d:64ee:: with SMTP id g14mr43941610wri.66.1625841031712; Fri, 09 Jul 2021 07:30:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 17/40] tests/docker: fix mistakes in ubuntu package lists Date: Fri, 9 Jul 2021 15:29:42 +0100 Message-Id: <20210709143005.1554-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841599220100001 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 10:39:25 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 1625841988449682.956351380734; Fri, 9 Jul 2021 07:46:28 -0700 (PDT) Received: from localhost ([::1]:55844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rlr-0007x1-Bq for importer@patchew.org; Fri, 09 Jul 2021 10:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWh-00059U-3b for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:47 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWS-0005bG-9Y for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id m2so1397702wrq.2 for ; Fri, 09 Jul 2021 07:30:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k13sm1058680wrp.34.2021.07.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2DA941FF9F; Fri, 9 Jul 2021 15:30:10 +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=icbHxvmm8bDnI4Sy4LQ3N4xbdczm8L+Rrij+uAQwkD2B9eVLqSKDodXyVVJfZJwELx pS+q15eBPtyuKM3EzJiv8heVEITQXvvdTRDob8F4YtdAH4tCGhCHgTmpEZ50ayYbt1O2 QO466qCmYHGMgGhar3aYtu7n9SjRl9Z6qTiXoqDfNgz/kPD5A+S+49UnKucTKrlz2F2P WWN8doxybe/7uMUuIE/NYre55Mnxw2yc3ML2EoTCWENoZ1h1tJCCSKeiLdBDEjoDeFF4 7c2CSi7sX7uvPP/ngndSgM+76ReZ11B1/efZ5cq1jhFQ7euhjWkDMhZ4p8x86J+cvnCd zwZg== 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=kM4o5icjlj/ty75gJ+/dLOzdPU8lLINHd7ADw5/bc8AAdRySL3kuiMly+Pzg5NXOS1 LPVY3aoCfyouQK0CLZoCeB/u081dAgCaDGS96ZVf6aMhIO7jSL3Sc2RRHAA8exgGzdkh Ng732o4yN22Yx02tNUsVORqtAqzq7C91J1p9aWapm3T+maMiqPFWDvVZnzsd0lCt1DxE tG13Sn3slm49Q0BGSXSToN6PH53nxyiIseLpgr02dzLB5ApfEkE4DccNKxhoypUiGEhE +fp4PfEjeCdn6KSMg+JZWXcqll1lz1pBBletRjnaUAM5bhU70jgh+lhiLtv7Sq9uQCPx onnA== X-Gm-Message-State: AOAM530U8a6tLaOvWO9hL3u2atb2vyEM9oGgLke+xJKcHbrd75+K3Baa yA+HVWkzE4OIoXv7TlFaTLWmfg== X-Google-Smtp-Source: ABdhPJx1mC0YRPuJJUqHoFIvDUTnp9ezEf7zXCRZHKdD0DV6TbtA+iyAInPPK1W1Na/xd2PpDTzyJg== X-Received: by 2002:adf:eb82:: with SMTP id t2mr41802390wrn.337.1625841031089; Fri, 09 Jul 2021 07:30:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 18/40] tests/docker: remove mingw packages from Fedora Date: Fri, 9 Jul 2021 15:29:43 +0100 Message-Id: <20210709143005.1554-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841988865100001 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 10:39:25 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 1625841385531763.5655354854905; Fri, 9 Jul 2021 07:36:25 -0700 (PDT) Received: from localhost ([::1]:49664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rc8-0001yk-DK for importer@patchew.org; Fri, 09 Jul 2021 10:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWh-00059Q-1C for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:47 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWS-0005ap-1L for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:46 -0400 Received: by mail-wr1-x431.google.com with SMTP id i8so12383334wrp.12 for ; Fri, 09 Jul 2021 07:30:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f82sm11041966wmf.25.2021.07.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 66E291FFA5; Fri, 9 Jul 2021 15:30:10 +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=nnar00QSpkEPd1Q7PE8xyWfrSix2I6XI3lAtu4EhS+XCSvbWFsaR8e9mEXwhDnUErr sY5ly7ikCmxea53VTc7YXSP7KbrtFMODJD5dcr4pVlELpXeo2jC1ABpoT3bZc3TLRfGA qsOGhVHP39l1vPnKoT5TmuPq/iqaLF/bu5ZhTsRMfdLyGAZbdOBkSBsQJ0dbXkf49G5u pUlSf5cClTN/i4RaPRkgeQVknaw7Etv86F/QRaRC/6YrmolhZsxA0brCnHNfpQJEAjpw Ppu5RT13CAsQeqvBk+WbIRUpiNH+XCGvYW2XfQGrZT86lQvln4Srpuf3BRadpR+5ySJY ehCg== 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=ipUvulx0wzbAvwvcW9sbNOO2gKuOmBWP2gn/9a8ZLP4Iip6NAj4dnQwsl6BVNihwqn fAQe9REyJfoEUULSajizoX+8yGOxpx+/BLKuhQjVW76TT6JTjciHIVdtH62Lw7lqq3sO N1YyrBz1YxhE9x08aiurZCplEhRV7ZMiOFuwoTIn9vDEtgY6A8iy00TNQ9exyLRcI1kv QxtF6QSZUlAHneIudDrWDZaOp2wCXOKAliU5AqlM0JtASoHEfJFr2N3AQpgjcOu1BLLo ywjHxgE5NR2H7BPTvPZn9xoFDO03xMfR/Kq3Pzh9Cqh+7pl3LDkxS5KvwGRqRjvcqPUI nYNw== X-Gm-Message-State: AOAM533E2QuceCMqi8JEEtVC1nAU4RrC2JxWxcAVf9TapqiV6zywsRx0 ADPXN+A7Te5bmP6zMz0ptfqa7A== X-Google-Smtp-Source: ABdhPJyGV99/QriZbggLwdD31iF/acZpIkCPzZfFTTgnNPILXvvYoKnPnjP7PBzjKUBq20q7zpI9kw== X-Received: by 2002:adf:f592:: with SMTP id f18mr3613556wro.179.1625841029400; Fri, 09 Jul 2021 07:30:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 19/40] tests/docker: expand centos8 package list Date: Fri, 9 Jul 2021 15:29:44 +0100 Message-Id: <20210709143005.1554-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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=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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841386307100001 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 10:39:25 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 1625842676027363.37327116190625; Fri, 9 Jul 2021 07:57:56 -0700 (PDT) Received: from localhost ([::1]:34580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rww-0000ne-2e for importer@patchew.org; Fri, 09 Jul 2021 10:57:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdR-0004qu-P5 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:46 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdN-0000Fd-OK for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:45 -0400 Received: by mail-wm1-x335.google.com with SMTP id g10so6492645wmh.2 for ; Fri, 09 Jul 2021 07:37:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u12sm5501654wrt.50.2021.07.09.07.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A109E1FF8C; Fri, 9 Jul 2021 15:30:10 +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=dOwEwNL9dNoKbcLg1AyNwY/ZQ5FQ1n/tnGFHITiDhcA1YWTnXPiajao13KExwZrUKq RraJ8OMZXb1SjWizBkMzHS+wfNMGGm1iM28etY2q7e4J/CAPAJPBuiebfdb9cZijWZH1 rM8O7CxVPcP8/cXRvFgo18muDpHhV8mRPr8CeIW7JnKlmp9d6ffF3eErnA9r56pPxxrx 6ln0bfyidYr0G+TQXUe0yvFqEvNLiQJ0prJpt1qyDhxyfwurv1Qa5ggvdqrEb+gZHwbq VtfWMQkXJtO5x1M4SeWlJ83+2utUXps39ZbG4TyRAsWKicPucIryyBDOmf1PSxk1ZC2C WUCA== 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=HgdIl9Cdtp65PWFr5UHMEXaegXk6bs8qGdJ/ufg8Ha/ga2IpxFiwg+kzUach2TnB5X NMFFyFms1paznwCHJ1XST9bVm3CeJC2UFG8SPO60yvn1C5lEoDdPJ0WLxgwgWsfm2Zgj LALWT5B0EP3aMFG/UHzjmyVTXYeL4yqRFrltjtiFCIMc4Mfico5y1xztwxL4P5tgOVIO dOp0PyYSof3WFvOiI6ccsSa+8eqTDA8HDS86GJP5deZOHOMcFwTA1aElrIv9izItDprs xzeWq4znnT4XfzkvxgSxwjHILAXYc9wxHmM7r1Ri0UyH+S5oOPwE4GL2uFbBvY0KZHQs 93dA== X-Gm-Message-State: AOAM532fFDDI3WacgCof4yHIxHZgP29HKrd5aisQbBlHeql8CZdwTE+R R1aUPQM/V9WRGBzLeRPR5qs92Q== X-Google-Smtp-Source: ABdhPJzL5Vxn7GQ0yoYcr7weGfq5ObxhYD0x33Ac9pHJt5qJDQ5eyrfAIU2QGWM9XU840/i3o0Incg== X-Received: by 2002:a1c:7410:: with SMTP id p16mr41102816wmc.24.1625841459499; Fri, 09 Jul 2021 07:37:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 20/40] tests/docker: expand fedora package list Date: Fri, 9 Jul 2021 15:29:45 +0100 Message-Id: <20210709143005.1554-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842676731100001 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 10:39:25 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 1625841843938656.7484447492856; Fri, 9 Jul 2021 07:44:03 -0700 (PDT) Received: from localhost ([::1]:47226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rjW-0002B4-Ry for importer@patchew.org; Fri, 09 Jul 2021 10:44:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWa-000508-J9 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:40 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWS-0005ai-3U for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:40 -0400 Received: by mail-wm1-x332.google.com with SMTP id k32so3253400wms.4 for ; Fri, 09 Jul 2021 07:30:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p11sm4440982wro.78.2021.07.09.07.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CB8F21FFA6; Fri, 9 Jul 2021 15:30:10 +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=BQCTmaboIE3f31NI7DH2eYzek+nujMmyXPnHp2Q4/Y6ZF+C+ow2c/iSi2yfid3I14X s0ZvBGpMZcFSVXWIhgAPN+I6QsUkXvQvmoiK31vy13T2kdzKA8jBBL+JRsrdOjJVSoo8 mcj1n12X/EwkK/8EI7KSP7eRrJAo6QUiEn4AkotKjw2poIvntBv4c0Vlu5eW1NJcloLE d7I2aOj8nRG317vqpmAcuP7RCQazDZIhka1wgFwo4XvUAH8rAqir0ak0733MbwR/HWjg x80gN1acgIkCOJD0HERTOm+JNCyMkyJj1498vNNlpTXGup2bfkBtt1eVb4eNpuzheO04 k4UA== 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=hieMqKI96kN0jTHPseu3HF5WBR4rQ6U06iLDQaY8ZJp4bgkEAd4N3hXxVBsPJlWUpR mJ1A3n24VBYDhv7X8Uva/Z8e/0klBCckgPvKnmyDQwXWndSovyo44ma3Rr53cOWQONgO XaQd0X9ymlRRIn48ca99nVv86HqsyhYmjo6Wdbywt4JoC4HtHFabYWSUNQXDuKOX+PPu vUhWA070NJFmixL51jIZ6A8uornRcOoH475JFTVJL0eLYRknBDBFarLh7lde7z6vKm22 EYYrkAwFw+TiTno9FulPAN1jUDLICI3OVaW4C8kqdRVTjSwqzCFQBsiF22a6SHQQiuGU 2M2A== X-Gm-Message-State: AOAM533rbv1Kt+99g9r6UxM2ngg+JyTd22M31GfVkkKqj5wLqclY1hYJ +eQ5r4dyzv4XCiniG5ww6hG9yw== X-Google-Smtp-Source: ABdhPJxvkL1/fTy8l5mC8YPFsVyBNbA3CNzLSf2kRicwtJPeVDR1fGNrlfIi3X5GUd1VLcypDYcedQ== X-Received: by 2002:a05:600c:154b:: with SMTP id f11mr12635622wmg.82.1625841028419; Fri, 09 Jul 2021 07:30:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 21/40] tests/docker: expand ubuntu1804 package list Date: Fri, 9 Jul 2021 15:29:46 +0100 Message-Id: <20210709143005.1554-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841845079100001 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 10:39:25 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 1625842032645527.2589702246701; Fri, 9 Jul 2021 07:47:12 -0700 (PDT) Received: from localhost ([::1]:59028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rmZ-0001dd-Ij for importer@patchew.org; Fri, 09 Jul 2021 10:47:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdR-0004q8-Em for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:45 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdK-0000Dq-5G for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:45 -0400 Received: by mail-wr1-x429.google.com with SMTP id a13so12426005wrf.10 for ; Fri, 09 Jul 2021 07:37:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u12sm5501511wrt.50.2021.07.09.07.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 023AE1FFA9; Fri, 9 Jul 2021 15:30:11 +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=g1IkrS/pBLh8PjekjpNkTTq4yR4EhUaLxX3OQWDEGinrdjB8K250OoIPeMhFNL0ZgC h19Qke/V57RKUPxqKWQgQAvcJIMMdP7Et87ZDA+a4lsv0GEsnRW3kLmKvBV+MNugJKi1 cfZL86jrArJmLCTSr5l5v3fb+gqCbzlw0X+6YzFILTnYzP9afBPyigJc5MfjzJ/alrZl 5+OMsKFlE8G0uq92kgH+30etVo2PhM0ID33xoFABekItXf49CrsfrLiC7c2V9lK59vuM Ey7bjE0zC8hRDu5lnideRQAeAEHu1Mi1G5iH8Kl3uq69pUryjppjJ2Snt1aqjOY2idzf seLg== 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=eHQAzqKtpTH6Lr/p1wtsnn1ZXw8tqXksEaKxLRdqKLb7ujg+jEmv05zgolnKsqbM/3 +V3E3BRQWNieEkVhLglGJv/pVYj4hwuv2gkJB2JIiY8tzNW1HNnS7QV3AqHc8hjAXdqx IzKePmxMxvQipph5Qatp1I9eEHZWuUoe+4GJdvRtQsuzYsSIh5/7ZguFSCE25hJlNmxc 423S8v6JX5rA5mUwhnlTl6tWTra/8Rtk5fRsasjToC1UiRH5aZSJCzSDzyku5nhNW1/u 7W8jyE9D9+qVVeuUWw4aL2Sv2iKQyxqGsDZZ1pLc0Y0nk1+4qbFtnKdrXecltFOR/9/A 3Dnw== X-Gm-Message-State: AOAM531EuQo7BGXfuIlHl+onj5Jqp9E7MkvnGxkntdGiv+W47OY+i4Bx yb6Xsfqf+ikFnCN77LhaiG6DTQ== X-Google-Smtp-Source: ABdhPJz1DDuizRgZrXKzBVrdb02as+Odu2vr1GQ7kaQat1isblp46hGGFSM+ykbhPISrxg+/qJP/wg== X-Received: by 2002:adf:e10c:: with SMTP id t12mr41559906wrz.36.1625841456455; Fri, 09 Jul 2021 07:37:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 22/40] tests/docker: expand ubuntu2004 package list Date: Fri, 9 Jul 2021 15:29:47 +0100 Message-Id: <20210709143005.1554-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842034273100001 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 10:39:25 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 1625842208439907.0932687924768; Fri, 9 Jul 2021 07:50:08 -0700 (PDT) Received: from localhost ([::1]:39556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rpP-0001Ii-Ay for importer@patchew.org; Fri, 09 Jul 2021 10:50:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdZ-000577-3x for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:53 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdR-0000Gh-4F for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:52 -0400 Received: by mail-wr1-x429.google.com with SMTP id a13so12426510wrf.10 for ; Fri, 09 Jul 2021 07:37:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x1sm12584109wmc.0.2021.07.09.07.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F63F1FFAA; Fri, 9 Jul 2021 15:30:11 +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=wUy7RXdKogMqUjnYo9mo0WvZrU9dg/zQfXh8FP3tMXruXGMEmm3s1OD6MqAf6LZHT0 ELzc99x1rgH7gnrrTtQtLGtJLbO1HVTncaRIL4b2chKtLE5DlUKsjZtcuQJ94R8FAU2E i90ktvNTQDFn92dkUYbRe3ZUjw1LevXYbFnmJnXN5a/oly0CQU81OE8eOCLt8an2POUO VX60LlCK5Y3OGMmXcJlmPiJvrGqNSwEcWathUQKLeKaLuHBFshIcYnLOBvmZ7U0CUBJr q3r9LIZ+i7mdCZcPaY4w/0TAn9Za+Re3VoThYjb1NquJ18NXWph6OadAbo+otT7dfFCO J3jQ== 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=MoG31Ll9spur53EHHZN/Qsj6Muech+kxZHSV/tGdVFCZZ+8+KPGOOC48kpDCVbuRT7 VOxsftzxw0YntT2aI0sbPENwlvcgaNtV2FkA4cOxbjjX5tqnimwni/kK/45FhDABfftr KtJYuZ7oQNgCjhShXhXIKvEL7RGz3eSP2yPyBakDcgmKjGGIvmdkfNJj+MrNfEwlItMp SrWwui0d1MIX3WNh/PHh8ZthxAIBwD/3LLMiOsoNb2PPRoEZCNzzM1/lPTDDHunb8Pzz nnutfjMjkd/wKVIG7TZ5pmxm5bPJYoLENWN3npUlDu7gX6RrKY9aeqd9uFhWgcqwbR2d jcSQ== X-Gm-Message-State: AOAM5331gRVlBjrkEIVTrGNRqPM0hbbLIDFL5b7aRnld7QaPkq0Y70/b Y9HxFwxl1V/ravIlsl+FDJNeAA== X-Google-Smtp-Source: ABdhPJwZ1xUcELkIFr9RUfB6icNzIWGV9XjvTIYKfxwkUwMlFJJbnMXo8B4zXT4IZPmQEJFAQfZORg== X-Received: by 2002:adf:e107:: with SMTP id t7mr42169485wrz.165.1625841463428; Fri, 09 Jul 2021 07:37:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 23/40] tests/docker: expand opensuse-leap package list Date: Fri, 9 Jul 2021 15:29:48 +0100 Message-Id: <20210709143005.1554-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842209507100001 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 10:39:25 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 1625841743698756.5457384517949; Fri, 9 Jul 2021 07:42:23 -0700 (PDT) Received: from localhost ([::1]:42310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rhu-0007ON-L3 for importer@patchew.org; Fri, 09 Jul 2021 10:42:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdJ-0004cm-5u for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:37 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdC-0000AE-Mr for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:36 -0400 Received: by mail-wr1-x432.google.com with SMTP id r11so7193402wro.9 for ; Fri, 09 Jul 2021 07:37:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u16sm6544980wrw.36.2021.07.09.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 696371FFAB; Fri, 9 Jul 2021 15:30:11 +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=AXYceRNDEgMmf7p8r8O9MlDFNaWM+9qmgYn5tmPh0fVPJgZPw2JcCR/DpUftBiZLFG 6oEDaCVwEZzj1Vv6W6YN1GLKDMGNBkKYPf3grerhMqUBGcARF+he+ocEggAuA8llt1rN UYL7rgnc11d+Z40+TcDmn4H1wXyptsS74fNyyIMehtFPg3qaDM+h8S6/kvuoQ/Cv7Dil 34NLaL3Arl0nDjJJUc039sxAG4/0rZW2twd1lu3a/w3OEIo/RczQ6WpWpSu0THu/CrWS uR1okzi/slFVDGPBrrJ4wquPCMDs/58cUHkW1ABlRyp7qejklD0rB9N4irMlpdf1HdDg Tbpg== 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=jCAqoaCf2LsTzMrOStsZo2/ed/WcaC5KsyZpkJoBJIJ3ffSbjNdvPMKXyHUbHQ3JRI IMN7RFDBFkzHI5A2X4AHjfPhL6lDkCMm63No7eSL9MposJZZ1W9pWBYD7lhLp3PM30WA xebDRzOAjT5YMAiqFWn/tyZKggN9qTn7aSObA2sJRViY8ybNPcyNjW7wqXEWZyVFeHa1 lC128/wWKW2BJ7qrlsGh1Mgc7REbY+2yyddc5qqed3MowulKUFOmKu7MbE5swPzCzLOb RTjUJnE1ktI/fOHNmr9Xn4el/ZPm8w6DkIhDYZoLIPx4on9o7zgyOWSVOMHWFITIFf31 WFrQ== X-Gm-Message-State: AOAM532lbDxHemBDQJhuehKSQfwVt3hZ2nc2D5KNlNt83Hc5KYTGYXGd TplnJTQ+jCHUf60Y4tRp93vG0Q== X-Google-Smtp-Source: ABdhPJwhkUod1Qmj4Okkvjtn45Y3c0XdWodr0F38wNH6WyvIEXmSMQYgQf3oej3b5pib8BbFw1vv9g== X-Received: by 2002:a05:6000:1379:: with SMTP id q25mr40964293wrz.188.1625841448181; Fri, 09 Jul 2021 07:37:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 24/40] tests/vm: update NetBSD to 9.2 Date: Fri, 9 Jul 2021 15:29:49 +0100 Message-Id: <20210709143005.1554-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, Gerd Hoffmann , Kamil Rytarowski , Wainer dos Santos Moschetta , Willian Rampazzo , minyihh@uci.edu, cota@braap.org, Reinoud Zandijk , Brad Smith , Thomas Huth , stefanha@redhat.com, crosa@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , berrange@redhat.com, f4bug@amsat.org, robhenry@microsoft.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Ryo ONODERA , 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: 1625841746642100001 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 10:39:25 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 16258427090561006.6618513705783; Fri, 9 Jul 2021 07:58:29 -0700 (PDT) Received: from localhost ([::1]:36924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rxS-0002L2-TE for importer@patchew.org; Fri, 09 Jul 2021 10:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rmw-0003CH-El for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:34 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:33671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rms-0004Lc-LO for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:33 -0400 Received: by mail-wr1-x436.google.com with SMTP id d2so12554721wrn.0 for ; Fri, 09 Jul 2021 07:47:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm5457023wrw.56.2021.07.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A3A9B1FFAC; Fri, 9 Jul 2021 15:30:11 +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=OnuKpWaJi/pL6JfYRT5jolc0Tn6d3QbxTsBRa94razu3N/ChsOXfP6He8Js6HBcSg5 9zn/3vEVWE0KuJBVbZOqdgc3t+mkYndz89VJYjnMPHulud9GD7OKC3ZaS9NN6ZAYVUNj rdqx+HPBGyI1hJUi8C+sG+CqcZ2WNQr2OPyIU0WUPTp/K3evuFOiTtjphz58c/c7Hjt6 DokuTjZosCueRAHv7ShcSU88mYvpmyPYJjsI4RCksqxorKc4Dk5ZrzsBQTMrj8KFQ2Bg +BBtkpxc15eVwrQgFIU2aUvfN2Eio54j0jXoXG5tFpYRaYaZmeicsJR4W8WAtElM5Kjo mKfg== 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=J9ySXYk1u4/Q6l+6+1D0H4qjNSlJLkjqgPzecrnMDaGSSMY8BdLdtOJnhf7q30p6gm R9qaGlmWpwSoW5E08O8/cdiY6w42bUAcHgkpoD06Tt0amsIrW/ZrBRkbtYbkqc1Kwxee ZTzEYDwZb7MGYsxIlyvtYxdG91pbOvvw2Cwc03+qmHVypzQ66dFWP5BVdiYIK2Q5Krqs qQ/2unPy5rsp4F6lgsmBya4Ow6feVyrEIbacnvmeDj2091vr78PHq5JIM1jcigBruQLz 0Vqu0AcQ9m5LzmqYNr2iJcEcQpJpwaualnQurmcJxGsp4TKFKak4p/6I1uKUAmldvr6q eSyg== X-Gm-Message-State: AOAM533Ruz+HrFLK3sHN1zstbahZRs/HrYt8lV9I0+iGbUF+6GSJfD7n 1lbMT+SIXgGlb+QhFRuYlS+iWw== X-Google-Smtp-Source: ABdhPJyRaEabvynvbw+KyL45uYify98yd6MhlT5JKhwQsTma0zOFYqVOvMstRrIHCSbScwBsPK4WVw== X-Received: by 2002:adf:d236:: with SMTP id k22mr17486531wrh.392.1625842048290; Fri, 09 Jul 2021 07:47:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 25/40] tests/vm: update openbsd to release 6.9 Date: Fri, 9 Jul 2021 15:29:50 +0100 Message-Id: <20210709143005.1554-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Wainer dos Santos Moschetta , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842710678100001 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 10:39:25 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 1625842588528607.3119615402502; Fri, 9 Jul 2021 07:56:28 -0700 (PDT) Received: from localhost ([::1]:56262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rvW-0004tf-EN for importer@patchew.org; Fri, 09 Jul 2021 10:56:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdO-0004nO-BF for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:43 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:41692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdJ-0000Dk-8I for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:42 -0400 Received: by mail-wr1-x432.google.com with SMTP id k4so6154189wrc.8 for ; Fri, 09 Jul 2021 07:37:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 11sm7441712wmg.40.2021.07.09.07.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D7E3B1FFAE; Fri, 9 Jul 2021 15:30:11 +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=Zx6fx7Pip4aXrkap6Yt3wuj5u2/wTlufg0YMoYBwslY=; b=WQ6e2nPJS/sbG2EAWOhNKjEG72dP9pLcPU5oCaM1Rgdawtrlx5i7Ae4Y49KYHmVMXD FPHogKmHQiaFGToA8QWm+uVS8AO+cEWrQ7q5IXJ62E4ETRXUUnmPL0fZHjBTYmuyO3N9 b72Dl7fYggoNL7NrvwrYZmjDP3/sLkWhX9nFvgS7EDAhX2Tmz5FmGwEG9xIqv3rHbxa6 +bvqJhK9REF6IA5e9dD+PZb+t60CVGI5AknJjhiiJ4LvdMgq6b1lCt0uHxEfXBt+Gikv vcohMDy+iYbfjyaPLTaEv+De8SXCPxqZ5PXxgzHLgXyyMC8lVGPN5j1v42qz4Qj5a3Qx gXPw== 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=Zx6fx7Pip4aXrkap6Yt3wuj5u2/wTlufg0YMoYBwslY=; b=i/n0HgSIhhylVct/YkGQmNR8DAD9sjv79dZ3xiKObx9id/WnznQfQhZK5QdL3plXWx rR8eaw2v53FqdksO3tHPe0O8s7XyoJd/Lb90cPQKJaqcIeiRunvTIjBGEIPml/2nkpBp WjOefp79S6sgrAMkGHc2U/K9QzqFmSeOSID0p5DSoCLXx9SckhWYupF4PiWYcdY5cVLm N88AKfAIV0ed3GdIcr0jOBo2jrFP69SBn7aKrdeBxtAEOIqf5x5uj+06hobgE3doqelA i4XlrGjOBhV4FXBb0gTG9gDyb64rCJwBVS7izmAWZzrsims2aRbg5KGkM2N75rbUOf0J kirA== X-Gm-Message-State: AOAM5314t4EvCZoE6gaVSXPPKuUGF89AuK9K1G9PDZT34Ar0UI1J779V SEQi1eaZIAibyOzR+tx456LEkA== X-Google-Smtp-Source: ABdhPJx7oIbpm11v4I9hkWmsh8lm3K58Naj027PU8hfct7NSIK+W9DNJ+VnAJFohGH2mVzIlty7+jQ== X-Received: by 2002:a5d:48c6:: with SMTP id p6mr42032057wrs.45.1625841455741; Fri, 09 Jul 2021 07:37:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 26/40] tests/tcg: make test-mmap a little less aggressive Date: Fri, 9 Jul 2021 15:29:51 +0100 Message-Id: <20210709143005.1554-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Taylor Simpson , 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: 1625842589916100001 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. While we are at it clean-up the white space and style issues from the legacy code. As we no longer do quite so much needless memory access we can also remove the hexagon timeout hack. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Taylor Simpson --- v3 - style and whitespace cleanups, reduce loop even further. - remove hexagon timeout hack --- tests/tcg/multiarch/test-mmap.c | 208 +++++++++++++++--------------- tests/tcg/hexagon/Makefile.target | 9 -- 2 files changed, 104 insertions(+), 113 deletions(-) diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index 11d0e777b1..96257f8ebe 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -49,64 +49,62 @@ size_t test_fsize; =20 void check_aligned_anonymous_unfixed_mmaps(void) { - void *p1; - void *p2; - void *p3; - void *p4; - void *p5; - uintptr_t p; - int i; - - fprintf(stdout, "%s", __func__); - for (i =3D 0; i < 0x1fff; i++) - { - size_t len; - - len =3D pagesize + (pagesize * i & 7); - p1 =3D mmap(NULL, len, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p2 =3D mmap(NULL, len, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p3 =3D mmap(NULL, len, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p4 =3D mmap(NULL, len, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p5 =3D mmap(NULL, len, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - /* Make sure we get pages aligned with the pagesize. The - target expects this. */ - fail_unless (p1 !=3D MAP_FAILED); - fail_unless (p2 !=3D MAP_FAILED); - fail_unless (p3 !=3D MAP_FAILED); - fail_unless (p4 !=3D MAP_FAILED); - fail_unless (p5 !=3D MAP_FAILED); - p =3D (uintptr_t) p1; - D(printf ("p=3D%x\n", p)); - fail_unless ((p & pagemask) =3D=3D 0); - p =3D (uintptr_t) p2; - fail_unless ((p & pagemask) =3D=3D 0); - p =3D (uintptr_t) p3; - fail_unless ((p & pagemask) =3D=3D 0); - p =3D (uintptr_t) p4; - fail_unless ((p & pagemask) =3D=3D 0); - p =3D (uintptr_t) p5; - fail_unless ((p & pagemask) =3D=3D 0); - - /* Make sure we can read from the entire area. */ - memcpy (dummybuf, p1, pagesize); - memcpy (dummybuf, p2, pagesize); - memcpy (dummybuf, p3, pagesize); - memcpy (dummybuf, p4, pagesize); - memcpy (dummybuf, p5, pagesize); - - munmap (p1, len); - munmap (p2, len); - munmap (p3, len); - munmap (p4, len); - munmap (p5, len); - } - fprintf(stdout, " passed\n"); + void *p1; + void *p2; + void *p3; + void *p4; + void *p5; + uintptr_t p; + int i; + fprintf(stdout, "%s", __func__); + for (i =3D 0; i < 8; i++) { + size_t len; + len =3D pagesize + (pagesize * i); + p1 =3D mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p2 =3D mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p3 =3D mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p4 =3D mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p5 =3D mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + /* + * Make sure we get pages aligned with the pagesize. The + * target expects this. + */ + fail_unless(p1 !=3D MAP_FAILED); + fail_unless(p2 !=3D MAP_FAILED); + fail_unless(p3 !=3D MAP_FAILED); + fail_unless(p4 !=3D MAP_FAILED); + fail_unless(p5 !=3D MAP_FAILED); + p =3D (uintptr_t) p1; + D(printf("p=3D%x\n", p)); + fail_unless((p & pagemask) =3D=3D 0); + p =3D (uintptr_t) p2; + fail_unless((p & pagemask) =3D=3D 0); + p =3D (uintptr_t) p3; + fail_unless((p & pagemask) =3D=3D 0); + p =3D (uintptr_t) p4; + fail_unless((p & pagemask) =3D=3D 0); + p =3D (uintptr_t) p5; + fail_unless((p & pagemask) =3D=3D 0); + + /* Make sure we can read from the entire area. */ + memcpy(dummybuf, p1, pagesize); + memcpy(dummybuf, p2, pagesize); + memcpy(dummybuf, p3, pagesize); + memcpy(dummybuf, p4, pagesize); + memcpy(dummybuf, p5, pagesize); + munmap(p1, len); + munmap(p2, len); + munmap(p3, len); + munmap(p4, len); + munmap(p5, len); + } + fprintf(stdout, " passed\n"); } =20 void check_large_anonymous_unfixed_mmap(void) @@ -135,52 +133,54 @@ void check_large_anonymous_unfixed_mmap(void) =20 void check_aligned_anonymous_unfixed_colliding_mmaps(void) { - char *p1; - char *p2; - char *p3; - uintptr_t p; - int i; - - fprintf(stdout, "%s", __func__); - for (i =3D 0; i < 0x2fff; i++) - { - int nlen; - p1 =3D mmap(NULL, pagesize, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p1 !=3D MAP_FAILED); - p =3D (uintptr_t) p1; - fail_unless ((p & pagemask) =3D=3D 0); - memcpy (dummybuf, p1, pagesize); - - p2 =3D mmap(NULL, pagesize, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p2 !=3D MAP_FAILED); - p =3D (uintptr_t) p2; - fail_unless ((p & pagemask) =3D=3D 0); - memcpy (dummybuf, p2, pagesize); - - - munmap (p1, pagesize); - nlen =3D pagesize * 8; - p3 =3D mmap(NULL, nlen, PROT_READ,=20 - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p3 !=3D MAP_FAILED); - - /* Check if the mmaped areas collide. */ - if (p3 < p2=20 - && (p3 + nlen) > p2) - fail_unless (0); - - memcpy (dummybuf, p3, pagesize); - - /* Make sure we get pages aligned with the pagesize. The - target expects this. */ - p =3D (uintptr_t) p3; - fail_unless ((p & pagemask) =3D=3D 0); - munmap (p2, pagesize); - munmap (p3, nlen); - } - fprintf(stdout, " passed\n"); + char *p1; + char *p2; + char *p3; + uintptr_t p; + int i; + + fprintf(stdout, "%s", __func__); + for (i =3D 0; i < 2; i++) { + int nlen; + p1 =3D mmap(NULL, pagesize, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p1 !=3D MAP_FAILED); + p =3D (uintptr_t) p1; + fail_unless((p & pagemask) =3D=3D 0); + memcpy(dummybuf, p1, pagesize); + + p2 =3D mmap(NULL, pagesize, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p2 !=3D MAP_FAILED); + p =3D (uintptr_t) p2; + fail_unless((p & pagemask) =3D=3D 0); + memcpy(dummybuf, p2, pagesize); + + + munmap(p1, pagesize); + nlen =3D pagesize * 8; + p3 =3D mmap(NULL, nlen, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p3 !=3D MAP_FAILED); + + /* Check if the mmaped areas collide. */ + if (p3 < p2 + && (p3 + nlen) > p2) { + fail_unless(0); + } + + memcpy(dummybuf, p3, pagesize); + + /* + * Make sure we get pages aligned with the pagesize. The + * target expects this. + */ + p =3D (uintptr_t) p3; + fail_unless((p & pagemask) =3D=3D 0); + munmap(p2, pagesize); + munmap(p3, nlen); + } + fprintf(stdout, " passed\n"); } =20 void check_aligned_anonymous_fixed_mmaps(void) diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile= .target index 0992787d50..050cd61c1a 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -18,15 +18,6 @@ # Hexagon doesn't support gdb, so skip the EXTRA_RUNS EXTRA_RUNS =3D =20 -# Hexagon has 64K pages, so increase the timeout to keep -# test-mmap from timing out -ifeq ($(CONFIG_DEBUG_TCG),y) -TIMEOUT=3D800 -else -TIMEOUT=3D500 -endif - - CFLAGS +=3D -Wno-incompatible-pointer-types -Wno-undefined-internal CFLAGS +=3D -fno-unroll-loops =20 --=20 2.20.1 From nobody Mon Feb 9 10:39:25 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 1625841913990464.16594016186366; Fri, 9 Jul 2021 07:45:13 -0700 (PDT) Received: from localhost ([::1]:51644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rkd-00055O-QE for importer@patchew.org; Fri, 09 Jul 2021 10:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdO-0004m7-1U for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:42 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdI-0000DO-EZ for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:41 -0400 Received: by mail-wr1-x434.google.com with SMTP id i8so12414535wrp.12 for ; Fri, 09 Jul 2021 07:37:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t22sm5248390wmi.22.2021.07.09.07.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A1251FFAF; Fri, 9 Jul 2021 15:30:12 +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=SM3nhJYGRMl4JOlKoDgGk/W9n5D8WCblYwwfamyCKLA=; b=Rzi9pcOmK6iGAOhnaCbYXwyCL+iYzP8ZltiVnOkl484829hyGw/32DJFeQ5dAOuW4n c44lWKMtFu4fXpxxA1oDGh3+kvXuBmxtOMytARe0DMkOLpl/6q41ucAGbga5zfmhAcBS NgGEyWZmShyE/kqZct9TheKunw0cv0rT7eNE0dIvhBS0VTiCqPeBbCKLLszrXPgbsWNf +YQSCZDgRjBOV8Y3XX5wFCPuZu1H19tN6NEmPJI6T3aZZcf5v3ONN+7YqC3KTLxJgCUx /T7DkJAdOOkth9HekFdSMRnSkascoA9zvcePwDDBflwFraUOZfMZqlkuP8laQRd7mHA8 i4kw== 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=SM3nhJYGRMl4JOlKoDgGk/W9n5D8WCblYwwfamyCKLA=; b=njCYOovrF9pdjYiiD8LYa4Bbziww2N1u9jfd/YalwIjkJFzMIEn2vKqpWi4u4x+WY9 slZ/HOVMk9OsH7CmIf+Czn6VQozSE+etdEyk00Sm2u3DgNbpqyw2xPph3203nPo9pMWZ FU8u1ZRsDhrHlu2j15nwZ0KbrfVnBlyvXJcWMZ7ywHQWEZAKc4KU89n3ZCvBjr7Mdvet mjlRyaYi/icpQN2yOblEv869W0Twns0ayGHBzlxG1wXMB7+eyy/Po1xjJ/9TQUeJhxlH eHSpoajce82gsE7LSjrGtmQuJRhnHvC8PSIsmizLtZAb9DXPBhFOgeU2CmmA+QbQDtXo a+Iw== X-Gm-Message-State: AOAM531PP7hGhd41zUuQOzAXfC+dATk2A9MukUaabqpKk2jZjQPgoqqH eplW9r9akU46TazfrrUgMfhUag== X-Google-Smtp-Source: ABdhPJx1Zr0+UCzb4/qrCkM0/4B8w7zJAFWpkk/YyROvoOShmcWBCn9sM3ROhYAzv2msegTcBOY7PA== X-Received: by 2002:a05:6000:1a87:: with SMTP id f7mr41649696wry.172.1625841453306; Fri, 09 Jul 2021 07:37:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Date: Fri, 9 Jul 2021 15:29:52 +0100 Message-Id: <20210709143005.1554-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625841915747100001 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. Reviewed-by: Richard Henderson 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 10:39:25 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 16258417503883.70458181211427; Fri, 9 Jul 2021 07:42:30 -0700 (PDT) Received: from localhost ([::1]:43040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ri1-0007sf-1d for importer@patchew.org; Fri, 09 Jul 2021 10:42:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdL-0004jJ-OB for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:40 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:45643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdF-0000By-Ig for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:39 -0400 Received: by mail-wm1-x32f.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso6441152wmj.4 for ; Fri, 09 Jul 2021 07:37:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q5sm4901001wmc.0.2021.07.09.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 574671FFB1; Fri, 9 Jul 2021 15:30:12 +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=KOHjsPYSbu3jA24kyzt0tq90eAKTZSBrFYknNG6hTgw=; b=EOH9m7u7AGxea1QqIhmJ4V5d+qz2dibjtXh37z0Ir66BGyXyF3HGVy4kwyUvHITM0t F6SHOFb3IhSOycasXIuHLQbHUnyrCcUMWsS1ExwfPQwpiguE5TjfdnZ1Mmk7VCgjkrt0 hfi69NKRsJKlcgL5jl0l3h4ioMs2J2lzIMz5b1lASIACWW1qM94vPPR3bWcQitLUl6/U 5GQ9GtLfA1i+tME2zrhXKeL/CLyolmWhkhZeigQjFJOwQQAAuJkKTcj60hIBTi7dDMbD c5vo+qwF2FCFEqpTc/Hd41pv46v93r/3yEn+coe9RFdK3bbxiGU/yJJw1w4X8sr3h7vX pMTg== 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=KOHjsPYSbu3jA24kyzt0tq90eAKTZSBrFYknNG6hTgw=; b=hpAukXu6xdWflxEC5cXMelULP9g1WNDz9wGrDs7xOugizihL+qoBjV308ouRheTvsX ktUOMeyhv1o5fjo9j/UL6+25Zjl0ujn2vS3Y7RLzZZgKxGZr62x2TFXE7Rkg+LulhlDU cqb2qBQ7vFPnDCmMLS+7GkvTRBhL9J819Hr+D/jVmZRshV05xD9XhOiBwoyJSWFsvCq2 ocy01BPZoqPwMwNMIFM7ME8zS/nzRetpKde/PH3rv3+eu0eS7fbPu52axC9ATBJfruWZ 34mNmHuAYon6bAIqDWNxBPngeX2TDKkw0eZ3Wz55jzOmzpYMHx9SmgRSyX4P1N0B/zdC cuPQ== X-Gm-Message-State: AOAM530r+8tH3c3EoTjyB5ASHpUfjyDjNAjsInOwWF+DgoilY5Oepny6 GecpJFirEsIxgo9FN1xQHJ/Hyw== X-Google-Smtp-Source: ABdhPJwC4215T8J5n1zrxRSbHlpGDYuLHWh8+DJK4oU45//plxqS+NqHHqURSdr73tqqdcnCIF1l+g== X-Received: by 2002:a05:600c:154a:: with SMTP id f10mr12064311wmg.26.1625841451337; Fri, 09 Jul 2021 07:37:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 28/40] meson.build: move TCG plugin summary output Date: Fri, 9 Jul 2021 15:29:53 +0100 Message-Id: <20210709143005.1554-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841750718100001 Let's put it with the rest of the TCG related output with the accelerator. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson 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 ff7a9f8b4f..ba680addda 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 10:39:25 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 1625842948523373.5081288793607; Fri, 9 Jul 2021 08:02:28 -0700 (PDT) Received: from localhost ([::1]:44884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1s1K-0007iI-Cn for importer@patchew.org; Fri, 09 Jul 2021 11:02:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdU-0004wp-P5 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:48 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdM-0000FS-5x for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:48 -0400 Received: by mail-wm1-x334.google.com with SMTP id n33so6478010wms.1 for ; Fri, 09 Jul 2021 07:37:39 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m7sm11329561wms.0.2021.07.09.07.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A2DE91FF90; Fri, 9 Jul 2021 15:30:12 +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=iU8L0Ap5ctGyeW1KGsFu33xRFiU8S734P5wZon43zrg=; b=USATmDvK/uTxONOdbabTC26Fmj5/GBiam8CmoKs4KP7VaNotEa/Z10JvRiY49szbCB njLAte/DLHJ2toV1Mt9SRBRFsmZZVgCd9kAXtUFviX7KpD7P9t/E5Xj83LZeqkK/gl8T Gn/OgArsL1CuKM3viLynnBiCcs1+96ixfhqIVObaBd22jlSdJycqCDZfLp2sbVtGeMBX 8E+t9f2a8UV7ZFFzw5KNXzl4zx1qHJAMouJDG+TZDDxuoqz1ZuieyQH9AsflO/rGvA+o mpmT9K7eseDYbHaaUvI28W55M6WB2rt/JkAlQB1E5tqwl4DhOqZPmUxliJ0Gtez8tKYi cVrw== 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=iU8L0Ap5ctGyeW1KGsFu33xRFiU8S734P5wZon43zrg=; b=s8UK6hIX9Jr5Mvzyk4vcSt48ZvMCEQP/Lxm2opegSxBbAlVKTvjHF+C3L3/QqObVw9 akWY+L7zuhFqB0oumrqeOcOLzPKxG/BCSu3a6np1FmIeGz281FDXBxyV9OWXnQ+VHzI5 BQHYdT0s7Sh8vKvd2DfC77zjYClS3N+GWhw/Ck55o6LoOyc4+K6upbNBVAvuJdh1rADI J0ojaLexxiiU+8YYFxYFNC41z1ou6WFWA5fhLDy1hTmqP/rQybTByXwG1FI2KVrTlF8V MFXWEvur60F4J/Y49GVk7KdWuojxj0e7jMKeHGvn926sdPmXYqW4cYsCKCuAP6o8t/28 61xw== X-Gm-Message-State: AOAM530vl8v7zvovg4LU719zQO4m9zmmPuyRl95QqDGBn8GcE+0DxGmv Kut6tjOyi46rxD8BOTm8OGQ/jQ== X-Google-Smtp-Source: ABdhPJzGMmPclr84EYLLKeOU0krj3aS6BS381TCBoi1fH42apoORpRkyXosJDGy+A6eW7fHdFys38w== X-Received: by 2002:a7b:cf03:: with SMTP id l3mr16307679wmg.110.1625841458455; Fri, 09 Jul 2021 07:37:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 29/40] configure: don't allow plugins to be enabled for a non-TCG build Date: Fri, 9 Jul 2021 15:29:54 +0100 Message-Id: <20210709143005.1554-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842950237100001 Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e --- v2 - error out after all options have been processed --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index 650d9c0735..7f906be68d 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" ;; @@ -1563,6 +1564,11 @@ for opt do esac done =20 +# test for any invalid configuration combinations +if test "$plugins" =3D "yes" -a "$tcg" =3D "disabled"; then + error_exit "Can't enable plugins on non-TCG builds" +fi + case $git_submodules_action in update|validate) if test ! -e "$source_path/.git"; then --=20 2.20.1 From nobody Mon Feb 9 10:39:25 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 1625842754180564.0519725619694; Fri, 9 Jul 2021 07:59:14 -0700 (PDT) Received: from localhost ([::1]:39058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ryD-0003iN-7H for importer@patchew.org; Fri, 09 Jul 2021 10:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdT-0004u8-H1 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:47 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:40491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdR-0000HF-F7 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:47 -0400 Received: by mail-wr1-x430.google.com with SMTP id l7so11520039wrv.7 for ; Fri, 09 Jul 2021 07:37:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u1sm12496277wmn.23.2021.07.09.07.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CACDB1FFB3; Fri, 9 Jul 2021 15:30:12 +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=4tf6f4EfVwE6wKq/VA+ZpZ7sEgtGzPQDIrYTfwBXbX4=; b=I36vqi2R0l58wEyntdwvMfEqIa8+Z2zb5ymIqeum4wL1dnPHfFMaKAErHMCP+fdQSh dhpwb7QqgsUtnm0etXx5UNk0lciAow5ndKDIaKuwCR7E9pGseQpDHPJGXrHokvjm7qfy be2iqU8nk/5xKFY5oWTHFxmDbvVj7q47IhZFe2wVCxxYVQgzRhE8UjdqCvU26ruJEiUE GxqowW0iSX2N9rcZE7TrhAGRvP25fJ2CzITNINzhkMP9oevEcK3p0ijV1MjGp1NbG85K LX7IsdtdsMLbsOa9U5Fa+LrnluOZVftATA4Yi0n+y5w0CLvKlmzjqD2FBghNcWo3ac/u 1Wsg== 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=4tf6f4EfVwE6wKq/VA+ZpZ7sEgtGzPQDIrYTfwBXbX4=; b=U8aULlIGlTGd2iE5IMEEeKLZy1yp+CSCn9tTXrllfsd1x2U3Q9XvrtPXbu/iAhMNBg hVNYjZFH2yGKengu68atEddLFTsgynKzFCmQlgUkp+16KDzt5lX6JqOrXRmODfkTVe5Z rBgag5z144SDKZ/qUykc33ncsnQXF3tRerwwHGaewd554G26TgS8gUTzoEyiuAC3xnAO taPxxsTNTQWJdXfKdJzGJILOP9vXzY11YL55Y0qgWqEIalOc3r7BfGTXwU1cDQE2QeWU 8BJMWJS6A0XteurcK8YLsoQZNlH3b1xbnLojOi9uSmLMlFyD/TkGjgbkzpfprW6dhhUU jCwg== X-Gm-Message-State: AOAM532I37uUYj639zNZQ4yO48oeoAws+PBClsDdnbzlhS5l2jYl/p2/ tm4fNDS1N/RLKx7iivQZjBIxfA== X-Google-Smtp-Source: ABdhPJxmrXncZ+FNJ19eQhGBAt2cPtTA6ouEYqIaYsZdp/wGPy4P7Knp6492QX6cNzvqAA8+IWMgwA== X-Received: by 2002:a5d:4e08:: with SMTP id p8mr42239238wrt.425.1625841464051; Fri, 09 Jul 2021 07:37:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 30/40] configure: add an explicit static and plugins check Date: Fri, 9 Jul 2021 15:29:55 +0100 Message-Id: <20210709143005.1554-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625842756331100001 Moving this check earlier will make the later re-factor for enabling by default a bit neater. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7f906be68d..25daabd0ff 100755 --- a/configure +++ b/configure @@ -923,6 +923,7 @@ for opt do ;; --static) static=3D"yes" + plugins=3D"no" QEMU_PKG_CONFIG_FLAGS=3D"--static $QEMU_PKG_CONFIG_FLAGS" ;; --mandir=3D*) mandir=3D"$optarg" @@ -2184,11 +2185,14 @@ if test "$modules" =3D "no" && test "$module_upgrad= es" =3D "yes" ; then error_exit "Can't enable module-upgrades as Modules are not enabled" fi =20 -# Static linking is not possible with modules or PIE +# Static linking is not possible with plugins, modules or PIE if test "$static" =3D "yes" ; then if test "$modules" =3D "yes" ; then error_exit "static and modules are mutually incompatible" fi + if test "$plugins" =3D "yes"; then + error_exit "static and plugins are mutually incompatible" + fi fi =20 # Unconditional check for compiler __thread support @@ -3979,7 +3983,7 @@ if test "$plugins" =3D "yes" && "Plugin support requires dynamic linking and specifying a set of sym= bols " \ "that are exported to plugins. Unfortunately your linker doesn't " \ "support the flag (--dynamic-list or -exported_symbols_list) used " \ - "for this purpose. You can't build with --static." + "for this purpose." fi =20 ######################################## --=20 2.20.1 From nobody Mon Feb 9 10:39:25 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 1625842201259471.3478406270326; Fri, 9 Jul 2021 07:50:01 -0700 (PDT) Received: from localhost ([::1]:38736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rpI-0000VL-5I for importer@patchew.org; Fri, 09 Jul 2021 10:50:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdV-0004yr-DN for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:49 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:45640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdP-0000GQ-CE for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:49 -0400 Received: by mail-wm1-x32b.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso6441598wmj.4 for ; Fri, 09 Jul 2021 07:37:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c2sm1427408wrn.28.2021.07.09.07.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F1D601FFB4; Fri, 9 Jul 2021 15:30:12 +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=77kFc+Y+5Qbz2V5mv8qtdgKvR0JhiM/gX4TZj6U9Mb0=; b=QFaPXiKW7BbgiZTB2aq6DW7FLPG1lGSp1H1KG1n5a/zNWzXG/a5lWWVcVjtNtSeptS P2BnF5ilB962LKiO9dBpAbVOCPJQm1TEYQ1YZfyqsE1mrnwHk1qlJ63SFvBuLu5IOq17 ZnIfrp9wIs1AHcJYUoKUMsaHHAtFtxQcPht12KWjv/6rpaqQlUDO+MT6dQnIfLxxfji1 Y07u+Wx5xgfGqjapOPJ4qCiV/t36Xtr37JR63kqMC7NHNwQOrDuJmyFCfCuoGP/G2Zo7 95wTA/+NP5wHtzorbcSaLNIgkzkWBfIQuTPDHuRpGYMFHn3sEM4Qtg5xWvlGZZS97xcf I9iA== 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=77kFc+Y+5Qbz2V5mv8qtdgKvR0JhiM/gX4TZj6U9Mb0=; b=DpPsyzLj7I0v6tJ2X/kUwaOfjMWGcgEXNl6jKqGsC76OSvJNxFQgv92lq5eMX9vkft JyVnZe3wfZc9ddablnb2aC42lss90eyUyZpnzYf767nUlzRibR15y5pH9Z9Z6HSsaY30 1grlDV7+PwY7zT59MLlGHYXfWMv83ZNo2wVAeHRTIeqdBTkPjok5kwg9T7+0Jr6SUTm3 hF4iD8120hpYtC8031nivn1A4PDlIYDRtFGplb3We8vSdLlaGJ49cN7YsS2nz4ln1+6I +nUdcYaTwduXI8JURJdMGl/yfzs8c8HaKe3dGs1NZX1TDbEOzjLuj2QRu9EGVjdvMej2 TKjg== X-Gm-Message-State: AOAM532pcROIzdmMCZQTX9wk6ec/yy5unS9stIQAQ4Dqay2a/fa02ZE3 z9m/86AP2NhGNP5YyJgxC9HAEw== X-Google-Smtp-Source: ABdhPJx2nedH0TyMSwcKZvijUkHnDEdYHLCDfZTLj8/ao6g3yyndWNU4e1QOppqD3vTZFO2e7LjrZw== X-Received: by 2002:a05:600c:4f4e:: with SMTP id m14mr12450822wmq.151.1625841461654; Fri, 09 Jul 2021 07:37:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 31/40] configure: stop user enabling plugins on Windows for now Date: Fri, 9 Jul 2021 15:29:56 +0100 Message-Id: <20210709143005.1554-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, Yonggang Luo 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: 1625842202668100001 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. Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Cc: Yonggang Luo --- v2 - move targetos check to if we try to --enable-plugins, default no otherw= ise v3 - fix missing test, s/targetos/mingw32/ --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 25daabd0ff..1eb8ef5341 100755 --- a/configure +++ b/configure @@ -708,6 +708,7 @@ MINGW32*) audio_drv_list=3D"" fi supported_os=3D"yes" + plugins=3D"no" pie=3D"no" ;; GNU/kFreeBSD) @@ -1511,7 +1512,11 @@ for opt do ;; --disable-xkbcommon) xkbcommon=3D"disabled" ;; - --enable-plugins) plugins=3D"yes" + --enable-plugins) if test "$mingw32" =3D "yes"; then + error_exit "TCG plugins not currently supported on= Windows platforms" + else + plugins=3D"yes" + fi ;; --disable-plugins) plugins=3D"no" ;; --=20 2.20.1 From nobody Mon Feb 9 10:39:25 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 1625841617488454.9992590451037; Fri, 9 Jul 2021 07:40:17 -0700 (PDT) Received: from localhost ([::1]:34508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rfs-0002Am-5O for importer@patchew.org; Fri, 09 Jul 2021 10:40:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdG-0004as-Iu for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:36 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41694) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdD-0000AT-O2 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:34 -0400 Received: by mail-wr1-x435.google.com with SMTP id k4so6153766wrc.8 for ; Fri, 09 Jul 2021 07:37:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm4812161wms.24.2021.07.09.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3924C1FF8F; Fri, 9 Jul 2021 15:30:13 +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=o3DUVqUcpt8ZcjM9bBc26vjf5nCrQAnBIuXMWdbcTqI=; b=W9HpQY+G3qNKNomCZPqEFyREfsynsgh5Ivly/n698LsCE1miplVtB7dV4LkSoRMjVn iALYISpMM8zrYp7f8Q/gDXUs/TFHFKuYgj9H52ELYXOmJ/f7pF+zSuKcpDn7j0zmHTTe NZ0rv3J4XJIW6RM5xwf0h79T8ek565T+ZuHNOa15eNN5DM7V2vjxNgskrEBT5SmwxhCf Bx4V6Ssat+faoAC1KtGXpk/RMJEHvf0eXkff6XRYOz0K6C2l3WpzjEC0f/FthhnbwoqZ GcPk7WU0mk4X7FplEfav5awHLaOgcXGGCqB6TK6q6f2vfcRLjwSAuPDLWjq3GHso7c1H 7A2A== 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=o3DUVqUcpt8ZcjM9bBc26vjf5nCrQAnBIuXMWdbcTqI=; b=HQHXrZupos/mhm23cjJ6wn8KdM2/2+ZZ5Ihq9VfdOinJsuH9zNb8ISYozMTadebep2 SBVh8dOABzRiQRZjk22q55eVwa7nKc9ZZq/Ul5LgA4WVMdevZmZiRub4znKEXZz9nK4r 6khlTFGtK9HEC2uWG2nELISuUp2BhExoORpVV5PTCU1qTH8iHh3PwGa5cicP/PHyheQl l6yXimWULdwKZioCcd5OWImanuyw/MjEFs0b+MLGh3sFwO3FJGucg7g7MyJQKCCFyHbp Za3fIsv1xHUA+iojZPnOV7qkcqfKOOIlNLrC6jNsaCCBsvBg3PlZn0whOAC1uMb6rwc1 nugg== X-Gm-Message-State: AOAM532Ak8n0No9njyeF9oHLWbjmSs/liuCHc3rrr3P+wQ5xzgfdfYmh rpO1jWZqwMwRqADFErfc21uBEw== X-Google-Smtp-Source: ABdhPJyltU2lic7WDYA0w9sH7ygFuh+/MBRyQg69ymiNdoxmt7uHqO3AxS1Gxqc0BhwbezSx6Cv2XQ== X-Received: by 2002:a5d:46cc:: with SMTP id g12mr40576093wrs.136.1625841449206; Fri, 09 Jul 2021 07:37:29 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 32/40] tcg/plugins: enable by default for most TCG builds Date: Fri, 9 Jul 2021 15:29:57 +0100 Message-Id: <20210709143005.1554-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625841619782100002 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. We need to move our linker testing earlier so we can be sure we can enable the loader module required. As we have ruled out static & plugins in an earlier patch we can also reduce the indent a little. Cc: Paolo Bonzini Reviewed-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- v2 - properly handle plugins being "" - make the test for linker support handle default case - move linker tests to before the glib-modules test v3 - remove stray debug ($plugins) - remove no longer needed if static =3D no check - update commit message --- docs/devel/tcg-plugins.rst | 3 +- configure | 122 ++++++++++++++++++++----------------- .gitlab-ci.d/buildtest.yml | 23 ------- 3 files changed, 67 insertions(+), 81 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 1eb8ef5341..b960dd5f77 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" @@ -3090,6 +3090,69 @@ 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" + 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 + + ######################################### + # See if -exported_symbols_list is supported by the linker + + ld_exported_symbols_list=3D"no" + 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 1625842042059574.8222406620675; Fri, 9 Jul 2021 07:47:22 -0700 (PDT) Received: from localhost ([::1]:59700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rmj-000242-1T for importer@patchew.org; Fri, 09 Jul 2021 10:47:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdX-00054S-Ub for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:52 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:52771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdU-0000Hk-Em for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id g10so6492928wmh.2 for ; Fri, 09 Jul 2021 07:37:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p7sm5319973wrr.21.2021.07.09.07.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 763231FFB5; Fri, 9 Jul 2021 15:30:13 +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=cZhvdaH08fYelUb4ULYr3OjVBurCi+anAyWCQxNLVn0=; b=zXl9OlZL61hQUgWw38ksuhVVQSbXFSxJ3Z7P4N0aaPrZjq0bitQ3zfeUWeKe9FjN2+ bJhjnkSs0bvAJPjTIMWM80cX47/PY0j3MUY7Rp7posD3W6IKet5RgLKMioHhK3WYDhRq E3hG5bf0hHk20XJ5mZNO7WA1U5PkiScxy96P34s1GdlBzdsN5GoF+m9S/zyej9Mfe1cs GUoTd0HjqvBOqRU9OPFVq3oibcM5WkTDbYoz3oWIyzHIPvDFZLwiUbSyO0anjjF0k2PU cYwbofWnOi2ruCTO8kEf+oXb02SHd30xd3Qh/U2YpZNUZTm2nQNoR71wVXA0z5i73mg/ q/iA== 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=cZhvdaH08fYelUb4ULYr3OjVBurCi+anAyWCQxNLVn0=; b=F+QAMRIP2p0ssqn+hI2BHNF98lpUD+G9y7fYrn7O8ES6dCFtfrPrjZG4h4NH8OuxSi ez/1EcABLqNdSeu7CJZJFSf0H3HN077pRLg7gBQ4WAcUD+NGjzUSqiM7jTuoWEPpJ8Sl E+psNUtk6cqY3HLOY3Ktn7LDyhxk8YHAQARi5WdPLXhUBPugoDG1yxoQoHEEMsbQS4AV Eukkm3QZTobMTVZb9lcQaK5kOFulWUMkenxL4YNvvOzpJZCIBHyzgDPuZr0CIy27jOez IEH3iozeorV52X6N+o7PJzrrFVBiH0xl1q1NvYQFVKKVuAn+8R4/9M1JJe1O/KIOuDKK UrKg== X-Gm-Message-State: AOAM533e7sOp1M7jJWdKtK0OVeYR2QDkz7nhtxEumqoZ4euhc/IUKee+ 6GhGOmikwxtYXjSVIauGA+zpKA== X-Google-Smtp-Source: ABdhPJx74hW5zv7OYQvFQPR9UjAhIQ+ksgfzAiFzyL4PVevOCx0kuQvYbr4OYLIYEE+qal1VrYRCqA== X-Received: by 2002:a05:600c:4ec8:: with SMTP id g8mr12602284wmq.150.1625841466366; Fri, 09 Jul 2021 07:37:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 33/40] contrib/plugins: enable -Wall for building plugins Date: Fri, 9 Jul 2021 15:29:58 +0100 Message-Id: <20210709143005.1554-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842043426100001 Lets spot the obvious errors. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e --- v2 - also $(filter -W%, $(QEMU_CFLAGS)) from the main build --- contrib/plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b9d7935e5e..3431bc1ce9 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 $(filter -W%, $(QEMU_CFLAGS)) 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 10:39:25 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 1625842496450741.9052955230237; Fri, 9 Jul 2021 07:54:56 -0700 (PDT) Received: from localhost ([::1]:53220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ru3-0002m6-G8 for importer@patchew.org; Fri, 09 Jul 2021 10:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rms-00037d-U4 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:32 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:42742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rmp-0004Kc-Qs for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:30 -0400 Received: by mail-wm1-x333.google.com with SMTP id j16-20020a05600c1c10b0290204b096b0caso6458467wms.1 for ; Fri, 09 Jul 2021 07:47:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k5sm5407597wmk.11.2021.07.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B826F1FFB7; Fri, 9 Jul 2021 15:30:13 +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=4FTfkZOV5J8pPR8DrVAy9dNoascCzZiPQY9J5eWzkN0=; b=nU0ohKghbii0NLlOBK+WBV5VD6hSQtU5xy/qQ/be959uCotVO+4Wgk/v6+g8Ip7rG3 kpKgmFZ/QRI/QpnIdHz5OPPwveEz6Xg5T8VeKhyPeQnXD/0IiZzDJutAmJ73q1g6vBiv QOjuuLw780lSW5OhQ7XyH5HBOprIxLKNK7mTtUENz7pEVwz8pZMciLH6j9EUTwh9gtN+ w4312APv7i8wBFivT0cDq9sP1IOo6EcdV4X6hWEJ1dAD4852U4gr32aT/9KuadBwIIVR bx5CPkC9ndW333uPKmtoepbnMWOSRoszIMoEC8zj1FW1AhYEtkAZyPz/Wsrk5yARSFUR Vz3g== 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=4FTfkZOV5J8pPR8DrVAy9dNoascCzZiPQY9J5eWzkN0=; b=dpM5EDVxRxIxpTWG/+NLD15IA1n0axNsSjOcs/SZqjj9Pqq5aKXHoc8QOC0pHwR9Td PJpcT7G2cLtjySJMo9tflur+9n6RjcUpF4/jNXBLIvwUMr2IlRzX4YkEIX4SK+1RuGDE kbrhdBb0vHTQBGROFkqx/Ia4ksTqIgST8tyEI+CWKaZCJUujJScvkjuhMrgVMcYha5Pe VcYnIzo+Pn8WjG9vomGDwrAG/Vg92BeA8JgCbsDYb1+QzL/SAHf90FHlzsljbEXFoXNU PQly3Yw+70xogVi5D4I5cYGnHGNXBsuCKpk0UV10/q3L34/5B1r9H1cNueR+iI7OlhuP Sujw== X-Gm-Message-State: AOAM533A1SjOyWwIEuNk7rj0UhgnJkcyR4S7sAMTRGGlIIZUMHxmGe7S ltmosjolyXXngB7DvjtfIv4Jpg== X-Google-Smtp-Source: ABdhPJyHcIhkgioDgg+bonko0sQ5+aBuy9Pdq0DM7HCLacLR6oWuCX6RuYNcAuKljQADxPcNGk4F7A== X-Received: by 2002:a1c:f616:: with SMTP id w22mr39235462wmc.131.1625842046299; Fri, 09 Jul 2021 07:47:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 34/40] contrib/plugins: add execlog to log instruction execution and memory access Date: Fri, 9 Jul 2021 15:29:59 +0100 Message-Id: <20210709143005.1554-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842497646100001 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 3431bc1ce9..3c9209b6b0 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 10:39:25 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 1625842187271188.7482809070333; Fri, 9 Jul 2021 07:49:47 -0700 (PDT) Received: from localhost ([::1]:37452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rp4-0007VC-1V for importer@patchew.org; Fri, 09 Jul 2021 10:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rmw-0003CP-Gg for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rmu-0004MN-H8 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:34 -0400 Received: by mail-wm1-x332.google.com with SMTP id k32so3286430wms.4 for ; Fri, 09 Jul 2021 07:47:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm5377184wrq.92.2021.07.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E109E1FFB8; Fri, 9 Jul 2021 15:30:13 +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=su72GM5BrWh5XE75wY7BF20omxSaQ0yZCR1Kw+phqNEcliFQK1szWmM1fBlfkxSy8B yjQQi5HDuHj+em9Cx9x6OwenyoE1SOuPCIME7PauVWASa39Yr8x+rtU9+cCMkpSnQw3L UMbaNU8GQ9Emknr6+qiyYBgtvZN8gKs4TlR5GDUXpsUTPawEAhCtkz/O73Um1H692cMv 9dTqG1Witu9sptpo0eIq/bStSKMVLCXEBk8Q2r9kdvOsNBqSxsfFfzkDg/hcPZFBhLwT m/Mb2oIrK0ajZhhdD3KAQ77awfGP8a0V6MOJGHznr8vrVYyuOvNZGagEuEwmRIxuQGQ8 FJAQ== 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=Y9Lf5PBpXscP+0FjLf7GuXfzXG7UP4ZEUEjOFVOv7dpmQrtfBW6yYK5g3iCgU8SKIZ K/czSEoJhLP4iSubwM+mFZaTgr6wihewgnt3qaUHpgsA3GniOUYPR8gEGrg/ksA6pfHl VyiowMQbmiGd6NJ3f+YgAOMuZX8OqdbZ3z34eff6QI4DK3zZ05N1Y+xOgApFVCF3q+c0 cZNW0bNA5otcO1lXJ+FcYxyKKVRQUx9hb13W1QrQT1wY6ObxK2ytOqIXjwyVq3qV4VFQ LUU0QTe0X1q5zp/ksHGJekfsZAAjRRMJdd8BYj4TPtindeukYMkMbYSIvh0yt2iYX/SI 07iQ== X-Gm-Message-State: AOAM5315Bwl9nnEQZy+5NvwIT4Hh16scan6FBVv4oS5beQacl9xzBLFY nI2npbbw3EQIzoQ4iNUBi6MyUg== X-Google-Smtp-Source: ABdhPJx+gW8U4x2HnbnD9vL4zpmUMhDGnSVz5TOPwQDzD/7dwVMkvzP3b/qqxyVk99su8eZeUwjhLQ== X-Received: by 2002:a1c:62c4:: with SMTP id w187mr23554789wmb.27.1625842050867; Fri, 09 Jul 2021 07:47:30 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 35/40] docs/devel: tcg-plugins: add execlog plugin description Date: Fri, 9 Jul 2021 15:30:00 +0100 Message-Id: <20210709143005.1554-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842189163100001 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 10:39:25 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 162584248125472.64185816334953; Fri, 9 Jul 2021 07:54:41 -0700 (PDT) Received: from localhost ([::1]:52742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rto-0002TG-4O for importer@patchew.org; Fri, 09 Jul 2021 10:54:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rmx-0003JE-Oa for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:35 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rmv-0004Ml-CD for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f9so6820816wrq.11 for ; Fri, 09 Jul 2021 07:47:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a9sm5457276wrn.8.2021.07.09.07.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 25E991FFBA; Fri, 9 Jul 2021 15:30:14 +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=Y2dEFzgPhGXTzz0SmMn+gndtAoKd6AWU5+DV/S3PIUQ=; b=ZojdQlkOSYAX48tYTfVMhxzvF1GzfQWXPamJqM/23JFX2zEJg2ZdontBeksk4gndpH hgKYs0JRbt16N8pzyLjz2EAgqEGlWvpYL0LWtXyAeXW5WFh3PFV8Z6jv3szi6bZfLDHL kzQAMn/GjuiEoupojLpXdW7wX/xLfVAEHpna41BC76rBzE8bA/mcSFPGgAF5OBCXm2nn PpUE66Vl8CdAqsZ23Gn4vm8PfWSNm/rCMUWfe2tmxnA5R+jKHUVwnig056nwlBu64dFp cHDm75uXIuOiyBRqJeAPGqcSX6XkUptuPEQ0/GShgo7+WZiX9gALC6sCTI51uCtSREjH hpsg== 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=Y2dEFzgPhGXTzz0SmMn+gndtAoKd6AWU5+DV/S3PIUQ=; b=rEsEgXYbia0dwRRSmbhAWeyeQNIc3jgStruBb0ff83s9WtIxf5B8dy5Kx/G/LuTpOW x2mUxzwv6FytDIIlWHO2WDQPYH85XV3qtHpgmws6GKw4h2i+nkpfVl+XAG3Qceo6mwHZ SMKVSPjZS6O3kXuBAjmLf/hhBK0TRhI37Au/fa8d+eYpJka1VB5mNB4fRkxeUJFyXZCN EzjWgppoWWBaG5NsQqZ2RpVX+YUbZUR19Wl73w0WMl8SOe9/vul2vpZ2ILJbipGvzoww jPlkUByA+9l2YDbNYbvypLBxxqO4M5YsBy92ORwr/uqu9na6NYB+76z+zqzlP4uXxt/4 l8qQ== X-Gm-Message-State: AOAM531YzyWCR3lrPa3zgnmSvsrrjALQx/jTubOlBszYx4YWhv+aIR7X nU+XghM7cKRA4+8QptAQHZJIBA== X-Google-Smtp-Source: ABdhPJxta8Jh9n3+nG2jOxYuHs6lcDwxHLb9QPvGskrImWdmkK5fdya3zh7q6yLg4bX+NPaZYkii4Q== X-Received: by 2002:adf:f8c5:: with SMTP id f5mr41694121wrq.420.1625842051736; Fri, 09 Jul 2021 07:47:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 36/40] plugins: Added a new cache modelling plugin Date: Fri, 9 Jul 2021 15:30:01 +0100 Message-Id: <20210709143005.1554-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842482253100001 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 3c9209b6b0..54ac5ccd9f 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 10:39:25 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 1625842634585252.7482035630411; Fri, 9 Jul 2021 07:57:14 -0700 (PDT) Received: from localhost ([::1]:59628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rwH-00076I-Is for importer@patchew.org; Fri, 09 Jul 2021 10:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rmv-00039y-Jk for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:34 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:37815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rms-0004M8-N4 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:33 -0400 Received: by mail-wr1-x42c.google.com with SMTP id i94so12482507wri.4 for ; Fri, 09 Jul 2021 07:47:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d3sm5367948wrx.77.2021.07.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4FBB51FFBB; Fri, 9 Jul 2021 15:30:14 +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=HqRm/nOiGe9kv/5+eXTf6KPC7nU0wjKYhOJWd7skhDKzWLhdNWBAtuUINu+qyqqCGc 4nU0/CWn4YkSfPkupYDLvixzq3XeSNuOCzZVhiu5qKTL0dzshIUtTKXwxniHDjqhKZOh I7Ekr44EbUrGPszeGXqhSJkDrrNP0AC6YLDv+eGbMn/KxlpE7S1Fs1+o9sgBPUGlljIc 5O0yeYZjrZ2LqFKklVk8oKQf5AgkBQV+tW7ZL6+DK2FZloj300CrhsUqn1sQ8b6L35f4 6qdJWYSp5ffedH0qn7zHbhWssKRLQ5qsIYus+uxly4vMprP3pBk6/gU9qqBUsWzzGPLh n5zQ== 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=PQh4rQquuxfB+cgY2M1/gpK87+iA+GPmXMDGirkNIT/c1IK674n+EGuWYqyr16xvCK fL8QcDRBjAIchCiUyv8cSSkhvlzPMC0yfCsj3Ccsp+TFCiBvAQQ7nQP/lHko9oGlzlf9 JxYMQvecJKYkCk3kbvRtR2dmmfxi2EBYtrjusrThH9f9idZZi4SgUUsMoiCGeVYccMSe xvOIkKZAQY15J7XZXRE0ynZfQWvI9LJ4uWw+5sl2s+vWxXk3bNxJtWOkVN4gV4vr0Wyv gO5OCJGVxhILAO++9ZpjFTy4Rlv9Nv51hhu+Bv5V6PCGWk0I/HVEn8sNMNuo14hN2/4n mXGw== X-Gm-Message-State: AOAM533pRK4HaZk5wUGmZm2kjOtV0ucerHNL/8TyMjYid73n+iyT8KnC YlT9dfiq0bbEumR9KODiqmEU+Q== X-Google-Smtp-Source: ABdhPJwP3oq4QNbwr4Cc2hQ/rFJCYha8S0P76RVpLiCRl39Tw3Y9vM8np9EdDk5i6OPU45a2ZmRtig== X-Received: by 2002:a5d:52d0:: with SMTP id r16mr41373236wrv.323.1625842048980; Fri, 09 Jul 2021 07:47:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 37/40] plugins/cache: Enable cache parameterization Date: Fri, 9 Jul 2021 15:30:02 +0100 Message-Id: <20210709143005.1554-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842635886100001 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 10:39:25 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 162584169314138.77293294503147; Fri, 9 Jul 2021 07:41:33 -0700 (PDT) Received: from localhost ([::1]:38728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rh5-00052E-TB for importer@patchew.org; Fri, 09 Jul 2021 10:41:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rWf-00056r-Q7 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:45 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rWV-0005fB-2q for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:30:45 -0400 Received: by mail-wr1-x42e.google.com with SMTP id d2so12480875wrn.0 for ; Fri, 09 Jul 2021 07:30:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g10sm5701637wrq.63.2021.07.09.07.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:30:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8919B1FFBF; Fri, 9 Jul 2021 15:30:14 +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=ewJgkenFMLvv7GAGXr6Ia/EbWlGki9vyvPICi8g6qX+l2djJqO1j0XQFu47jKtESMI Bp/CSgC99u9nRJeDRHtLVrk2nLElplZ0c/kIQDlvIm7RoI/dLLKLGIOC8Gk92AmPwNgo pjQ0IWMZUPuiZh/cXCYUN+06svjc2uYHYFF1R4suDv87LkObyaM7+/tIepTUPG8x9RqL 4OuAqyWXv57zbw9D2CvK0G6Oy3WVl6Hd8GCf2jM7/31GoyUSwgwNY3WQmHJEfBe+yT0p Ce3ua5fGj3NpAC3KJ4YUy1V67xnk22AZA/CDaFzDAYpqnDX1UHeTjC/7loCD1oeFzhND d6lQ== 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=AzGuqcc2IJXzvSdDZTysHLsEaTGh5N39fdIfDWUVMJWJqkuSRpRNzDqa9OHAlDEjYL nQt3jcuZgt9Gr3N+9r5ku5B9yZz+pfvr2ky+be/t77n1ulAIb7/7mn0yjZXqDz/1Cg3x rDHePiv6t6gjAwUXWRk32oJbI3QYTLTGSSUWSuc1m7qzHmTZq854h2z8Mhhe/UJG81cu bybsWJ7VW/grHFRhh/hLGqRlpGkibLBBEKAXOBk2HZlcljk31cxyP+wi1IvmrR6Vb9PP B8IfSC9hMViueVISsE1+tYeTtzJNK2PUgCCzTyudTzundFz0WxqTWvkWP7QbsZ3WCvb4 8oMw== X-Gm-Message-State: AOAM533/7+EgzLWCfo21nG0nqnBvT0tdhBaDKxJoVZ/savlPc1/o/w1s 6uNugynsd2CN6iNFJDh0c2y8aQ== X-Google-Smtp-Source: ABdhPJyhBQ30dNkdolmCVjARJRk9Ka6vo08GyJao4O5gRXBwLd1V97WGwg3QgDL6cQfdtx5G9dZ0xg== X-Received: by 2002:adf:ec0c:: with SMTP id x12mr7618055wrn.113.1625841033811; Fri, 09 Jul 2021 07:30:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 38/40] plugins/cache: Added FIFO and LRU eviction policies Date: Fri, 9 Jul 2021 15:30:03 +0100 Message-Id: <20210709143005.1554-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625841694135100001 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 10:39:25 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 1625842361860501.27721318911915; Fri, 9 Jul 2021 07:52:41 -0700 (PDT) Received: from localhost ([::1]:46784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rrs-0006xH-Je for importer@patchew.org; Fri, 09 Jul 2021 10:52:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rmr-000367-A3 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:30 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rmp-0004KY-7H for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:47:28 -0400 Received: by mail-wr1-x436.google.com with SMTP id p8so12531795wrr.1 for ; Fri, 09 Jul 2021 07:47:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b20sm5232560wmj.7.2021.07.09.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:47:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B30891FFC0; Fri, 9 Jul 2021 15:30:14 +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=WJdJdva1k8xIVAsHNsiF0PvTqdnZsywc+w9uU5EGuW+IncnaXv8GK80iaaGKLfWbrp 3IvqBHkANnnYykf7kl51dahRth5VuzBhhtnRxjOQORh3gIHAYW7bsp5paVwsSHYNNnDe vtSkkfw0oWh633d82tH005dPPRbrQzjokWSkiasMQcf4mmuslos05xYdk0WqRgCnoNns Ua7ZBSAE+IOSbO3i38ExAaVunnCE/Dg9wk74xdUiQCmalNQVHDU5YiAg/x0rjK+udqrd zHpsAXm8iAhdYIa6fH37M8vc3ydlnnryWTseGTi0nuRUf159cnsqHrcBPr6xmHE2E7xv 6uMQ== 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=r+rvlEznf/N0HsTBn9WpwcEinr2a9hwWGhg3cREIEe7mOJIpJK8UJ4jMFsq4XikYpl ii6HWRRak6ZAWiyuDcO+dZlX2CwwGh5FanfvhISj07JlQLpklrGVNyiBOixYmsTmxWdm wO/ueQX8vuBFEGYrQ1v5u+xUWlFBTQusrY1DWkao7sGbNRHD9OEPmQFBCoq4ETuQfX8n b4mMJgYmPmNd2Ef1JIyJVuxUKe4ruhEyIvjPaV2Us32c5fucj3iW2pp/bjy+autfJ4YJ 6pBZqT8WHrGuhT3OvE4oCtHpxpFF8u01rGzGnQb4V+IX/VpFKAmL2yXNwUFMKFdMH59A uc2A== X-Gm-Message-State: AOAM532nMilAW0FPrubeXlc1Dq2g6fK62ABbCvEeyEHQvj7sCSdNhEOJ fgQ4inTH00bHuIdzpPqa9DNROA== X-Google-Smtp-Source: ABdhPJyV8/7oHt+7qBUOU1YOR4iERFHtyt9mDKgkHK6RzsRW9H6BC2iKi9JwMgG+qr11U75tK/7aDA== X-Received: by 2002:adf:ef05:: with SMTP id e5mr11072077wro.232.1625842045617; Fri, 09 Jul 2021 07:47:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 39/40] docs/devel: Added cache plugin to the plugins docs Date: Fri, 9 Jul 2021 15:30:04 +0100 Message-Id: <20210709143005.1554-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, 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: 1625842363739100002 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 10:39:25 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 1625841897234852.4097514672562; Fri, 9 Jul 2021 07:44:57 -0700 (PDT) Received: from localhost ([::1]:50852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1rkN-0004Z3-2E for importer@patchew.org; Fri, 09 Jul 2021 10:44:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1rdK-0004hT-Dc for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:38 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:39732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1rdI-0000DR-FH for qemu-devel@nongnu.org; Fri, 09 Jul 2021 10:37:38 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso9235043wmh.4 for ; Fri, 09 Jul 2021 07:37:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l16sm12919842wmj.47.2021.07.09.07.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:37:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB5071FFC1; Fri, 9 Jul 2021 15:30:14 +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=iNvvE9CNnBmAhP4cas2brMgvoAOGUqK5YHgZGAE2EmtABnIsl6IDSIYwgs4DHdnD9/ dL7Xo/oyj+ub7JabBW03mS9e9jxt/rLyViXnqNvj64ic2jqu1oEPMIsnqUT6O1pMG3V4 LfSTfxOS+Ai88Yu0CCbciGmoJpMcJz6Oy5U5muc6MW3bp9ZxmZuRL7dumVXM7zBVl9Yc KELcu5w6ViOgmjsMYnJ0YWxFaTuOt+vQJlOw4lFEmuTrcSxFE+jBVR2uyjy1HeZkW9yT 3kY8hRiiQonPEgluIlgpbZVflBdRSFkCFj+jNSeYGMqTZvRoIoOFTRICeqj4m5EfgZgz pU6g== 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=udHM8Ej0T8Mbj07PX3ghV/0hZo6T25EEb1YsAypBg/KplYVH2DNhIoh4p3iymnHfKB b8z/FgP/8gyac40Lo5TZGgoduzX8zIfqkHiPSmQ3fYh+a5SV2kOVNNrPcBkP7lehf/0R qFFbAQshuNuG5BqllquWu8+/K4hx+cWpWn0D9MPsPfg9i72K7p5g6Gvf1mxXc7X39w4e 5DGas+ZKJ0r5tniCS9V0OKU9Izx6nkqErFUxeXJ38obeHGERisUm+mkIl25Lw4mmya61 zij4Z7EJcJeAa67alr45OEj5RGv5QkBNHAaN+R1OYQiYuc3NjOFZqMvHDgRI/nQMO1Wl 69rA== X-Gm-Message-State: AOAM532gFUOKSKhIhmE3M61Iakroq1E+7GJVfftHXe1Hg1Quw5u/xQ3w 0xQbr8g5J29rHngyUSW5hWvjYQ== X-Google-Smtp-Source: ABdhPJy73Bg0nKRXUB73pXpe0okOZaSmfw/bBWmzRFabcFR/Hb78KZOHCjKOv1r+LvEwuYwPwPYY0w== X-Received: by 2002:a05:600c:2189:: with SMTP id e9mr11615179wme.35.1625841453876; Fri, 09 Jul 2021 07:37:33 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Date: Fri, 9 Jul 2021 15:30:05 +0100 Message-Id: <20210709143005.1554-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org> References: <20210709143005.1554-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.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: 1625841899308100001 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