From nobody Mon Feb 9 13:17:12 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 1626092999602187.55445043974237; Mon, 12 Jul 2021 05:29:59 -0700 (PDT) Received: from localhost ([::1]:52096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v4Q-0006yM-Cc for importer@patchew.org; Mon, 12 Jul 2021 08:29:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1d-00044W-4E for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:05 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1X-0007jD-Du for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:04 -0400 Received: by mail-wr1-x42b.google.com with SMTP id r11so20093871wro.9 for ; Mon, 12 Jul 2021 05:26:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm4159700wrt.45.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CB2FC1FF87; Mon, 12 Jul 2021 13:26:53 +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=CmYqC7lobHkUYsln7oehaYwCSRkOBiL/sZms1OJnH7A=; b=kwCejYWsgOJRE1BAT7ixs9G5JqYoIlMy0GTed3qzp0HzjOHCFJoNAZfxw9v+ZynBxe h8Iibs2Pvu0MfDEIFyxXUH3izY0JXGKVk9YYnDhbcdmx69oL9EHhZeU/ErXy7vkjCoUr rw2E0ruIcpHR8cVguFM24CIDcbMEGraIR9UIhO0CpyWxKGfOft90ClAYC7J/hPwMtzZx lf9diD/7vkgCmt8S7TlAzFGUFrP6EDq76fO6bM5syaci0v/qUEVb/JlaQddJJ/SA5h8u KgrRk2/P79cgySxkneijpV0DM4qS1nexDZ0rrHrfTFK79QpPN57XdcRw5qL/Su2SIalb fLRg== 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=CmYqC7lobHkUYsln7oehaYwCSRkOBiL/sZms1OJnH7A=; b=FlQLwTgTmkhT4rotocehskFYNn4izFQhIG5yMa0RQ8J/FIkLZphOF7aiXDNvctG1Gx a7IjOp/R5RWV+AuRdhQ1jwhHy3NLEmzf/GM+7dBe945xUoC4W49AstYzLOPKdqURH+xA TMfd0Fbpsc5M+6iu2CoA//NV8W60pDfHYTjD94i3eifFa+yxvlHIZUabvY+Xa5fSusC9 K36TAN+YybAv8t6D70ywKVisMf7rE6rXlUnji/bly3lpS4JnOzpXU5qJIuL3PvFEsUXJ vRxGVL31vecXBp5J1wjQ09Ps21c2bqzjajTKXvlZ5AQQ83XqYM5emmf1yT9DLPWPDZxL phoA== X-Gm-Message-State: AOAM5323+zJvrzPQh6t37vZDPAjdYT/9P1LhV7Xx2Y25zI7v+GU/kC0b ACxuZDg18kwjhEeHrRXj2LBj/Q== X-Google-Smtp-Source: ABdhPJzNQ9VMkFxYooFw2fnNK6hWy1jJZy+4UwAfLX3Ytp7CuuOnTq41AKQltKyNAypxBqErgaF+kw== X-Received: by 2002:adf:f305:: with SMTP id i5mr10336881wro.122.1626092818097; Mon, 12 Jul 2021 05:26:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/40] Jobs based on custom runners: documentation and configuration placeholder Date: Mon, 12 Jul 2021 13:26:14 +0100 Message-Id: <20210712122653.11354-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093002011100003 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-2-alex.bennee@linaro.org> 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 13:17:12 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 1626093001398949.1937047455789; Mon, 12 Jul 2021 05:30:01 -0700 (PDT) Received: from localhost ([::1]:52258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v4S-00074r-8i for importer@patchew.org; Mon, 12 Jul 2021 08:30:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1e-000466-0T for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1Y-0007oF-IO for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:05 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso9698345wme.0 for ; Mon, 12 Jul 2021 05:27:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d8sm14311946wra.41.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E91871FF8C; Mon, 12 Jul 2021 13:26:53 +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=q2zz32lywOPltrggkbKmBSuMZVXiEBx/R6761ZNEd9k=; b=fmuTe3JHkF6Z3OruJwR9GCRFqEC8/YaoYfEd0YWBc5kIlk7LpUj6Jcj6UoImtK//oA nllKbUkeRDfZvgmkcODIQnTZxP5t4U1Y0sG6Fz+JJ9OUn3qTYPSKmtjovtiVbuiOt+RQ vT+XluP5tU0kdIWC+65+VcqJ9XPKe51CGosGNFkfCYpcThm8GOAGgYNA13ZSRiFWzVJI O7kNTm0fqVhie6Rjeg96/7i+QgkuzodT3gHueYzU/By4ctStYO7+Lo91BY9uefiqiWa3 vXuIspHREFU+Ex9iRYMRZ7YM6jTfJ4TMik2V5j8rquLalBe8WwM1BtFIMbTIMEl4H8so 7hXA== 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=q2zz32lywOPltrggkbKmBSuMZVXiEBx/R6761ZNEd9k=; b=NeI7UoYDba41NLglX/rqZ3sLq3MoeByE4c/j1MIZDeen+9Eikp9hipvGzlXngSXvAZ 25MtSMKiyVbDHlhihj3unQP9tXigjaYz5fNm/s98YIUXLdmJioJqpusvLUtUuXQOzyic zqIrajWAMdSO9d0H6+QL/8lQCD8yTIQAmDDTfEWW50Yf7ZMdNyqz9Ae1BaJkWKNalVAT rmIbWD2dq0RWJPQgF1CGsjmrgGunfVm92SOqaEElknqXp4D/V5cJZEnNlF5U6nWzLkrz i2zcohBVeShdx6Q8f7ZC/XR9S4vhLEOIMp4C7g0RfYw2nN6T2kLZy37mBG0UkF//IWoc Dgkg== X-Gm-Message-State: AOAM533qKhgc2B9e15spgkMqqSok3qAAwXE6ee3TIAWobp3hzkJcQuWG lNn+epQKYXyvEHvuGB7/07pKGZFTJs4Krg== X-Google-Smtp-Source: ABdhPJx67omPJEOVN90qsMNdViOgnhH0KXFoTz1zEV+KzZptA7zzJuneS1ls9wdV95txnhGO3/Zj7Q== X-Received: by 2002:a05:600c:a4c:: with SMTP id c12mr13977892wmq.38.1626092818796; Mon, 12 Jul 2021 05:26:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/40] Jobs based on custom runners: build environment docs and playbook Date: Mon, 12 Jul 2021 13:26:15 +0100 Message-Id: <20210712122653.11354-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093002292100006 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-3-alex.bennee@linaro.org> 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 13:17:12 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 1626093209202758.1634620737423; Mon, 12 Jul 2021 05:33:29 -0700 (PDT) Received: from localhost ([::1]:60916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v7m-0004Zb-4p for importer@patchew.org; Mon, 12 Jul 2021 08:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1f-00047b-1G for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1c-0007vZ-QR for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id v5so25369153wrt.3 for ; Mon, 12 Jul 2021 05:27:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c2sm10212382wrn.28.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12C671FF8F; Mon, 12 Jul 2021 13:26:54 +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=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=Bv4ghHQvcMURFku2egcCKn58fNild1gAethoK1n7QYvfMHOpaZmLwnk9ESk4rLkwBz psAmfIEZx14T/ThQl+9LucLP7eVeQV6zHBlx1pu6zqPaLSkY/p1l9ZbtuJ9pqYv6iCaE kzuyyt6xBsrSj7sbTFYS52kcquyYba/nzd7c+RsEixE63yREgIeNPo9cb20G35kTMA5v 3oD3UHDRLW+BLk9ebB2xXnT6MLEKZXNp3yw8UVigLyVT9bOA7CkP0yp4OeCQ8OjOueKj 2BfGiru7fnokQ+KcUYBRbjJLCZE7FfHpyEIKFv7QleD6cq1DcJXdcPQUru59zw8sm1Oy 3DNg== 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=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=mYinU8E+C8I+xEEzQQ1/9DJTjY/6SIxfJxiS1UaK04nPMOTnco9XkI+EGNrlzMP++h btt2bVbJ7XirgFmahFFvqXXZdervRM7bqjS+hsXxI8o5Bx2bUjXbvq0tuN1tuRwH/m9q ZNqaq5XlJsTyCqGlNUDZWDzQNMxyFXMC9XZrMRRNznK5HuiZFbE7CST/ISoENGjtIlGw 2hLBxy/AA1iX/tGIVrrWmlHRJWAnzNR8Jrkr8/mvGTq8IMqh9rsRH//ZH2XiYIMk9VvD S8FsIxvf3gi+UU3qPZQhqoBbjG+mnEVhZcK5EaYXx4eOIRMyzdKS5FeQWAO49VExggPi 0g3A== X-Gm-Message-State: AOAM532t5OzuVPchbh1au//762sC6cIqxyBepM3qdVffpiVZSeR5TtdZ C4XT7efpKcEQPVVXai/BarxjyQ== X-Google-Smtp-Source: ABdhPJySay4Dvy12osQcsZftqoolLfIVXXebrQsuW2xCj7qvH4nUsaigboJffViNgwW43GqlyelKCw== X-Received: by 2002:adf:ebd2:: with SMTP id v18mr60260668wrn.248.1626092822408; Mon, 12 Jul 2021 05:27:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Mon, 12 Jul 2021 13:26:16 +0100 Message-Id: <20210712122653.11354-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093210032100002 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-4-alex.bennee@linaro.org> 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 13:17:12 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 1626093204553991.8092297175476; Mon, 12 Jul 2021 05:33:24 -0700 (PDT) Received: from localhost ([::1]:60704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v7j-0004PW-GQ for importer@patchew.org; Mon, 12 Jul 2021 08:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1g-0004Av-7H for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:08 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1c-0007vU-QK for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11116324wmi.2 for ; Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m32sm212380wms.23.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2FA5A1FF90; Mon, 12 Jul 2021 13:26:54 +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=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=QlnmxoCWQsT0TFCyGjIAntwkTmBxzsBwGh5ttRIfY3e3kItfpnjqMBpVXZTjgenGH1 JxGaTHnw4bvf0SIcD3wwxwnSVUCY4DCkJr1EVxtw+VXOGfi6wOWvta+/mx0lZIqE08so /CwYqR0e3hDOsnsZnoNQ0ETxjMiobnicJXheUIiAahZMqw6JpLiVJYxPrIaTyOdhZqU1 25EajudQjMrNCnO5E2bYiOaNWPQh8alkYJd5snSv4FY0Lt/57GBvOl6lOXFzQNdbb5Rf nguLHQuwm2WQBa6cZZhn0GipuaUOnSrDHymzopGr/1jqxFJ45zFG8pMgGhlabCmzltKc NYpA== 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=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=jcsT5B5GhOu4+POOhKNDHg0u9XcHcpklvgZbZ4pGqvNFIXGwG6So+W3HZUUc5mAFFJ sFF2QJzCfIflXSUkDtp1TkuiWnpCXHwnbgvWEsE8Xpj0kQB7AecmvS9BlalPLUlY13JQ JTVeetdyHETOGFOzogufW4bBiDkaBsvTzDQVUVWvPBkomlacXrMNThX9iaRuJeLD/7nz nr6qZiZJ4pxjagRhl/ztsfL9HT2haIi7CQlo6w7rL7BHaTWS4D2QAv2b6ZqcbvGN/g67 1ZzB4SF865f2XDP3CAuajXEkqecx0X3SDx5nVTC6H0CGH67cGtv2KiFuWNjZxhPx23ep FVuw== X-Gm-Message-State: AOAM531ewH0mCvM7wXpXgZ8aGChH03ABW747PCLPwWMKazabKtAn/npu /texe/s4frk9lsDNL1iF2vI0rA== X-Google-Smtp-Source: ABdhPJwH17m0CM+ROdAZYnlRR7gz07AX5q/+J4GUAX80q4H8h8H/IAmijuLgIgNHqSFLr3yGOyvUKQ== X-Received: by 2002:a05:600c:1c86:: with SMTP id k6mr9483822wms.147.1626092820932; Mon, 12 Jul 2021 05:27:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Date: Mon, 12 Jul 2021 13:26:17 +0100 Message-Id: <20210712122653.11354-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093205411100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-5-crosa@redhat.com> Message-Id: <20210709143005.1554-5-alex.bennee@linaro.org> 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 13:17:12 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 1626093204592374.8352096133556; Mon, 12 Jul 2021 05:33:24 -0700 (PDT) Received: from localhost ([::1]:60660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v7j-0004O9-56 for importer@patchew.org; Mon, 12 Jul 2021 08:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1j-0004Km-AR for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:11 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:35366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1h-00082x-40 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:11 -0400 Received: by mail-wm1-x335.google.com with SMTP id j25-20020a05600c1c19b02902269686f585so1094186wms.0 for ; Mon, 12 Jul 2021 05:27:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v9sm2454369wml.36.2021.07.12.05.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44A6C1FF91; Mon, 12 Jul 2021 13:26:54 +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=bEWuCkwFDvQybyyjFP+c74u0XYV/S/sranziec9O85Q=; b=IAEAWMTbJaEV/Zqskyl07NJOz/Kc1J8SRYEh0mndMToX355KfIeIG7mx3N0piaYeSp LSRQPA0KKev1aa9ax7eZ9GHTjB2h89xjEaBCxKADP7uecGxOyF1cgpyBgQ6AblA8jcRz mbP+uWEU43NySiS71e6zTMWzUfKyQ1GZXCghD2GnwAfvXNXzvRIMt+IlsnnTnvMCsGNY TpRMBVMyWiTRJ/2fQC5nuuJFkhLJIscHYm5KXXEnmCm6tF5O/3rh0JECLAqmZvG0tp9l mRMaZ0X7uKIEfu16RrCOZM9I+aj8WU052Dp5fsbLO6dtyLG5P1r+HX568ezhcgb+NmQH z3Kg== 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=bEWuCkwFDvQybyyjFP+c74u0XYV/S/sranziec9O85Q=; b=UkJ1+jqRINy17O7Lxph5QhlyS9ty6GG0fPW8E5Mh0rkw/mF3CBNkSh5ldtYkGBSnLW +F3qsDgbmlPbxZscDhAAuuSG767mTEmicBJBMKu+rtEw/jObtakFioZ7802xIaVnRsWk ZmBeAaStgxk+Q6fCzCAF7JY4LK5LTBqh22rNO1pIJ4ZGfAYvnFK+pB7E/eMYHyEVZjQw 5lxtzKlEuVDTkrRdFvZHdZGas8Tw940DbRWQPaC3oSUtkg9+LNZpoTmUW/g4kUdSohXh kGOvOQZYC3n7WyXppAfvVEHeOO8KF/dzUkZDiXYneDd0njuHMu6n8ZGv8pPuxmtRt8Nu NzSQ== X-Gm-Message-State: AOAM530MGFfi+vCdNR1UAWN7AW+qkl1Vpu/I0DTCBOjrSj2ZooVtqESs Y8krSzSBQ/lBpH3IzUTHea0GyQ== X-Google-Smtp-Source: ABdhPJwyxpwsPRefwS+iGzNQejQ30OIwbCu1sQfa9PkKLvaD61xGyn/krxXqEUP3Iv3+5ilnbH8dhg== X-Received: by 2002:a05:600c:354e:: with SMTP id i14mr3071871wmq.96.1626092827782; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/40] tests/tcg: also disable the signals test for plugins Date: Mon, 12 Jul 2021 13:26:18 +0100 Message-Id: <20210712122653.11354-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093205762100003 This will be more important when plugins is enabled by default. Fixes: eba61056e4 ("tests/tcg: generalise the disabling of the signals test= ") Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-6-alex.bennee@linaro.org> 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 13:17:12 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 162609300192241.80001323687736; Mon, 12 Jul 2021 05:30:01 -0700 (PDT) Received: from localhost ([::1]:52304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v4S-00076J-Tj for importer@patchew.org; Mon, 12 Jul 2021 08:30:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1f-00047n-4C for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:46017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1d-0007vf-EL for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso11380095wmj.4 for ; Mon, 12 Jul 2021 05:27:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm8309852wrj.66.2021.07.12.05.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A96C1FF92; Mon, 12 Jul 2021 13:26:54 +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=vfMIiyHNfTwBacCZ/Z5kXuUc3K4JlBoxSMTzFBkGMIE=; b=U8kaS19zVZwGOyfBs4xSViFZJK4/UO5JjcrFwKvrE+iLdxpetjxf8DnkOBh6hUXcDm B8DwhwCJLr6DtiGqoceG71EN7wVI5HQ9BVwJ3pJ85YqCcvy2ZDZ+jJxKmeGc+yfX3q2B YfKeXfS9Yj4oE9n1r/H8OP9+U7XfNrS7C60ZnDVqy9hCd/U5w7v3MXi/27gXHMuLx7WD gmKx/pzpw30c4S1WBFkVmmZEC7qGdyEnyAPO4gX7EaNdbSGPGHJvEv8M6m/dktbAP3JK QrAFmUIHKQP0YzyRjTuNaxKZuPSEUNADaHeZJP/oILkQi+B2g5R2sq9L6Td5PqDqOOGs GaQg== 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=vfMIiyHNfTwBacCZ/Z5kXuUc3K4JlBoxSMTzFBkGMIE=; b=cWsnqyt6wkXOex9HYdNhvr2FyI6It3Uxh9FDcKCGrTz4ksKKVn13eoPCn13F1iyvYU 7bCf3bUW1tyaXPTibacOUs0nZk762UrysXzabLSectXsl0RbqvOPANcQLXpvHX9Dy64i 5foFV2jrWjjkD6TjmBqmaCZh6y81Mp2OOHymvhIPE3FbBxKASY+Cmd1ASQa2o+wvQgYH TjFJle2E38j37lOdCvQOSvYtsNHWFlupuJvClUv497wXBAMQtktdIKB3gOL82wl412kT 4H2t1BiQLwEvMrAxIA8SpCxOmiE9oNA5HrEOn+J2itr9bkdfLVeEZduPlvU4Qk4a96Fo luvg== X-Gm-Message-State: AOAM530cB1Mq0/jivXhUIe/pYB8bp/nehCDsiWy7NEXCj9Txcmnt/IwW DVgD//gxxTp60tBpC51GeK9QLw== X-Google-Smtp-Source: ABdhPJzoSke/WD25do16sbPPB1iMLhoT8BtuLEQkp7TpuufB1oCNhHleVIZUuC0dhJKTrVbGtRD2sw== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr2945735wma.185.1626092824194; Mon, 12 Jul 2021 05:27:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/40] build: validate that system capstone works before using it Date: Mon, 12 Jul 2021 13:26:19 +0100 Message-Id: <20210712122653.11354-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093002271100005 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20210625172211.451010-2-berrange@redhat.com> Message-Id: <20210709143005.1554-7-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index eb362ee5eb..cea8196e53 100644 --- a/meson.build +++ b/meson.build @@ -1644,6 +1644,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 13:17:12 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 1626093208501978.0857158527538; Mon, 12 Jul 2021 05:33:28 -0700 (PDT) Received: from localhost ([::1]:60978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v7n-0004bo-DX for importer@patchew.org; Mon, 12 Jul 2021 08:33:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1h-0004FF-Gu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:09 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1e-0007zx-Je for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:09 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d12so24724594wre.13 for ; Mon, 12 Jul 2021 05:27:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a207sm21604379wme.27.2021.07.12.05.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 804A71FF93; Mon, 12 Jul 2021 13:26:54 +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=1wJ/NQ5UneM0L7R4xiidXrYaCqQq89DBptt8dB7gDr8=; b=VHpxa3sZ/y3sI11WtyH0+DEIrR/6WUvs3akrnYaj5p0wLdoKWGyLyvo3Sx6bYCQ064 JPvI9RgnM4ehhrlhXmGdIGKN6wznN4nnKst4XKp9N0mEoxAhs2xwYRA+EPpJGFVhvgO2 Q5vUwWKXJTBJTV2tYEhlFeK5LVCBnKuNJ6pBjBmr/inkE6XfPgBe11d+zdrX08Xt+IVh QE/CN/Wlp+Y5H+hA/w3ey2SaYVOklMcXnjMdzIjcjcvrFL+YIefjsd2+z64ttWQbsWAp B0doxJGcxZlrB1ENq27Lsghk9uardoLIXkaP4SZtUyPK2clwsgRgAAjhjA+j11rw1juy dOmg== 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=1wJ/NQ5UneM0L7R4xiidXrYaCqQq89DBptt8dB7gDr8=; b=cqIcu3IodqGJQRnxUc8mG3TGAn7TyCRAO8ft+qfBta1dQRqqhBaSB6Q13f3qFUM8i+ ETecBtAgqJ0+Skssnw8XoFjIVqs2I9PFCMv+VR2auX76wG5E0l2CYrWg4WuCGNIaAgN7 VDDNuwwBF2eRgXcOYuB1s9WSSF0JO8151u+czZ3fGaY4Vx4eLljhyaOnbE7ujAJBlE4+ +rnWMNKvATU38MXW7K6cVrJb1NXCTLrOKSDMb5yguUUVszcQghocXeO5ixipqr2M/vli rlu6duOs3DVwa7DFZ+RCoADjHWD2i9pxJLIOEJJh+yb27vdRwhqa5ZwaYSf4g/LnPea2 MMsw== X-Gm-Message-State: AOAM531ao12BJBsV5wdEz8tT7VljnoKCvSSJVJqsp2GeNjhfQw4izxMQ EUkWanugZJYuudmnYt1C3NYGzA== X-Google-Smtp-Source: ABdhPJwZFgM8nPE/9QtpSc3fqfh58r66KHH0vPsLLPpSYjeXgjDH0+Oaklw3cjXNH3hGaphkJdOEvw== X-Received: by 2002:a05:6000:1c4:: with SMTP id t4mr13457077wrx.181.1626092825163; Mon, 12 Jul 2021 05:27:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Mon, 12 Jul 2021 13:26:20 +0100 Message-Id: <20210712122653.11354-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093209974100001 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. [AJB: remove $TEMPORARILY_DISABLED condition] Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210625172211.451010-3-berrange@redhat.com> Message-Id: <20210709143005.1554-8-alex.bennee@linaro.org> 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 13:17:12 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 1626093647160699.6648930198563; Mon, 12 Jul 2021 05:40:47 -0700 (PDT) Received: from localhost ([::1]:53432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vEs-00022X-2z for importer@patchew.org; Mon, 12 Jul 2021 08:40:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1k-0004Ny-TJ for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:13 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:55204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1j-000894-6J for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:12 -0400 Received: by mail-wm1-x336.google.com with SMTP id k32so8074179wms.4 for ; Mon, 12 Jul 2021 05:27:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q19sm19542536wmc.44.2021.07.12.05.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 95EE31FF96; Mon, 12 Jul 2021 13:26:54 +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=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=CMnFQdJQPUP8sl6LAz68UBKE8mZkpcy4TDBoBWK2HmCVnwzmiYz/ybHhbcVWt4kfk+ q1Y/lHo0FItm+aeXGuMc9Gpk3/W3UYH/aMS+hLbRcLi8SlwEbCqY1REBOOozqq75NH1y yBVzDJRHIrTH3mlxqeCXVRmYVZ2F2qHDBdS6O12sfw2dCo+kGWbNVdpYE5t7gG+A2a8P g7i86pxnbclwdTes32B7J5WcQr5HogjlZVVCQmMpZJH7S/0TK4PKbo0c5n2HTmCJjb4T GPj3jN2QaasJU3Hj0vaB/n7/VcHe/MJXHU69VCU2jqn3IIvkK8cgfQW/NKHl+EoP3jgw nsJA== 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=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=Gdi0ebY5yRMTYpP/u4fw7ePzqVdJxIRODqnIO7D9VuncG7RAxeRBA/XdLG0ZPS5vJi d5D1EuJPh4Ez3IEITd9YfpIrV+H77uhb/eeQ3s1WmIQvdOB5EEq8tPy78x8VBURP1pYL Wg6x8cOzX40/dTPZ+9sVRzF/qiA9uKH50im2aqgIxqTGeIntmRTbaukt3r03pB/2KOFW b+lq4e+TKnPDN+dhcbH4lYn3RfDOLTkBjwohp3q4y/LhpBT6oqHraKIkCOH35fX0Mqfc 5F0MJGAGvmcs/9AJij4j2RracCb5QWZQcvdYNtncHeAnVCeIV5Dk4auoHfpbscU0kXIv R6Qg== X-Gm-Message-State: AOAM5314ClFXewXNnlUMxBBaTwDNjCQmMjcwULCgWjF5exff58b8T5yL GU3d6lvuZnyOTB8bykmuhXDMKw== X-Google-Smtp-Source: ABdhPJxHGxeL/NoM65aI6xnVjfzc/3yswvpVK7kr5vynMeg3KUPVTk6K+eD91wkEwAMvP7T8oCL2aA== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr13644559wmh.89.1626092829826; Mon, 12 Jul 2021 05:27:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/40] cirrus: delete FreeBSD and macOS jobs Date: Mon, 12 Jul 2021 13:26:21 +0100 Message-Id: <20210712122653.11354-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Willian Rampazzo , Yonggang Luo , Ed Maste , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu 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: 1626093647881100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210625172211.451010-4-berrange@redhat.com> Message-Id: <20210709143005.1554-9-alex.bennee@linaro.org> 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 13:17:12 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 1626093430435512.8331032611688; Mon, 12 Jul 2021 05:37:10 -0700 (PDT) Received: from localhost ([::1]:41420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vBN-0002Ca-86 for importer@patchew.org; Mon, 12 Jul 2021 08:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1i-0004J6-MB for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:10 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1g-00082W-Re for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:10 -0400 Received: by mail-wr1-x42f.google.com with SMTP id p8so25362995wrr.1 for ; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s4sm1742640wmh.41.2021.07.12.05.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B92B01FF98; Mon, 12 Jul 2021 13:26:54 +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=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=ihQQgcmc2dN+0RhxX+8eMbmRITsVw0ZHbhZyzPGqnR1EWHRi43/266lNI9iYfJ5ANQ RiBCKM2SxPt+JvllCc4nJwHbagSdk6mCkopZNyXdZSmx3aBMLIIUiGxN0vxVoS7ZYxcs 09XUit+K+XRNlU7advrO3NxvU3YdujiSJoVSUThSLBWlN42XSlpzwQai037gS6eU2Hct tOd2193xU8YlA5QmkyiNDn4HYM5SGnixguWIkErdfjiL2AtVCHUCJ7WtroyQGQTSOIlk rZgw+HEy83i2Fkhukwlr/xRCntZWQXRFDGSIPK+hvdu9THJzN4VnXhTP84IUCvB3CGV/ uvVw== 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=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=UEaLc3Xgv3ARTxQ54geyhmfQWGPv4I4mKcLmtwuMgsD90mUQ9X4TkEUqLnYZj/XRjZ KLc8YOqAepLPk7Z1Yni5lDZnrte+F13oWbn7uGZkCR4L1+0HaDADFam55pAnypzaghWI 7yqMTm3luR0LnSS+a0CkncxU6u78t8x9zpLQzEe+K/fDJYXRMmXSNR/mCd7Ii/vGXbNO 1HCsA6GNsMmuvaCIzSnfVJ0bDK4i2jnTp3VlNmVpeE6JBxss07g/W61Hi4fjCD8thDoE 7xbcWd0UH6p6Ye8nqBjE251zrUxbGwvUbf18SvBDeWYaBqyE1OyDUFBgc9iGZ+jwgBIi AOMQ== X-Gm-Message-State: AOAM5319y+QQHFDg4C8YNgMbpj8j2+gp9TsFJHw2Avgn61rr8e8lUQ7E GdBsZTB4ejTEm2ScyYLL4eck8A== X-Google-Smtp-Source: ABdhPJzU6ivo+6thDICYxPdyA26Agp8pOV9LhgYzYZ5NC2fXuVsDgyPb2GADlXF1gL0VeUUXqnsWtw== X-Received: by 2002:a5d:46cc:: with SMTP id g12mr56540191wrs.136.1626092827054; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/40] hw/usb/ccid: remove references to NSS Date: Mon, 12 Jul 2021 13:26:22 +0100 Message-Id: <20210712122653.11354-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093431305100001 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-10-alex.bennee@linaro.org> 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 13:17:12 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 1626093811425907.4803754983158; Mon, 12 Jul 2021 05:43:31 -0700 (PDT) Received: from localhost ([::1]:33958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vHV-00087h-TH for importer@patchew.org; Mon, 12 Jul 2021 08:43:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1m-0004P5-Fm for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:19 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1k-0008C3-6g for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id i94so25336811wri.4 for ; Mon, 12 Jul 2021 05:27:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm14163649wrw.62.2021.07.12.05.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D31201FF99; Mon, 12 Jul 2021 13:26:54 +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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=N7uS/q+/7+1+BLnASQZmYRuLyrv8u+hLp8ZCQvwEFbRFl6qH1nSIJDkHvCRvf7K/iN wnq2QvMWCLHYvKcadepO1Y0VkyxLmAybTvujIBTDDC/vTT9Oy4Jc5X0tYRHNTNHXGL3O BFWIzfjqQ+Xx0h/59GYuHhfHki6Uun5PXrS9Sz5SmnluvGy6F4WABSKH//0E3ca0HBjv mF09q/5sjsqdpXUWyHEjgTIEgcF9QI423A5o7G32Bfe79VeXmNq79+Cdw/j81CK0ruEu Oi3pxMSytde0a9E0KIh1s7Qpgd4+ue7GOzJTDeFau4bG4KkVPPACQ6huMTS0D68NSK5j CuQA== 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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=ARcDuOVMAGayu040WRCeEPHI5+rA/j862xI6wGtcy27VhhUfW6O3j0YfeTr3SAAiiP kCPCdcr2oajV9EzW6MbrG6xbmKrXm5dGxIdQ3OLJtJt4v/9MgeQtm8lxx6jmXDVORVE1 3KqIlr6o+GkUrXD0bR0VWUGnX0WqDCiDkRrOEZiEDcUqZxtVj5Ejo4Q+b7vhlK2w341O hcjnOdS7U/R4+6PBPESERaD0uKks9dUtcRo9IrL6CtqboqSGWC9NT9w1Heiy9YGIJHEh 3jtY00MCVtyLBCb6RpDyeoJ11Z+iUFqqKtErNeWKah3oU4HzK/rO/7QurrdkWZJc2GbI U2qA== X-Gm-Message-State: AOAM531/dup1jnA9oYDtlun4nV/CRFxEvwK9CMnNmhZOppb2tn5xSNxl gNJbeQz1sPtCVsFIWDIlME1Keg== X-Google-Smtp-Source: ABdhPJxKUusKSiO1MDYnQh4oBPLOtzzBBRb4U2mUDZzIisQSWYfDWuTY7FcRlCSWVfD/cWIhiNCjSw== X-Received: by 2002:adf:f60a:: with SMTP id t10mr34154155wrp.127.1626092830808; Mon, 12 Jul 2021 05:27:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/40] tests/docker: don't use BUILDKIT in GitLab either Date: Mon, 12 Jul 2021 13:26:23 +0100 Message-Id: <20210712122653.11354-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093813503100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Message-Id: <20210709143005.1554-11-alex.bennee@linaro.org> 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 13:17:12 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 162609398222661.105143906761214; Mon, 12 Jul 2021 05:46:22 -0700 (PDT) Received: from localhost ([::1]:39596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vKH-0003dR-6L for importer@patchew.org; Mon, 12 Jul 2021 08:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1y-0004V7-Pp for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:36418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1w-0008Je-Dr for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:26 -0400 Received: by mail-wr1-x42e.google.com with SMTP id v5so25370593wrt.3 for ; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v21sm8940683wml.5.2021.07.12.05.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F371D1FF9A; Mon, 12 Jul 2021 13:26:54 +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=QGsJyJN7LttFhIAfv8indlVD2zWT1TMrW1Pu0xBSDjk=; b=lpIa7WlHwYXScyb82//53yp+nB+I5fCLi1BLI1YZkjgMEU+ReSO0l2PjPtxWuot823 b/hVSGi+TrMPs6qbnhBgWoSlsNAd5VlQvPw6dnm8bkyPS+V2HwuXQ8QYXMAnhJAXEYa7 QGnP3LDANtBZuCqqszeyxY0vvbGvAA073T5Uptei1hIeJHXoNiHGwJoOq15pA9PMI8Df PEqCSyxdZ6ZeaKhh85dLLs1RrXlyG6U1NOIIG2GzsXq5JT7HPYiRtaVF2pnuOq6lFTDj smoeR4HGZwWUbDwPgir0qBBpPdiOHTAAnE7CXtouDgYMZzi499qbg3464LvgCmPjNxHW lRCA== 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=QGsJyJN7LttFhIAfv8indlVD2zWT1TMrW1Pu0xBSDjk=; b=ijTcC65k8m/FvoCFUJUUzFhjSwLCYIjOl7PNY0mJoWHCeXeHsP7ly9fdc8bPmfDEil 2ksmh2rJTMQxS3Ogk8KJbAioKF0JBOwmvrNgALo4thQxSRPRNqDOpCYIvEvc9nk2YmZk Qogt6Z0w29vrgU3VaOQp9A8XAVvXLH7Hkvo2Q7179QAGRGemA3KI5VIosHsM9uNJGH1O BV83PJUGPyLgyE9E9zIpjJokEa0zSItOpGyhdj316dtA11yhZijchNLRsefBsA8ZO3k+ N34uK9E7OzXmJtQIUstG4QLM8SdlhAvHcH9c+bh4nQ2Dcs49Yx4PX0XEqsh40wtF62z1 ggHw== X-Gm-Message-State: AOAM531vyZOvTxBGd/wL2xfPSP6lo4yfSaPUNCV0g8SHo2KHE5d3n23a TE65En2h6FfVD7EeX4U0HbvG0A== X-Google-Smtp-Source: ABdhPJxiosg/AnrgtTNjvYp+mQgpuB93rLJWhCbqxuoLLihjWPaYs17FZmSa5qda0cul9TGLCBwgWw== X-Received: by 2002:a5d:4fc6:: with SMTP id h6mr8756745wrw.112.1626092843046; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/40] tests/docker: use project specific container registries Date: Mon, 12 Jul 2021 13:26:24 +0100 Message-Id: <20210712122653.11354-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093984074100002 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-12-alex.bennee@linaro.org> 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 13:17:12 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 1626096289412772.0585709745973; Mon, 12 Jul 2021 06:24:49 -0700 (PDT) Received: from localhost ([::1]:41156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vvU-0008Ei-FA for importer@patchew.org; Mon, 12 Jul 2021 09:24:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH3-0007bJ-M5 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH1-0006HS-Pq for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: by mail-wr1-x432.google.com with SMTP id l7so24503114wrv.7 for ; Mon, 12 Jul 2021 05:42:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x1sm21290835wmc.0.2021.07.12.05.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 24D3C1FF9B; Mon, 12 Jul 2021 13:26:55 +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=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=Eiad69jK+FNvRvB0MqK6bA7ZhnGZFB1PjoD3hlbDWd75jxvojV4vBhQbtqUFFJsS0Z k6V6YQZdaYYyAg+AZfkVhx2MPr/84tY5O5RzTBI9C0+55mNQ5xWyAzomBd45d0E9uonp m95cbGcqPyOhxUFl912dOPd1eFhrFtNSqdyPIGI3QBqlbF49ZQGCbd/iosQkHk9AQsL8 XfozznHh9SJg6ORWhmm4TQDnyB8V1qVrRclWMwLDL7SFLaslDAywXlrWaZ6Tp3KT+KCR JNpfy+nEIqZgD2mYURZLPFIfFWiHMVL4VVP/bz9LyLdXnidZ7stPqhQz8m4WJuW5rAVn jFTw== 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=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=k1WFNCrsR87lJvuAej5CjphyY8KT5jMWtluWyVdwLrY/N0r4SH4B25IYGiFrURGKte 5OfWuTp+LYVPVv06IFxHA2hVozSkud09JBTnCn8ICUQ8wZbaCPgZAzHCvuOPfTXlBbPc WLGqcchjutH0Go1bx+1390RgAMZCjfu30sW6ikwiwi9deI5WK+HzdPpp3pKqD6cD/xTc hnvQD01DvFitWb2wrKL9jN8CmsHSfzjVxvxsGHP184f7htqQS383RVPjpQTTG2A4bOcQ X1Comyc6ug84xDWKn+gb0Oxyetlgj0GaXx40CaWBSCDSKnWfTcqUasi2zPIHw+gNOQsq 1NaA== X-Gm-Message-State: AOAM530Kcmou0rySlLrsXzuTlT2L1ZpqRQe/LU2bHseFusvCXNsUD74O 9DZFyIttjoRABKVapVRzKUlfgA== X-Google-Smtp-Source: ABdhPJyl2BTZdMPZJcofeL662WpCflbxVBFZ5r3TQk3YkRlmoKdkxv3Qb0ZzDUGD/wz5bD5saChlhw== X-Received: by 2002:a5d:47a7:: with SMTP id 7mr27350949wrb.150.1626093778237; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/40] tests/docker: use explicit docker.io registry Date: Mon, 12 Jul 2021 13:26:25 +0100 Message-Id: <20210712122653.11354-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626096290425100005 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-13-alex.bennee@linaro.org> 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 13:17:12 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 1626094209589153.65793914262008; Mon, 12 Jul 2021 05:50:09 -0700 (PDT) Received: from localhost ([::1]:51500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vNw-0003WG-GT for importer@patchew.org; Mon, 12 Jul 2021 08:50:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0004aK-0o for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7D-0002Hu-Ry for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:53 -0400 Received: by mail-wr1-x432.google.com with SMTP id f17so25392650wrt.6 for ; Mon, 12 Jul 2021 05:32:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s24sm14982311wra.33.2021.07.12.05.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 574C01FF9C; Mon, 12 Jul 2021 13:26:55 +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=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=sa2O6QqcnRxSvG77gjGaCnFSSPrGAgMiKFXKBRIaoxEe7bF0L4p5dwaSlymOZAQd+x jIoHrthnYcugXeGAt/5IPvLafAOcFkgr56Rri/zk0rSWCZZXN+OAgE0fwhccDEqS2uh7 hrT6EpCr5DysQ6X77pvIVXA/2BstgQS03/D7vjpBMTIg7nFRT4ifv4b5CiCQS3ccGrSq zlkLuoVx+5L6QBvdUW7vD5wXerC1niDMStivMGc+9zAkHz8LSdkKhEiLp7NfNQhyXooB PqhF5tIFDtu0EI43DAKE8qrQ/F1TQhrNAKV3UMkn3zIXby3wZJydATchozVRCzaYKeW8 ht0A== 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=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=qIc9jrDpr3VzMVEjNignUWvWjWmzBBUI6cvhvK56nNgI394CN8iSWW52WCgbuC7LP3 yohZM2BzjWpy7877XezMuifxBhSZLL8PUXRp2UJVw9gWye1IKH5FN2ZFme5X9Dlcu2o3 yVvRB4r9ray0wT3fysVxWViJMPDi2FN4fxQMh/dKdUD9NR9AVXTFW500UqGw/IKEV07W B+GMhIBnbiye39aWTE7LmcXE9N3b3b7/IZ18W3e+oKGiM+KvMvx8hmVWPm8wxzM912ua tHjq3wOisnNHKYMj2qP/5KkVR2FMrdQ3fUZ2/GTl5DLqEDIbbTpf4rcdR1M1q4xVz3d+ 093w== X-Gm-Message-State: AOAM532Khhupq0Vq4osvSNMYjp1PqDI0ApvXMqVi5mM1OwPTE8io9t83 6NUBtHDzAI/aEEON5mEOT00A7A== X-Google-Smtp-Source: ABdhPJxRqtm/i6LFAaePcgSOrtjo3+p6yUKWUOkcbF0DoF6vYR7BISjGeSSqxXBJg2LT3Rnn0jFcHQ== X-Received: by 2002:a5d:52d0:: with SMTP id r16mr57664470wrv.323.1626093170255; Mon, 12 Jul 2021 05:32:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/40] tests/docker: remove FEATURES env var from templates Date: Mon, 12 Jul 2021 13:26:26 +0100 Message-Id: <20210712122653.11354-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094210088100001 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-14-alex.bennee@linaro.org> 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 13:17:12 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 1626096111947839.4610481865751; Mon, 12 Jul 2021 06:21:51 -0700 (PDT) Received: from localhost ([::1]:60988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vsc-00028h-Uc for importer@patchew.org; Mon, 12 Jul 2021 09:21:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0007H8-Hf for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGu-0006FE-OF for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: by mail-wr1-x434.google.com with SMTP id r11so20161338wro.9 for ; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14016963wrs.4.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7709B1FF9D; Mon, 12 Jul 2021 13:26:55 +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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=gaWzAosz4396SjvK/SyAkrH2ekQLjYru8h/92oE2dgpKDak92LAF6Ek5yi1tkNvWQK UADJ3YNdqZouosLouLmRwyWk7v9dPL092wQ1a70fZHvGAjZTqdqZlmmZTzsVcXF42Ui2 NUa6Q7K4zezw0HLWFVX+mbhvg6akIImkgqhEATwtRBInx0s9U6Or8UDedFO5iBbd/U8F QNgqBOsXAOjQ4e1HGJmnf93FZnAFMhgJVbo/7Y6EzFMU1Mo5P8XklVF7xveOWsBGjNbW +iFWgz2re/51dZ40rKJ+RLfBB0VwvN0nIH7r/1R7B0EG07/lbbkpPJZ4BevKiKbw6tf9 v38g== 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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=VaPhVKL/PzIIl5kE+pKOxsFNIQvomYyTqCWwCvTb+3St+4JQxT5PW0gwTPHrJOi6/V HB37N6uDkMFOd2odUMeCJueHGU+AWeezwWvq96+CKZVEJh2nWNdR3Pn/7zj96KBMomSX M5NvVVpYYS0/M4uA7i/xaQ6paUXx6/EErlJMS5bQEsYgVYaV0N/yhxf3GgFZcEu/sOK6 EY+1/H7bbBWMVRLkET5l/3/prbBQ1iQYUkB7aAHvBPcoVs7TbcM6zxacIXSYouC2D7H1 2/fe1Uiq38l96ZtGKrGaCuAqup8aZJYFEDIySg7aqMENDDIaN7hhoQH2gGdYXfq2khTh nXaQ== X-Gm-Message-State: AOAM530xXJ76VEPgh6r2JSLFC2GmIyBb5yVuVzeq5BxJEzDQJHTn/Ih9 PX5DLQ0jop5Ky0QjZiPqASUrUg== X-Google-Smtp-Source: ABdhPJzXnjUuuZ8ESzDY59rO324WqglvTpm7m2Mq1EODe5lPy8Fm3CupSfLN6x6P4+vsqGQHTm9Ofw== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr9402006wrp.351.1626093771240; Mon, 12 Jul 2021 05:42:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/40] tests/docker: fix sorting in package lists Date: Mon, 12 Jul 2021 13:26:27 +0100 Message-Id: <20210712122653.11354-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626096127239100001 From: Daniel P. Berrang=C3=A9 This will make diffs in later patches clearer. Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-15-alex.bennee@linaro.org> 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 13:17:12 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 1626094168844556.7943947487465; Mon, 12 Jul 2021 05:49:28 -0700 (PDT) Received: from localhost ([::1]:48264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vNH-0001MN-MO for importer@patchew.org; Mon, 12 Jul 2021 08:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH2-0007Vr-3r for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:00 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH0-0006HD-FF for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:59 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g12so3488428wme.2 for ; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n20sm12206700wmk.12.2021.07.12.05.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8DA081FF9E; Mon, 12 Jul 2021 13:26:55 +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=4DWU5y/nf061VnY3HK74lTL314WIvo/gGKxXixXNuyA=; b=Ool0Zblwnq0w4zx+O/Qz87Ksq26natJbE996QQN8FuCdFLi3J35lvUO3EItVPFlakb h7TyQ9Ggsmj4sn5koLQVMu8PFhiECmhXlbAt/FxmECSVkk17cVd0l7sAv8olKxaDpRfH G7U8JcOFiF/KVbJEFqhjc9Duvr4Axpbyz4m04r0l7tDO+qfEWo7pglu3G53Bm4+eqeTE e4FRodZwP0aHJq+Q/C41uLe/NV4E6lPzJ9u4oWLrb6AJHnhspJUaN7CjlXqXcXA7X2p5 W5xdiATPEIc0YovJqWouNxmhrht8SvaoAXkn3fgth6j3+Bhf4CNAxP15slK4I6vajf1e RPhA== 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=4DWU5y/nf061VnY3HK74lTL314WIvo/gGKxXixXNuyA=; b=AGtPfOrCnRUCuwdTC86UetYVLe2K0Q2+cad7zn79GS+2ZYn6PERCIKPQwnDC6LLQSn +uXXTf/jNuV3hXGcErLLXnko3otlEEEuAvT4Ux+Nv7Z8OXlyMNlHKH22+aoPCjT4u9lA WxlmBQXnXIxomcynKU4G278MALDtv7S2ZbCTS521ECf6XX89D7o4F72PGrlU586cwcX5 XBBVc/k9EOJKFSYq18g/9Stp7g1dZ/q12M0BUFPqhn+rD6ViaAQjg56gqlCLOF5r0PNc 1psrrMjCEPl/fOsTCRK1ydW3GZxXgvGRVToFP6+XLB8Sptin5EQvyRLxEVXwwpedtLGK FXAQ== X-Gm-Message-State: AOAM5312hPiOeROvA2uz2LKsbR/AFk1VChSInzJFLMzEObk3vl4pZTEo hRK68Qr92BP9Tf1rcQZpCtUipw== X-Google-Smtp-Source: ABdhPJy4k1X3VCJ5TffpbQ4TRFyX8wxwJPni9aRKGCP0JHiiSBe8+QANVMhUciIagtHxomeiYBCN7A== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr8870451wmj.15.1626093777181; Mon, 12 Jul 2021 05:42:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/40] tests/docker: fix mistakes in centos package lists Date: Mon, 12 Jul 2021 13:26:28 +0100 Message-Id: <20210712122653.11354-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094171097100002 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-8-berrange@redhat.com> Message-Id: <20210709143005.1554-16-alex.bennee@linaro.org> 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 13:17:12 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 1626094228156811.207404056788; Mon, 12 Jul 2021 05:50:28 -0700 (PDT) Received: from localhost ([::1]:52576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vOF-0004Ih-5w for importer@patchew.org; Mon, 12 Jul 2021 08:50:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7T-00052o-Ov for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:08 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7S-0002Me-Bv for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id p8so25389561wrr.1 for ; Mon, 12 Jul 2021 05:33:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l2sm3242014wms.21.2021.07.12.05.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4F961FF9F; Mon, 12 Jul 2021 13:26:55 +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=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=kpOD6exWcoQrovYxsqhSaSFW53Efl1dYqtEaEBUkzgAWBZrDVuhiUqJ+6TzQydHzXp mYr81Wb5xFCXf1iLaWyesigmHncXATmT4ro/Ksfj77TOjchk3F6GkdLQjaV28gHEI9Ph Vxlh6KEdiKJawRJOtqj5NZ/0Rj8npp3/KP3U2vfGVT/Lr5zICuhGOmrZrLb7cyP1crHW 1fQmYPAvmILzFKbnZ6nBmfAYWgbwTvVtIKFEihRPoYJ9FFBp99PHOGu/U3KkBGuDVh5q CkTq9LixtsUr2KxwnUZh/h4cDHEEKedvJzS8yN84yBMYN2mnQGfvwLGBVPYRyK4aFN56 HM2Q== 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=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=GhRogVspOcuP1Sy+zP8Lw+JfbcCdJ0pIS5MVAttmG9qnO572oJBaq6LJ3+EfDXMHbE bBbGkF38Djfh1ZIWosAx/Bv8fUSDdiobJwZUodDRzLWpE6+uDr2iwZiGguxw156eVaaq H5di3mmGg2HmA8UTUYz2HyhFJ31PbhYVY+veoOOeDS9mqRLz/V8zL1VVbLCS4EFyQhhd L0CcMHaeI5H/NprtnXDD6h77Z0iS+MqZcyVotmIfC07B+BaYa35JuUaFeELy6WBFsaoE 1XvjW5XGb9KGDQesz/fMb9hIPku0Dts7STDSqDtZoUTf5wRcgtcWfphSh9jYv5oyH5Pt mWLQ== X-Gm-Message-State: AOAM530jr44L6CCJ8HitTR/nz/5udSsGNi4HHECBAkwlvkJ3eWxo8YQ9 Rxvl5XjNkQRS5vgBG+RrUG0dng== X-Google-Smtp-Source: ABdhPJzBUL9frJjjQlymlO0SOj7cMndc651JtnDNphc8euHtnb5lFDwLXkocKUEQi3pfXICvRfwayQ== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr58292102wrt.132.1626093184980; Mon, 12 Jul 2021 05:33:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/40] tests/docker: fix mistakes in fedora package list Date: Mon, 12 Jul 2021 13:26:29 +0100 Message-Id: <20210712122653.11354-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094230169100001 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 Signed-off-by: Alex Benn=C3=A9e 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> Message-Id: <20210709143005.1554-17-alex.bennee@linaro.org> 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 13:17:12 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 1626094731572830.5064068013753; Mon, 12 Jul 2021 05:58:51 -0700 (PDT) Received: from localhost ([::1]:45264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vWM-0002bQ-Ck for importer@patchew.org; Mon, 12 Jul 2021 08:58:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGx-0007JC-PX for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0006FN-74 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id l6so3028120wmq.0 for ; Mon, 12 Jul 2021 05:42:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i11sm22319891wmg.18.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC8AE1FFA5; Mon, 12 Jul 2021 13:26:55 +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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=Q7eYlYQcX8FFzbywsBDNVeYSIJvnSfvPNgD08h/G2GzTyHdj5aE7diosPGuxlItTbR 7dezITfsnCpFjP1aN3JqfL2fa2VYxxaJHEpDmb+qIdFkAHCpnGVIEdbw+vVzU1xIpACj R+XLfQD+HoML7mavzO0pudE5Q3YH5azSetj49Z8FSEcPzszHq0LV7EyNCkfs0ccGQBQI NJjWezPDm0BECe00d0Sz9lnYSxfJeoWQ89wxH1ufjAAEIt6dnhOfcXgzZGi2lvGS1H3b obOUIDjPV/GKg1lCizAZGfHau4JbyherXNQ1ZDxJxLu8ZO8dXbCzqmyGARHJ3GAs4hPv TqiA== 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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=IpUt5D6sK8U1JZDg0ok7xJ1X4CzrVG6wppePaE/iPp5j/idq5qk/74kT42OYj2zHYy ehVz+k8hWDggllCMu/1rXP16x2+MfrbXjjeE1O1FOZAeexw4fgIgUf6uRkrzg02QA53Q Pt5Z8/xOtDNTExnC9b9a+GP7QOderCrvCORIzJkWh8LnwSZM/1U5nmO+NEKD8QVk0/Qa iVwFIiV+Xe6VPf+qxpRuOaCEpqnFHd6qMii3QaBvSmTYuhiBSn2kVX1SZJ3ies/znDaa BK1vvNEA5scO48hWd/ZPKWmGtuPM4IKimJQ26j8kYo501kYxY7CxKjWn9ePI8V2LvvoA 0rzw== X-Gm-Message-State: AOAM532VahVXDeeEJ73twcLyQ+BgAy/oWuZjdv/8MLpJadzAa3R2B0+H oFchS8WO6papbufYPQbLAmiLRA== X-Google-Smtp-Source: ABdhPJw5YZs1P5EMIZZzYFBSlxLly71W6NeVmSNJAduPCC7dP72B/iiLBu2fEhaBRpYjJjFWqTc6KA== X-Received: by 2002:a7b:cb98:: with SMTP id m24mr5252269wmi.21.1626093772846; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 17/40] tests/docker: fix mistakes in ubuntu package lists Date: Mon, 12 Jul 2021 13:26:30 +0100 Message-Id: <20210712122653.11354-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094733030100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-10-berrange@redhat.com> Message-Id: <20210709143005.1554-18-alex.bennee@linaro.org> 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 13:17:12 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 1626094554252395.3933615717833; Mon, 12 Jul 2021 05:55:54 -0700 (PDT) Received: from localhost ([::1]:38114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vTV-0005XY-4q for importer@patchew.org; Mon, 12 Jul 2021 08:55:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGv-0007Do-GQ for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGu-0006FB-11 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:53 -0400 Received: by mail-wr1-x433.google.com with SMTP id d12so24791650wre.13 for ; Mon, 12 Jul 2021 05:42:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k5sm13437493wmk.11.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D1F661FFA6; Mon, 12 Jul 2021 13:26:55 +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=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=wvKdg8x+R0d8HM6PpRLWZyWX+9mMlLKRohz1oRgDXwet5ayQcVaFGmpOn6Vmo5+UQP UfZT77C8QXTjvVRMGqowZ6hiJUa4QfDs8Ct2sjMGau9A6xyQZgZ+HWNpUAAREbwL6wb9 O3CqPCiw5PxRDUcVKiiCxUJ6fs5ramDbAG8a/nj6PlSmLtjBx8OD8SsAYCXCU6XAUjGr xTXwxgWp10jpbK4OhIGGaN12nIIWtNMTumZJAIGksiDDFw5/vxv28XzLLOgQGqeuzjfg IC4oMwsDfP0hNyf8iAzVIZvz1npq3q+zeu7Ju+V3YdXftGtK3qo6Ow7/aLo0CSJe9R8x GEIA== 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=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=REQtRENdM0CVunpdkDmZlHVjKGnH+i72T9GSuWZCGNdtFxdGsjeflI7L9YLOfVhBrG KpW9yahmIDyNYFm5tEUt1ii3e9sjXAa8zC3xxFvNeajCXQSR6yQBMsZ4eyo98vfWCiId vOW/WV4+y35GUYon9z6Uko6v1QPQkDKKLT4q03d+Xy3ABuIbM+I/QxFdQRglC9UMMi/b p2/peHEskP8oFn55afrBb/0WpdETMcTrggxBOgfAOwhD+HD6ReiLnV2hSU/gPCBn9RH3 w/g9Em4zdx+kzyZncvETUVw2R9oF23hNmDQu6coI24InUjDdWDDUj70sZuvjgQgWN+t9 04+w== X-Gm-Message-State: AOAM531mgYu1TpBF3EV5FRCI22jN4ddxgJpmPWHNCe2ZF/G5tx2GwloW wqINGAo6rY2IKeqUPOEPYSLc5w== X-Google-Smtp-Source: ABdhPJww8iH+dnUWq1cpI40JBalwVSC5UxMBAcy8Pq/XWK7j2lExY4mjDoqrApZYI+VJJJ8ILZ15RQ== X-Received: by 2002:a5d:5989:: with SMTP id n9mr3183238wri.8.1626093770399; Mon, 12 Jul 2021 05:42:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/40] tests/docker: remove mingw packages from Fedora Date: Mon, 12 Jul 2021 13:26:31 +0100 Message-Id: <20210712122653.11354-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094555908100001 From: Daniel P. Berrang=C3=A9 There are dedicated containers providing mingw packages for Fedora. Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-11-berrange@redhat.com> Message-Id: <20210709143005.1554-19-alex.bennee@linaro.org> 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 13:17:12 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 1626095617523835.298788968939; Mon, 12 Jul 2021 06:13:37 -0700 (PDT) Received: from localhost ([::1]:41676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vkd-0005LG-WB for importer@patchew.org; Mon, 12 Jul 2021 09:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7Y-00059h-Vd for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:12 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7X-0002Od-4c for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:12 -0400 Received: by mail-wr1-x435.google.com with SMTP id f9so19715661wrq.11 for ; Mon, 12 Jul 2021 05:33:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm13777644wrq.92.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EBD361FFA9; Mon, 12 Jul 2021 13:26:55 +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=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=g6eSGdRnH26YIdfvJ8RtaYFaeP16HnC6iSr4BYVz0CKXAjnBmQ5aq2wbYzQ9xVvrXG Gfp/lPcI6t3jXWznlDlacjdRIVi1thQ/8Mec68MZ/1cdolDD2C1Q+U6fhTsk2usgPRt4 te/pTUqJbWlygpqv/BWt/leyWYBTJr8gbIYCaYwYS+uRW18as1LtXumGkh75LdkE/EYa ylwN5zKZBsxutM1BaN7205DFmdSAhBr+hdUWpcl+WRRPyR8rql4Z3scpzYHetTuycXvN QLmUtyhd4dEAM9icrFai3gMPDJJ9n9T8Z7rIdac3nxcrW1gS7jQAyt2xjuE0ghQjjZGy qmMQ== 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=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=l2/aeGRDseEjoyKXDsjMEmwpW5LacOkEbSlTIf0reu9aJVKrX0Ay9u7Vb9pKusjfc3 VvzwDCqROsbrptXIWHDWsUE0rxMbYUWaOwc1lPbZmdW5MJrH+fDPm34aVsDzd7aHDYx9 OlNgMJzX5nSkHwIabgZsd7do1am9mbyiLwDivGTpEXYpr+SDl59w9AYjr+DqTgwfPZek ADASabPq1qTi2NN1RLiFOUq2287v3hK+Js2OJOvi0uCDR9JBzd7A3Cah1kEb+d/luw2H JWc7BflFpceye0LmUCuDPouhzr5BDYTZ2DZqS3cPuuGvuaxAcFZhwJ4ofS435qc/BtBi p0Vw== X-Gm-Message-State: AOAM530r+Rvkto24taVmfvRwCweIrSexsSBhlOsmDAhG6lZ3RSAQZ6Ue 5m7QSUOBnB0RYygF9el3h/L6lg== X-Google-Smtp-Source: ABdhPJw9Whwxm34mxsx5CY/Tf7w0wLQGOPoBq2eyUxG8GiWn598y19YvFIdZPJjdH8uISh/WiqDMXw== X-Received: by 2002:adf:ed07:: with SMTP id a7mr26513208wro.70.1626093189971; Mon, 12 Jul 2021 05:33:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/40] tests/docker: expand centos8 package list Date: Mon, 12 Jul 2021 13:26:32 +0100 Message-Id: <20210712122653.11354-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626095619681100001 From: Daniel P. Berrang=C3=A9 This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. [AJB: added centos-release-advanced-virtualization/epel-release] Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-12-berrange@redhat.com> Message-Id: <20210709143005.1554-20-alex.bennee@linaro.org> 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 13:17:12 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 1626094089034471.0049031692241; Mon, 12 Jul 2021 05:48:09 -0700 (PDT) Received: from localhost ([::1]:43848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vM0-0006gL-1Q for importer@patchew.org; Mon, 12 Jul 2021 08:48:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7S-0004zr-C4 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7P-0002M1-AN for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: by mail-wr1-x42b.google.com with SMTP id p8so25389352wrr.1 for ; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o17sm11255883wms.32.2021.07.12.05.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DAA31FFAA; Mon, 12 Jul 2021 13:26:56 +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=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=V7I8i4qOEK4uS2xjB3G/A+sTdR0spA1Wi4WRNn7jp8I5mKFj33EO0od5q6Nx0/XpLl +/ya/cEe+CPFERMfztEDKIaPQ21EpD/STKJGlgjX9VmggWTrAaYJJnUfHJsAR1JNYhyE 9/jYstCWvG0SGEdaE2MymSYV/T5dwOqO0RYrAMvL7VAxeX7ixVP2o7ct/pK7X/3U966g MrVorCyHGDTXMZX4EPeQn88FHvQ/IYIfYz+xNWvjYA68QriLBGxEjpc2ZpQQCIGOBNHh 0Idw4gbz0MaidTRTrMIvpwNrAvqfUKcPufES1/bUiQKxCdUs+Neu+29g873Q5EoV6cEY d5FQ== 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=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=Bzp6/EWYgGOqsoc1Z8a/3ZYlfxZt6YCV1o2EXirqJh5z8tsDxprWnaQFEaxrvBwGxG CURFguNCrxUcLTyXPOHpgmDQ/IdJnUhV0bmJbZoGUfbbIF6DZFBD/N4M0tRDUvZ1if3L a4eTha3756N5SWZmEXJwuCA1X59wLy2+teSSec1TSyCDWL8jT681j5A7c7gxBffH4RAk Hds5FbobobwbCzSJCZUXMI0fPbwWOUnaV1GgnqlvwZijLXPC5PMtrHvxRJmH0WHL+bmx FB80+jAs4wo6m6uVoCohM/Ajz4JbeEEh99N5Ndd+dbGghkU7To8wlGrM58428GypCnK9 Ma/A== X-Gm-Message-State: AOAM531g9qXTIGJsYex4dMk36IFigr2gveDThuiefzXGWgIhwXo+h9PK w1ij0Q0AuIGJwG4XcuBdMAD04A== X-Google-Smtp-Source: ABdhPJx2CS3NBzlIcNRm0TokPfYvmJhmONQp+/44GApHOrJPinW802Cs7Cp5RCpJJlk+lLXFhIA2jQ== X-Received: by 2002:adf:e507:: with SMTP id j7mr58755669wrm.152.1626093182138; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 20/40] tests/docker: expand fedora package list Date: Mon, 12 Jul 2021 13:26:33 +0100 Message-Id: <20210712122653.11354-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094089400100003 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-13-berrange@redhat.com> Message-Id: <20210709143005.1554-21-alex.bennee@linaro.org> 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 13:17:12 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 1626095076599242.7316365513036; Mon, 12 Jul 2021 06:04:36 -0700 (PDT) Received: from localhost ([::1]:54178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vbt-0001cS-4y for importer@patchew.org; Mon, 12 Jul 2021 09:04:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH5-0007gX-A9 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:03 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:56068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH3-0006IS-HU for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:03 -0400 Received: by mail-wm1-x336.google.com with SMTP id j34so11311574wms.5 for ; Mon, 12 Jul 2021 05:43:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y6sm498853wma.48.2021.07.12.05.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 22FA11FFAB; Mon, 12 Jul 2021 13:26:56 +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=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=I6LzuEipWvc2ywlXcDj3RNdyYHlF2heIwlQQUTe9an+4bOYz+OuTrNQDCOljaRbJEe JBqMfW4D0YQiOj7ZGdXzgiRoD1q5uQXkDNrg9+7xui35P7CtUBiQskOrPU3HLW1NFh/P U9eDgwaV3JkKVkXBe3x5Ykxnx9QB5VmikfstxspT+IqOlxqAGReioL/Y1ZwZjRVRHN5t B+rCIMMtnev/6uK1P/Jz/q/wQQ34WZWlpNc72y1qRhvdrXPV98b0rJ63fVdOUGg35L2w QoHNdCb+7XBnokci38O8vowLwspKMLQzbg3yZX51j8q+ohqcEf5/KGYGXxut/89P+QGA KMyQ== 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=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=m5vthjHtYLh3LGiIE+ti2r7nPci/L+Yn+hz2MSN9CNLLIOay/StJHHMoew4WpTEBcQ 5pV/xi6PZpb+DqV6F2mTPm8YnIj96f6eYmpqoWCNbI1EFqd+jvSWZ7778+Q5qvS2bY5k 9nowR6Cj5NY/Tu5I2f1vO9Kkks9BaF1UttjHl44ZhvW9P3iYjTmbgS45aI/9g1pL9lDK h5MoIFrh7MV4vfvLRznTacEjUj+T5YtODQnMTZtFh2vyoRzvXJORrzwoU8APbzo/kraL y/E233q8sk7w16g2QrVMI3ITR0LdLNSBFjX4BhPFM7NZat0zQd9Mtsr4hOsEkre0spew f6TA== X-Gm-Message-State: AOAM531S53430hK4Ymw141HFBXlS10rS/n0twR7wan7lgmuWs0yGSM4e XQ7pkLvb07BVlno4VpoC2fLgGg== X-Google-Smtp-Source: ABdhPJyNYEHacL4yYr209qoGmx3wYmQ/DKvOIns0Wlej2m0WCsgdZ2DU1LBlyhnkABgg6l3U9XPYGA== X-Received: by 2002:a1c:4b0a:: with SMTP id y10mr25619550wma.178.1626093780179; Mon, 12 Jul 2021 05:43:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 21/40] tests/docker: expand ubuntu1804 package list Date: Mon, 12 Jul 2021 13:26:34 +0100 Message-Id: <20210712122653.11354-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626095078062100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-14-berrange@redhat.com> Message-Id: <20210709143005.1554-22-alex.bennee@linaro.org> 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 13:17:12 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 1626093834248532.949459027635; Mon, 12 Jul 2021 05:43:54 -0700 (PDT) Received: from localhost ([::1]:34980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vHr-0000P8-IO for importer@patchew.org; Mon, 12 Jul 2021 08:43:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7N-0004pS-VY for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:55234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0002Ke-8c for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: by mail-wm1-x333.google.com with SMTP id k32so8086530wms.4 for ; Mon, 12 Jul 2021 05:32:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm14570769wrv.64.2021.07.12.05.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 392701FFAC; Mon, 12 Jul 2021 13:26:56 +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=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=ZLxw9izsxl2TDQGGGILtMNIOzeCDeiVVrFOZw13lzbU7ONbF04fLX8KOpUSow7pcVC 8eDEnBS8yOwWfsnhyR5Zbvy93v473VN09XAEIELeTXLZQeK3NJZj91KlsofcLDn+f+IW VRUQLdspsjhddSJ8TOxQGxNAKbjGersP6bfFUE569IFEKHzvLXJ2RII/uzkrC5UNELJ9 ++fno+VfM8qDo9M8A+JoU/6lQ861PuejLlUYpTRWhChuebVqqwUfZV6NB5hFY+b5PXNL yxWBlrnx+E9SmUB1XdzCScVeMqHbhLnVQVEPQ4VR4bTyJvgosKBd/4cTuwLLwjl/dG6O zvfg== 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=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=DP972jh3ctMdgx3DNaXG2V7DS6iV8aFUoUrd8/tMhkIa8jq2IyNuuV98jZi7gxNflM RPP0svqithrKdNMHLy/ZhPa/eH5S61IyQG2fAhQRqjY5XRHOnvRmEqMrbHwsIDfNo7iX GJNhaYvLZlaTEg5IeJMpNgRQhh6RFTVPo5j597o7ENlN1fqN+Y0Dsr9WSSoY9IEjFsE4 VbNQ6ZjS7dVqvaZpEzxS9pNsrvfW8Twt6xh0himGiDUgPZ5YC4ocfOmzh1+6heqVsOrk g5baQYI05bcKE8V7dvCB49YT2yWydnIfFja20Fd97jxCESIqGWdhxhg61j728D8x6FEc 2KOQ== X-Gm-Message-State: AOAM5332ycx+w9ITkEUvGTy4S8Ds2mBSN5kCDWfEra/tSCuEILQWCDMh jL6M8L2qVInRUdQxv4nuu6dBjk4z4IkJmw== X-Google-Smtp-Source: ABdhPJyRv8EihqrqDFwuaVSzvDXu+jGkylXcJIw1M8bd/Qsned5cojlO0ejvLZhiB9idQBxmHP553w== X-Received: by 2002:a05:600c:2f17:: with SMTP id r23mr4755081wmn.39.1626093178962; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 22/40] tests/docker: expand ubuntu2004 package list Date: Mon, 12 Jul 2021 13:26:35 +0100 Message-Id: <20210712122653.11354-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093835866100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-15-berrange@redhat.com> Message-Id: <20210709143005.1554-23-alex.bennee@linaro.org> 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 13:17:12 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 1626094612440767.8369475517859; Mon, 12 Jul 2021 05:56:52 -0700 (PDT) Received: from localhost ([::1]:40438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vUR-0007Jh-6s for importer@patchew.org; Mon, 12 Jul 2021 08:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0004ik-4F for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:57 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7H-0002JK-Hu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: by mail-wr1-x435.google.com with SMTP id p8so25388809wrr.1 for ; Mon, 12 Jul 2021 05:32:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n7sm19225626wmq.37.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5132A1FF7E; Mon, 12 Jul 2021 13:26:56 +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=8Kc/AtnrUFUSMDCa/D5pKIGcs4TC9hfXWUXk1KzQyfo=; b=cW+llawbtEl0xG2YlpH+kTjbfnezk6wsHu7LmTDH+XlwXNqDISZxq2urRN94HjYp/3 0sH2xKRK8u/EMg4M7pDAXbuDKSIe9vYMS9iTi1r47f448vOk/HUwyb5Sn33uJcyQfl1G xUja1ZnwBFcTuA4oiCmfDw88Dq4HwuUMY0MR+N3tBl24jGZuFTS6MX+h65WdEmcM+3vK YDkIp+65EFkurTQSTplwuI4tP2wWNzMGon1up9w9OleP9M9keOwJid5U4/kkxwAjrzfQ LkwxK8sn41M6ZA7269697RBIwDJetCFNNOYQ3bqOixQLTGFDp6V36dxQtatIrj/m1t54 azuw== 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=8Kc/AtnrUFUSMDCa/D5pKIGcs4TC9hfXWUXk1KzQyfo=; b=ltEMGWsKNtjvG+h6qu6/tAKkCnvpkst9CXk2/JMBx69lJj6cj8S+ib1LyyF2VJ+C9l TB5KTCx+GxdvzMDHZ86nwhajVOZmsINUZwSp2LoXuksqMsCYy1Ecq12NG1IXTH7N4o2X urefYD6Q0FzrvLa9x0SA/SHpTeaq7Gvc9kxYrfBes2kxJjtAX3RKcXzKIdEMlg4XMSir JsqIKHaENLj97Dn3TC6ktxBGaySWD6v2K/nwm29rK1nEdc2DkAQi7vIZguXDKYD5BLfz YWe2qGw9P8c4qcZspdHgkZNFCXBEizJJGhKk7BzcJcD5WRIZ/L0jeIZp8wOHCYEvIlBu H0aw== X-Gm-Message-State: AOAM531UA3D+DCHQL+gpqdJVvBZ1g7Eftqa3m3Ak4g8H6X0lADveZaUq fIjAW5P4IAdjbjsga98Qs+VvPg== X-Google-Smtp-Source: ABdhPJw+esLlRdE6vd1gbNTH4b2DFy5EATtyIU5Ek0b/JcWUlNM4Zt7yiOdLoqMBfagemunt/UVmvA== X-Received: by 2002:a5d:408a:: with SMTP id o10mr19915613wrp.272.1626093174229; Mon, 12 Jul 2021 05:32:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 23/40] tests/docker: expand opensuse-leap package list Date: Mon, 12 Jul 2021 13:26:36 +0100 Message-Id: <20210712122653.11354-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094614346100001 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210623142245.307776-16-berrange@redhat.com> Message-Id: <20210709143005.1554-24-alex.bennee@linaro.org> 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 13:17:12 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 1626094399892121.65124215912294; Mon, 12 Jul 2021 05:53:19 -0700 (PDT) Received: from localhost ([::1]:60260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vR0-0001B8-Mm for importer@patchew.org; Mon, 12 Jul 2021 08:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0004bv-A1 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7E-0002IH-HC for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: by mail-wm1-x329.google.com with SMTP id w13so11300971wmc.3 for ; Mon, 12 Jul 2021 05:32:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j12sm14775142wrq.83.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 68B9B1FFAE; Mon, 12 Jul 2021 13:26:56 +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=QQsPUcmmvCXpidPMt9LFIQWrpqM/fEvzdVYo5rHypHA=; b=CD3iw/9Oi/7wgkSHFA+2iBd4bfx6W0J2pVs5SFN8uUliToVq2TXWr5oWgHpGNFcbx4 Zh/doZPz8JUvYAR2ud0G1gGNq1boh+dgtcUlQ1Rca441Uvrsztfk26jwtbY4MaarBoPG shpQBZRA9l4E2zR1jn5q33/+2xomM2u5a2t7eej8m5X7uWVoQm4kZZo9HVx4xmGw6Djd a+y1y5qchxFx7SlXLY6v8Qpl1U34sdM7vlF+YTmuYQZ4CEft8gga0mR+bkX+hNW3PEoD QH6MU1SPrTUtUPHdiOWhNlC8CR3rHQvxwces0s79lQXWEofdN85N38Zbb0PS3jg3E0hP 8NAw== 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=QQsPUcmmvCXpidPMt9LFIQWrpqM/fEvzdVYo5rHypHA=; b=DhKOZljM0NPSi/ilBsylFwyrzm73ASEz5j2pcmbl+SPWTBk4IlNNUC3xmq3jLbcUQi X24D2FDrLhl47o/M9HnXDq++eaWfzvMfWKjUyX/bzZlpoh65CIycnfeCxUvfhUzZK+7F CIfSnSt69J0Cdo90QICYpvoovawdjHtfQo/z6ZNh/dN2JBKhgR4EkcBhjGkPcJhJuP0L OsFTj358bXU/RksY8ghfgLAUpAt18RNzIN+Hyz/dvG7FvYAtewb3XQCrRC/75AC43hLT Qi3PeZCtcVceAhNKeB7+rclisuaVJhjyW4uvD1mCqLtIKEES+xD8G9E374tBrNulHSLr HRoA== X-Gm-Message-State: AOAM533ZLWFd3oROi02uF03MJBs+F+AdFSDY9MdsWIu7PSWS2Lm8MvT9 8UqlGgAbN7/At8EQgjO01GSEBQ== X-Google-Smtp-Source: ABdhPJzqsQeFUGSC9fq0GqcxO26Fs7mx3eFlrFn8YZCy2XHm0Ah30/RY4eCHk8X33xQCHqF5LRtm5g== X-Received: by 2002:a7b:cf29:: with SMTP id m9mr7059726wmg.13.1626093171192; Mon, 12 Jul 2021 05:32:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/40] tests/vm: update NetBSD to 9.2 Date: Mon, 12 Jul 2021 13:26:37 +0100 Message-Id: <20210712122653.11354-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Kamil Rytarowski , Reinoud Zandijk , Gerd Hoffmann , Ryo ONODERA , =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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: 1626094401779100001 From: Brad Smith tests/vm: update NetBSD to 9.2 Signed-off-by: Brad Smith Signed-off-by: Alex Benn=C3=A9e Tested-by: Gerd Hoffmann Reviewed-by: Wainer dos Santos Moschetta Acked-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Message-Id: <20210709143005.1554-25-alex.bennee@linaro.org> 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 13:17:12 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 1626093982235801.3451555142724; Mon, 12 Jul 2021 05:46:22 -0700 (PDT) Received: from localhost ([::1]:39582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vKH-0003ci-45 for importer@patchew.org; Mon, 12 Jul 2021 08:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH0-0007Pt-IV for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGy-0006GM-S8 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:58 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f17so25434084wrt.6 for ; Mon, 12 Jul 2021 05:42:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r9sm12685546wmq.25.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 81E861FFAF; Mon, 12 Jul 2021 13:26:56 +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=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=Le6DTuwL8LYqBzAkOnz/5DpTsoLqG995HvVJdmpsAtYi29w550wwwAoT/vXGUJEIyP fK6kAho4WyHJAlb8xXGJVslBPgbBPz/8j7hcpn7RMZpbdz1ADmrcKQTyKCE5duViELoM V/R5WdtTyKqRMVtk6eF6bhG+LbWX4o4yze50Ezb5UDQnhsQe9s/XUkDmKwChB+FsTr5Y mLLOeLSVccjB/GLyVYGPIV8Bw09qjvWma9ps5yFNq9QzDtvjKdPxmtfyMx0w1+w1Gmku MjaqvfGa+ewrLYcMwZR4yAVHvJZp1KxASJOaI5wEwIJqLv6UT9uXVmhs7OQx0Fr6scZ4 iMDA== 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=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=unGPfTy2hj9dtYjmlItckCUqiwB7iu5rzg4W/M22gaTQSxQPaDF3Lw93ZFNKOIhjk1 qpH6Xuy1Q1d9wOtM1PZoBz6tUhy7DsdA5x557p0wd8RdYVxXL1q0TZz3qApqQaNQfdxL wUIoITpTNRPkd7YAI5QXa6R1mNbmUbyI/SYqUjGJxkcBH1tkW4T7k5Ex3Pu7BAejJQaK W12WEvLRJKX+8r/Bf0XGt3eg3KpVD/22y8NHy1X3zB1EdNR+yWfwwAZuEaa05b5djz/Q 3C6+rh+553hxuskwREalwoX9u1NYths5XoF04f+2BGDMUu3C0T128IsVixsVYBxegaei NwxQ== X-Gm-Message-State: AOAM532o7wbuVJpj8ZhLXAI3vJIDP/OhOzjlOfwlFB7ojitxmHsFa7mC fuVKd1kE7BpD8giOth1qoIXeXQ== X-Google-Smtp-Source: ABdhPJxmP/bWt820/NFnBM/epaqvLkIB1NauZqQs8WISkX9ppZngr9p6qN6GNQJJ5UsrJWPtrP2AZQ== X-Received: by 2002:adf:82f1:: with SMTP id 104mr58743960wrc.306.1626093775625; Mon, 12 Jul 2021 05:42:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 25/40] tests/vm: update openbsd to release 6.9 Date: Mon, 12 Jul 2021 13:26:38 +0100 Message-Id: <20210712122653.11354-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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: 1626093984029100001 From: Brad Smith tests/vm: update openbsd to release 6.9 Signed-off-by: Brad Smith Signed-off-by: Alex Benn=C3=A9e Tested-by: Gerd Hoffmann Acked-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Message-Id: <20210709143005.1554-26-alex.bennee@linaro.org> 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 13:17:12 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 1626093772480622.1688333906344; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) Received: from localhost ([::1]:58662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vGs-0005mW-UJ for importer@patchew.org; Mon, 12 Jul 2021 08:42:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7I-0004hQ-On for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0002Im-Lt for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: by mail-wr1-x430.google.com with SMTP id d2so25437909wrn.0 for ; Mon, 12 Jul 2021 05:32:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v2sm4343790wro.48.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C0DD1FFB1; Mon, 12 Jul 2021 13:26:56 +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=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=u6HTZ5YExTncGSR+Zpwn6zpVJmQy38nueXIkpCEA76swjBzDJBEp1bS6/knghXdO9J 3FFb7eP26acStmSIgygKXQHoAEcbddvnK0EKclbR/z0VDMRJXcGOAVtEjbnWrj9/Mg3x kFqPzAPEXApQXa+OaFsHmm+Esbn1N/YprCB1VzsaRj74QeUcJsA2+5iUUug+ZegUwOFi CMOHuvuiQBPrwj38KZ53ZPmbtdnHY0YzlWdMgIWrPp1EIFPGzckXPiBU+RPO1k/mkd+Q fFraGK22psvkS2n974iBC1JZcamEIZ/Lt/NpXxdCeamAi07ou8rBKPq+33uDgeFnqVbA dd7Q== 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=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=m5ZzicgwsuOArFj1WHvurgrxFqruKjT0JQ5jv7sQnCJM9XRtMKqokZMIIoM/5OGk2b Tsqybv0O6J6ly6pFjJF+kqcDpAnMoUY287wE1xuiGda5/RDlt+eCjbBpt5EgN0phN708 wbsZwCyL3CBXYGiNo2DjZ9fIQFjLlzguNMC/8SwE6r3fvaMCX8HeEWLBpAx7/Qvf+GwJ tMsNdnK2Gd8Rlp2IIp114s2Ouxtg0a685BC2yi1X2qbOtH5rkhpGeAl2w38tTQpxSYrT oEv0waY3DX/g/47CBIKYTJjvzGzJlEaKbqSn/NbLvygZmRA9xeFL9wiunj6IS73dRtuu nsbA== X-Gm-Message-State: AOAM532FtM70fLMW5zo+2gxxryDuaEeWV4DDaXvoIiU7IITs7neWCUiv XWrQ3INHuxTEXdiU5jbaWp+SAA== X-Google-Smtp-Source: ABdhPJx8gpJ0UbRkIMORyoziGP6aCjHggbIuDxFeWROozP1sk+T2ZnxpPibD1k9V5TAn5g2I1Fuhsw== X-Received: by 2002:adf:c44d:: with SMTP id a13mr40391139wrg.65.1626093173327; Mon, 12 Jul 2021 05:32:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 26/40] tests/tcg: make test-mmap a little less aggressive Date: Mon, 12 Jul 2021 13:26:39 +0100 Message-Id: <20210712122653.11354-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , Taylor Simpson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093773280100001 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 Message-Id: <20210709143005.1554-27-alex.bennee@linaro.org> 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 13:17:12 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 1626094056521921.7137380068626; Mon, 12 Jul 2021 05:47:36 -0700 (PDT) Received: from localhost ([::1]:42702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vLT-0005uD-G8 for importer@patchew.org; Mon, 12 Jul 2021 08:47:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1t-0004RQ-Op for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:22 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0008E5-8F for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:21 -0400 Received: by mail-wr1-x436.google.com with SMTP id i94so25337439wri.4 for ; Mon, 12 Jul 2021 05:27:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm14587472wru.6.2021.07.12.05.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B4EB21FFB3; Mon, 12 Jul 2021 13:26:56 +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=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=xIr/u/hDJxP5B/JgezcRz07IiklTl7wtn7qrIbP6dMJD9cgT2a0j2k/lXTVij1wMzP BXj07fYG8I1WX4i3YCvIzp3msymoYCprBd4K67pkUyszkfl1QRqR7X1wLbsUg3Gg6nJi ZbY9I7MBzVdJBkxxxRRGZDEA1KnfVZxTz+LvN1aq7AJb/tl9NMIKz71drvtJiMycm3Xc +6JReQgenl/HtTZ9Sjygn+eZRFPni+WMK7Hoa625bYT6/PHNuwHIiCzsU1Eo37Qtc7OQ 7+H0aFPZvHoaB00Fo2WksP10VTM4pJffro+f/JItop/AY/RtbLcySQmjWaTgEq3T0CrD LI/g== 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=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=Ijn7Min1VuAvbpg+QziLzniqt3GXT87NnsxwS+ZaC4S0qRQL1SkqFcM8KNxzmgLnsG sOuj5KCXViMtZdtzoAbzP6zwrR1A7rANL6QCHZS6A4ehHWS2em9EaqXbyMtDd/1tq/ZB jXccFXh9YR3DZR0BnB54dqPXWp0wKftQa5XtoRusGxmKaFijU7m9F3Vi4IUvk1mMfvIb GzYzibN5mzXoU+nseGUwekFc0nu47c9/nJwxlEEOKdhvhmaEjXKkqTF6xSXm29pW7wxs e+DOsUXyeUbEUb97of/WsPgJtEigPTlLGwbc9rSEvLwBf1EfWWuVR/qCXjI4FHB34ymd ULDw== X-Gm-Message-State: AOAM533dW3s4bTIDjiE00zI6h0UL2aivaANbV6eHpo0GVoQW/gk6gYfY zeK74mfOQhKG/gwOr7Zj0RuBuQ== X-Google-Smtp-Source: ABdhPJzkS01HAyLuMQSs/R0bHGY1HwuMJ6dwJ8+Hty/i88VgbvEmLKEE6zgT8krzrPLZXSTdnAAAQw== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr22363333wrx.114.1626092838547; Mon, 12 Jul 2021 05:27:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Date: Mon, 12 Jul 2021 13:26:40 +0100 Message-Id: <20210712122653.11354-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , qemu-devel@nongnu.org, Paolo Bonzini , Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626094068536100001 The compiler rightly complains when we build on 32 bit that casting uint64_t into a void is a bad idea. We are really dealing with a host pointer at this point so treat it as such. This does involve a uintptr_t cast of the result of the TLB addend as we know that has to point to the host memory. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-28-alex.bennee@linaro.org> 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 13:17:12 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 1626095503214226.12212147051525; Mon, 12 Jul 2021 06:11:43 -0700 (PDT) Received: from localhost ([::1]:36622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vio-0001hO-FR for importer@patchew.org; Mon, 12 Jul 2021 09:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGy-0007JD-HP for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50946) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGx-0006G4-1A for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: by mail-wm1-x331.google.com with SMTP id l6so3028148wmq.0 for ; Mon, 12 Jul 2021 05:42:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f15sm5896610wmj.15.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CEAA11FFB4; Mon, 12 Jul 2021 13:26:56 +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=8bCBhKBxzb/qFxkz11jaikGPG2zqXOY5uZnEdjQKerk=; b=nixLLqER5kBtTMoZ/nYDOsTXNFXYUDhbGRq27rBTfOLJ+C7lk663jQM8eDiQkJd83O H27sYPf8AZqrSmj2JhGOV3rOmSRKtmG3wGSzX+eTlkYFjvjsG1N8/Qg2s2zomCG6M9pQ Pc9LJgDiKBl0+rmWxjO3NanFKcmejlucriYAjD2C5+91/eQXkC+eFlMKTGLXJHUairtv QzLJqEZW4kMf7kXP73EMMg48STtZJtQSy+ZLKiRspApQnbqSOTHU0FD57pCCAgQqGv16 9nuc7ObOtis3TksPOealaqwiKJxl1nbdI9JFWZ+EPOzS26Tl5BwVZSgCq86e5tySqYzc /h5Q== 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=8bCBhKBxzb/qFxkz11jaikGPG2zqXOY5uZnEdjQKerk=; b=JKL3GV1omcWMSB3Okk2xIKknJv/2YQ/mIq/6ssAsLpmDsgAve04WSAvJ/NFcY69EEa GImcwtsG2v6IxU5x6zBLTCd4VGDgOzSI6km3EbCQQVoBP0FOByEKHpodNocxFUob54gJ U2/58SQ8VWIGddJmBRztLyEDGl4PLTQXzPme2HcqB2ZfM+g7iwgdiiCdBHJyUcVbsmE5 ULNpzi2qyrnidLtLkCzsrtNOZRFg2KlefPDRXMqPnV8SGz9hgELXgqlcbNZtwQrPjrMW pJTIGOVrZp8SE4WMrsUdIZ9aBh49X2uGqP2k033z+f9JUvR9L6CMPowFhTb9Twr6VtS6 X9Vg== X-Gm-Message-State: AOAM530YQg9PdhyVm0T2g5qCS6MQk/6k5hF4S7Fust1GNZ66YRu4tEAh NN5nLDIKQ8QFB+sgGTDNW3SlAg== X-Google-Smtp-Source: ABdhPJzypAczKcjYiH6ZFKiXD/ZVQ028ukohdP7jtw7fSB0B45Ln85h+4pIbhrUwfp7J1m7M6RWE/A== X-Received: by 2002:a1c:ed08:: with SMTP id l8mr53883589wmh.38.1626093773649; Mon, 12 Jul 2021 05:42:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 28/40] meson.build: move TCG plugin summary output Date: Mon, 12 Jul 2021 13:26:41 +0100 Message-Id: <20210712122653.11354-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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: 1626095504005100001 Let's put it with the rest of the TCG related output with the accelerator. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-29-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index cea8196e53..ef0d54bb75 100644 --- a/meson.build +++ b/meson.build @@ -2740,7 +2740,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']} @@ -2856,6 +2855,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 13:17:12 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 1626093426454949.0726582080002; Mon, 12 Jul 2021 05:37:06 -0700 (PDT) Received: from localhost ([::1]:41098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vBJ-00020L-3f for importer@patchew.org; Mon, 12 Jul 2021 08:37:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1x-0004Tp-Eb for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:26 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1t-0008F7-Ic for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:24 -0400 Received: by mail-wr1-x431.google.com with SMTP id m2so14328550wrq.2 for ; Mon, 12 Jul 2021 05:27:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o28sm15202121wra.71.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E43EA1FFB5; Mon, 12 Jul 2021 13:26:56 +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=tuIitrhF9ibjgdg1Td3JXbbYjhXcUV2FAxUCzTDO08g=; b=Mx+xxXsZo465t0kFDUsxnEwG/whdGYyTOonjmXYY9iDeCJT7LzGtN7UWe3pLjM5rPk R5ft2LJAwu5aeUjzjsaw5mi4gOPzfCJlz1u0sDWitbnxtwG7HU77r7b0GQHQzl0YIqhw O1R+dK8IrRKqc+upzCB1vp17aIEPBpOjAKNfmTHSNFc6YAYYJRp/D9JQlwgRqCoux3YD M6eMS0+xe0mK/pGRxeyxzLiJwNCJWC2Bgu0XKwLdmNOpAuIeVqZM+2DOY2+V07cr9uxA OxkW+PMYW51qseEvdy8LF5hHXj9ohn74Xgl0Rm616MgV6WdhvtsMI+Lf3vK4Bt6vz3nk Je3A== 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=tuIitrhF9ibjgdg1Td3JXbbYjhXcUV2FAxUCzTDO08g=; b=QjAcqWJm22pAQYWk5BLMgwMbmO1M4pgyXjQtnIJRE3IFGb9NSYYIpZMzX0t4MzfIbm rmaqclm/9jFnVrVABJASopcOB6pT4AzFjIAWUPmDh4QGjDghYeb9fypgm+vpswRXjGhk O+K3bDWiZZyLBriq3kHmUVkvl1rSPI3ISfqBtFphqFE8VeBeB1/Wc7h/Qa4Z3SCF6qFd JLZCNf7+zAoOp4qd25XpL1zlOE0LKvIlhJ7NABX7NfrghLMTPM3hKKZ9Akne7v82+7Va Nn0yQ7mYdn1mNNfMr4HdB46lEObuyRXCVaABzkRgISH1TvmwSaqPYBYrbV7TNAhnr1Vd joUw== X-Gm-Message-State: AOAM530iDX7s04ox8SlJu8ojdKRLeprM2m79EpauvhrZkjGTolJiAD20 A9OYAXvGhP9dT6LtUuFRpMaZL1oH1l8bKg== X-Google-Smtp-Source: ABdhPJxR9JuhKYB/wzZg21KUiRfGrp8MUduU/Uu0PyBHGkP/MNDVCfPSBtKOH3KwwLgvDyEvaGYBEA== X-Received: by 2002:adf:a1c2:: with SMTP id v2mr34699273wrv.155.1626092840208; Mon, 12 Jul 2021 05:27:20 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 29/40] configure: don't allow plugins to be enabled for a non-TCG build Date: Mon, 12 Jul 2021 13:26:42 +0100 Message-Id: <20210712122653.11354-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093429119100001 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-30-alex.bennee@linaro.org> 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 13:17:12 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 1626094648290102.96824249840734; Mon, 12 Jul 2021 05:57:28 -0700 (PDT) Received: from localhost ([::1]:41584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vV1-0008Eo-45 for importer@patchew.org; Mon, 12 Jul 2021 08:57:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7T-00051B-61 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:07 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:44884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7R-0002MT-Fm for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: by mail-wm1-x336.google.com with SMTP id i2-20020a05600c3542b02902058529ea07so11396666wmq.3 for ; Mon, 12 Jul 2021 05:33:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm13994059wrs.4.2021.07.12.05.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 064B71FFB7; Mon, 12 Jul 2021 13:26:57 +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=roEQiiqn4/d7JzDwl79ddq61d39aQG0jRwujhTpjOXc=; b=A2TAQ44BTbm/i4+ic38gekCWPvmnnnQGfyw9LQJ9lHvW/lEhR9anZv7h6rDgrFaq8g QEj7fF2jHU1uG0Hl1RfxGITYWue5OQb/s6pqx9m52gGpQDF33+5425zcAJrCY/DAh+5K viMJZ2cKep00+VS8+CTPUg+dGQ1iroga2o2o/CheRN9N5z/ZD6e4K4KWi1659od0fP9F C86Wo4C3jYh/6gAE+8I7UyGUzExRUQMv6NnVnNHC+rGy4KNWH2MFRprFoD1ZBJLtAz2U SmYAyOTh/Gv5IwEKgus+S3h5edyGjcE9TtYf/KD/JZEGApyq5fKMBX3V7vBwjxf/C/Mg M2xg== 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=roEQiiqn4/d7JzDwl79ddq61d39aQG0jRwujhTpjOXc=; b=fOfUpSVqWx0yVl3C62wn9DW2Ovg628BClHq78auYUcig2ydgT2IKfjzdbyXsVRXUwd Y/bBi+7zPC/7Z0K3bqJYH1GSjIO/w+uTTB33mebCYLUNEJoy80w7DjFqvSy2mdtJmn1u QBFK6zb1gXgsA/DYITQkNpOZVH3wzuwFDlbSXqvYhH/nUneUdlvZ09HyZvVx3ZK/JrJe BA0kzHK0p5QBWDEyGnyvle1TMSIvr+Yzo4cczGAIMxQj9nNPhQmBMiMPeyJdd3MWsnjR xb/QnXw1s4EbtfXzlz7jp9Zu5GqcnSxFlzHxBzmFkQ+7QM6d9k/mWnK0ffhEXXgEPAdH 8n0Q== X-Gm-Message-State: AOAM533D/+0QbNbZeoE5PSybmQedTTX4ypm1/6s2Dqtm2RuHq9hih2hd cqqZZAJkH10odK7ehofxEbIqgw== X-Google-Smtp-Source: ABdhPJyd5BzkMVjyz2g8mW6C/6WjDLTd5JerLOoJUXtx/GMWYjNh0SePgnCjXlpN1enGMxRUglk4hw== X-Received: by 2002:a7b:ce8b:: with SMTP id q11mr12804461wmj.80.1626093184282; Mon, 12 Jul 2021 05:33:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 30/40] configure: add an explicit static and plugins check Date: Mon, 12 Jul 2021 13:26:43 +0100 Message-Id: <20210712122653.11354-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626094650521100001 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 Message-Id: <20210709143005.1554-31-alex.bennee@linaro.org> diff --git a/configure b/configure index 7f906be68d..2c9c6ab870 100755 --- a/configure +++ b/configure @@ -2184,11 +2184,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 +3982,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 13:17:12 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 162609358763866.35800918267478; Mon, 12 Jul 2021 05:39:47 -0700 (PDT) Received: from localhost ([::1]:50324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vDu-0008KQ-Ko for importer@patchew.org; Mon, 12 Jul 2021 08:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0004R9-Df for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1n-0008Cz-3V for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:16 -0400 Received: by mail-wr1-x42c.google.com with SMTP id d12so24725203wre.13 for ; Mon, 12 Jul 2021 05:27:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y66sm12813532wmy.39.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D0CE1FFB8; Mon, 12 Jul 2021 13:26:57 +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=/EqKRf54i8gl3hRcUpVK1o+1fj8ip12CroRx4jiNsRI=; b=GzfZ4Ypg6eJEUgXwucyKeZeTkOkkE2BvFv2O274ZsadIa3s6rz837pN4/88MAs9uCo ITNpus1lqL8qERrg76FId9SXRrU59p1V5LzFeb9GYoMjaGEZTwbid+PL4sFGSaZUYO2h PGPzMcDozTewfWQXbeVdG0Y+dXiC9Xm7Q2LBUSc9VMX9MvBG1MeEuvi4NZy6nI9Yl6vG KXFQEJqXk/vzvpDbMUQGy2JArg09po+hfIj9RFRRAYzC0bzQP9jg+CFSaN0wXc1fh1Hj aVZ+zPLKk+OjkAMoxaqiAKoXwlUTgPSx+/nglbepcTuCGCbbrenkdx/Anq8rVDq7hGOQ xAtQ== 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=/EqKRf54i8gl3hRcUpVK1o+1fj8ip12CroRx4jiNsRI=; b=Ql79j5akh4fZbSeSSMwx5ZdGcSAN0nkW8RBxHFYIzQ3evUXGeyw/cLuLiP2k8d9EEi p6u4Jr6oEw5Ee5nCLmlC1ghCAO0e2QY/KL9ge4wY09+BfPd5UVnWrM4RIsymVTkjWP70 wYJXOH5w3U6fT+TGXC7teSwnDt0IXzw54wURPj+q7E24xqbq1YP9Ip3zmaf6FSmGVKg+ gELiEd9aT/VmMOhi7V5Rd/EosCDFiI+yqe/SgRqPFfCYmz8PvHH7/K6YyfLEAkCHMOya Q0FxYxGldoCTFCX/J6uNO3JaLbP8mYxllrh98j6LlXLJF/u+72rpqoTqMK69foPxC+3y GWpg== X-Gm-Message-State: AOAM530ZqO2+nEKFUgzy3XvMnFavTCNiwBmKzJ24PhZYMEad2/HlpTDC 3EF8D5+JvJdNEGXynhQ/WXa+qw== X-Google-Smtp-Source: ABdhPJzndsqQU50pH/XKVMbHmtpe0wCd7cqWLW9EzQzACHYDbvFcr+UgQQi5X63bjDoluVVoQRWxFg== X-Received: by 2002:adf:e488:: with SMTP id i8mr58753537wrm.285.1626092833785; Mon, 12 Jul 2021 05:27:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 31/40] configure: stop user enabling plugins on Windows for now Date: Mon, 12 Jul 2021 13:26:44 +0100 Message-Id: <20210712122653.11354-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Richard Henderson , Yonggang Luo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093591896100001 There are some patches on the list that enable plugins on Windows but they still need some changes to be ready: https://patchew.org/QEMU/20201013002806.1447-1-luoyonggang@gmail.com/ In the meantime lets stop the user from being able to configure the support so they don't get confused by the weird linker error messages later. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Cc: Yonggang Luo Message-Id: <20210709143005.1554-32-alex.bennee@linaro.org> diff --git a/configure b/configure index 2c9c6ab870..97ea6e6629 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) @@ -1510,7 +1511,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 13:17:12 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 1626093441292972.2457656774762; Mon, 12 Jul 2021 05:37:21 -0700 (PDT) Received: from localhost ([::1]:42554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vBY-0002zw-86 for importer@patchew.org; Mon, 12 Jul 2021 08:37:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0004n9-BG for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:00 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:55231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0002K9-MI for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:59 -0400 Received: by mail-wm1-x330.google.com with SMTP id k32so8086420wms.4 for ; Mon, 12 Jul 2021 05:32:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c125sm18783135wme.36.2021.07.12.05.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 380F81FFBA; Mon, 12 Jul 2021 13:26:57 +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=QLGV3nOOa57cJf2gO1fpwVSEwaIR/mViJx+0lBSJNTo=; b=eTPCjvlV52H42iacsU5RvA5u2TFdNpdBgRlk7l8zAIA01agwz60m6gAXMtMjOepBvS AX6wcqInb0S+aQzMpM9l4GwxKK6C5zWFOBezc9dL/GxAatOaoqqioUuOU9h0RIwflVIg em7Lf6fviKsQzmxrFmTDFrJfd9uW0LA7EL53cufQZ6tRISTByh8AXUj8mCZrCMvgl3rT cvWmycOsXrSvhriVUxdEjADCwYVnBB8CSWi/wSYUb9UQj7U6pgNf6EOow03WnYQQ6Zd6 CouiV++FRcd/YGsqWiW3aNJ7TcqJvTNdHy8bvNa5BYqSL8/VXhIIxUnB+RTkEJZWx8wy OZFg== 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=QLGV3nOOa57cJf2gO1fpwVSEwaIR/mViJx+0lBSJNTo=; b=RTXRIKegoVjSQlVEaHzADsiTWLq2/0Nv1yfZ7d+Wj8fssuRQOwH0eM96GiVA2cQqfj vx/oYMGAQUif1mHFCDg6VyUg+XvSyynUR05QuQSMtWzIbVlW/ZVzkk5WalMjWx5ul0I1 D9sh9bnCMDmnU9eKV+pjjZNiiLY7ZXULVYCDsi9falqmZ78kNbKUkzHU5CK0lJqjXinG Aa4s9+pBYUn2HSTVW+DivZ1djyJaQeBXwoHRXbTtqjVOKjxh4K0uupNEIAyjkr5WWPLI L0qXFpAz4yubX9j5i0XU3o8PwW/wRZ3Db6QSdrtKVoMdWeAilVNx3FhJmg8MpfqlOBI5 RxWg== X-Gm-Message-State: AOAM533Z0DCHwZNQVo8KH412aoOoE0RNGOqZzi44SNt/4bcHNlU4cUzO HG5M1HUtJGqSPSplzYc+tK7Duw== X-Google-Smtp-Source: ABdhPJwMkDsA/0iq1tL9Uf3/FbqLIK0auflfXQ8ph8H3r9pegkG3nYuPlpv2d5pxyFmOYQ12jCVDIA== X-Received: by 2002:a7b:c108:: with SMTP id w8mr25685291wmi.99.1626093176380; Mon, 12 Jul 2021 05:32:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 32/40] tcg/plugins: enable by default for most TCG builds Date: Mon, 12 Jul 2021 13:26:45 +0100 Message-Id: <20210712122653.11354-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Alexandre Iooss , Paolo Bonzini , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093442475100001 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. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Cc: Paolo Bonzini Message-Id: <20210709143005.1554-33-alex.bennee@linaro.org> 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 97ea6e6629..60358529fd 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" @@ -2196,6 +2196,8 @@ if test "$static" =3D "yes" ; then fi if test "$plugins" =3D "yes"; then error_exit "static and plugins are mutually incompatible" + else + plugins=3D"no" fi fi =20 @@ -3089,6 +3091,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 162609377809996.85235757023725; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) Received: from localhost ([::1]:59096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vGy-00063t-SL for importer@patchew.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1z-0004VA-Mu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1w-0008Ia-Dz for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:27 -0400 Received: by mail-wm1-x335.google.com with SMTP id l6so2996294wmq.0 for ; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a8sm10337396wrt.61.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4FCA41FFBB; Mon, 12 Jul 2021 13:26:57 +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=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=qLJ6uCig4bym35vyKp/twqzW3HESa/Ri591f3yFejsD654FNqeOU0UqLxn1Xd1zHIB bBRvyoD8w9Vem+jRpN5ihKH+re/zrLYRsF/5AFGbpAUWWhF2CYDSkqifbK6/b/BnYy5+ s3wNz/w/udcfYsvZK0ukrthh397dGNwVd5RHhyDBBaGkX9jDDsc/ney6BtSsKrieddib k9Ws25SlIcD/8q0RrcvkjocHCtxXSU9unEZMKYrSryHB2TgGBKQjZWe0qbRgsstTnvkv tthev7jvASY6j/pzhnSvBQkjYzSikLCFoVjkiIB7FLWk7IsSYcUyO3q/QWwjY/Rwqdek zVzg== 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=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=am5F7hKQMbjAxUxC/rg0c4FouKglUWWtD2I0ZQOS3yKQB5BMqwfMF7HDhZ8c1k7VBO cxKmGh4Zl0Y49jCMFMsNuSjQYhUqJntT8dk28kis7vn+PRApomLYTWINc1EdUEZurJE1 KbgjyBfAAcccTEY0VUIVRUH6ECuU70E5sICFoYkMrj/QCQgYbck47t5rsj7YJDXsNbuS jz8xlEMY2ydi1YOGqnzWoI/S3Z1bdn16c6tgq9zQnuEcBE5dzHVfCAQJQZ4WzGket2sI jdv4cID0vM8aeM7irOVF+y5fRoz3Wih8JeOq4vuJhw+5765kSOLzzYasUA5suehr21xd 6fCg== X-Gm-Message-State: AOAM5312ZIXtfmeo38sGTTcIimws1ZCYxQdTePtnNEXFw0h5f8kjb75Y lDIIvhumCo+62kK5TVxwmyZ03Q== X-Google-Smtp-Source: ABdhPJxkfCuqixqPp4gtdY2Tr0XUeYny7e4Ce498bgH37OmdR1dIYJFyziNSlyfDdF3PEXIM5HOyPg== X-Received: by 2002:a05:600c:4f53:: with SMTP id m19mr52936321wmq.176.1626092842376; Mon, 12 Jul 2021 05:27:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 33/40] contrib/plugins: enable -Wall for building plugins Date: Mon, 12 Jul 2021 13:26:46 +0100 Message-Id: <20210712122653.11354-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Thomas Huth , Richard Henderson , qemu-devel@nongnu.org, Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1626093779603100001 Lets spot the obvious errors. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20210709143005.1554-34-alex.bennee@linaro.org> 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 13:17:12 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 1626093601058240.74186412660413; Mon, 12 Jul 2021 05:40:01 -0700 (PDT) Received: from localhost ([::1]:51384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vE8-0000cO-0m for importer@patchew.org; Mon, 12 Jul 2021 08:40:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0004nY-JM for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0002Jq-Ef for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:00 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f9so19714763wrq.11 for ; Mon, 12 Jul 2021 05:32:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o17sm11255782wms.32.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B0571FFBC; Mon, 12 Jul 2021 13:26:57 +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=XvvAfutC3LYsNNeDs/S59h7kOZpMUoub8RYnuaoGrPM=; b=pnx0py5NHOdmQhI4Z0I4c2zQzH6dWbSEVZr56/qF6qV4Es+NCrpcmY1+j304niRMkA Zr7nSy9Ge/QNbPxxJH0oipdtZzbsERwNVXjHj8dKmp0lWxKfSwjf/A/fOSDbnU8+kagf /DEC+lD5GUgdYY6rjABI1zY7CZJvWelo2SfEmmbOpXQbEz5A3rrFdBWO83hHfj6zA2i4 6Nhbr+h3Owycg1ckZrEMvSZBIs+Jm1dtC+SMnT+qbYn/X8GRqVuabuadlBj9rG77p+2B fOrmGvXimbeRNd460e+gXCiPZrrt2Gw8tQg4fl3fQtr8CyF4qvQiWMuIeYJadg93VReX lKdg== 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=XvvAfutC3LYsNNeDs/S59h7kOZpMUoub8RYnuaoGrPM=; b=Rgg2s/A9T7d22w4WLiGZs8Tm/GyubpFqPdmhZ7jLcOKQmDJ2OOSLQnpG0YrPPS9wYJ HFLvRRvVGNA4l9dP7Eh50IExw0DP9vVsmiTvYXQruSItptCYTf9l/94stydweGxpoemM 31exW1P2mASadiiZMzepQj7X9D+5fswLeOvHDP+hhC6NDvMwyP168sU+/BzXMEEVVcQ2 gKlKzyd1UApxY0iRDKw9mLOZn6xxNPW8OjJ+iLLgDoDXIdlXZCPIgJ6458dzDHtWUDMS mvUfNJVcjQpmDQiSWYSfimz9DUtiiAZAWKUyaE7c/8bQf7EmDrxTPZysNpyIV3FR70Qp cIEQ== X-Gm-Message-State: AOAM533i3Mju4+rTwuUB4EbblHhEOCIejfS0mIwraS8uyFK/klh/iGYe a0yOCPFihrMtXzBcRscDwe/EDQ== X-Google-Smtp-Source: ABdhPJz5lmGxks9pLZfPqcYrLnQCCCuVT+uL3LL2h2hF5o1sRPnxU+5rUv0BvfBNrYypQQTYtq8XwQ== X-Received: by 2002:adf:de84:: with SMTP id w4mr27509972wrl.104.1626093176222; Mon, 12 Jul 2021 05:32:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 34/40] contrib/plugins: add execlog to log instruction execution and memory access Date: Mon, 12 Jul 2021 13:26:47 +0100 Message-Id: <20210712122653.11354-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093601986100002 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 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210702081307.1653644-2-erdnaxe@crans.org> Message-Id: <20210709143005.1554-35-alex.bennee@linaro.org> 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 40d095dbbd..97ad270762 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3018,6 +3018,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 13:17:12 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 1626094168919108.00153289007267; Mon, 12 Jul 2021 05:49:28 -0700 (PDT) Received: from localhost ([::1]:48260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vNH-0001ME-S9 for importer@patchew.org; Mon, 12 Jul 2021 08:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v23-0004VJ-Jt for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1z-00004v-0k for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:28 -0400 Received: by mail-wm1-x335.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11117349wmi.2 for ; Mon, 12 Jul 2021 05:27:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f7sm7393877wru.11.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 817331FFBD; Mon, 12 Jul 2021 13:26:57 +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+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=VmnFS1ZC/+VboiYWrk1c9gULOLJyoXr6mcIcFOeUUwJW/07Rqs/SJjnNTvt7d8Gp01 s26+lw0CYKvVnN4o809oglxvVOcTm03p1vBr8kbRGaB7Q7sV91N1thnE4U0JhdMIKVcL Zn19ncq9azK3zDnnLlbFGGyylUmmDfUGxX/FlFsLpvGePX/8MBcJ0Ub8RGozCUWJJZV+ 94TjH8NrmMco78lPDwSncPo+7VJXKHjUBO3lrKch0akhYK/D+X974bt1quVC03UICUTe 10CC4yKTo8NgW3eH1pUS5z/JndvyuyPo5LvT11pTMNP+sNMURuVxNpzwn1D0Sam8vw7J VQYQ== 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+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=t6LKEHcGa3MheLqTOuOrBBBi03LEjcfNcsvtojF1Bf4VWeCgJB+vuOz8skWb50PN1U 8rWJhYBDXZASJyFdX9o3itkXuMeqhxstRhSPOegOoSsG8QRuFl4DuGtgaSoiX+9Fsuub Q8zT5oWSVL3OnmhU+9cEV8oZW+5m4D/jvPNSKcZr1AwPL1IzZSE8hCOU9j9/Lr5i85ko CueqwMm3E2mmn2pkOpctXVXscQmocVcNTXJvwhNPB3vxkKFZEQbGS6Jmv5riK6o+QpH6 JCeEkDjuQmXRLf0bQ02gq847wJvWqNjNbftArT0aDE5inHdwMozka4J6yeJyVjx/BoRo mnYw== X-Gm-Message-State: AOAM530PrphFisigPOz4S8D+iuZ4j98gJtVAQllIO1lIxoHQFvCatxe9 xLAY1aXvJuGlYqw/dSL8uk7mSA== X-Google-Smtp-Source: ABdhPJz1hJpfEjAe/5Pp6W3xXv1/B3RK79XHdC1qSS8u8SM2iKyPFYLDYet7bgjCPo29PszktUUiuA== X-Received: by 2002:a1c:9d16:: with SMTP id g22mr31475840wme.152.1626092845196; Mon, 12 Jul 2021 05:27:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 35/40] docs/devel: tcg-plugins: add execlog plugin description Date: Mon, 12 Jul 2021 13:26:48 +0100 Message-Id: <20210712122653.11354-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626094171094100001 From: Alexandre Iooss This adds description of the execlog TCG plugin with an example. Signed-off-by: Alexandre Iooss Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210702081307.1653644-3-erdnaxe@crans.org> Message-Id: <20210709143005.1554-36-alex.bennee@linaro.org> 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 13:17:12 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 1626093432133695.5524839190339; Mon, 12 Jul 2021 05:37:12 -0700 (PDT) Received: from localhost ([::1]:41558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vBO-0002IR-UM for importer@patchew.org; Mon, 12 Jul 2021 08:37:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0004RA-Dg for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:20 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1m-0008Cu-HC for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id m2so14328035wrq.2 for ; Mon, 12 Jul 2021 05:27:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n12sm14586977wmq.5.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9CF7C1FFBE; Mon, 12 Jul 2021 13:26:57 +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=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=miYu/c9QkKwj+n5o44CqHmk5+e6+N9G4B8KDJHMNVnmS2wxDtafCO9u1apU17J4TtO vqsVI10MGtYhDgtcuUdA4Sz8eeSLZ6wU2pirguGT3hftaTcKttQwSo+u0DWR7ueOrE1A yrpGaFeW9krTJJlbSEgWY+jxCIK/M08J3L4MTC9DPjitaifS5V5P1ltmPK3H3VQkBWH3 VuT/kKxpphNZl3oI4/vk9MwcorvKQTj0psPf4pvIliudttBxe6ylobjXg2qKhMGmYaJS 7bh8pqRbkfER6NFti/j6nRaGX+yJ/rkWJ2esIA4sAb/jptGj4VrfEbfNJ8JLmuEKKXBk 9M0A== 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=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=ov4VjFd5RcfSXmH5Zytw6Qbo/Jh7SfCrl+u+i9kOFUPIu/GV+WtR5N84scVnf+vbf1 N1XPCdWKdhZyVhlA9AXXaRrVqPpnOjrh2ftXmzdAd38qalmJrNgLcf8n1QzpY6H0JsLi jqotz8QUAXSTR4TKDS4CuJRdIlhUeUiZtttIzwp5oUujiirWjPjZyVO2Dbnd02f0UrNG 522WRyT6dCwiyYIRzmxON40CHJSi+uOrddmvpX4IGJ8CJ5crU3qScDT587vkJOKPyN8e qSbRkGq580qowiN/svMCvKMlFDbpwcAMZ3WmUaf7H5dEzL77DaOtIf729MjpzQhOXwFC 9Tbw== X-Gm-Message-State: AOAM533ckt63JfAQ/9pGpjQ8VEUwqUHZGCw7T55PdWKlMjPDPU4CTdW8 W4DZrA//SwyuXcM6Qc4E5OHZlA== X-Google-Smtp-Source: ABdhPJyZZdHrFnQO00WAgBobS3akVkQ5T/pJJOUk6jpmTYMEVzExc9Td1yCpLjAx8/lP6F8XZqLZUQ== X-Received: by 2002:a5d:5913:: with SMTP id v19mr40487256wrd.14.1626092833122; Mon, 12 Jul 2021 05:27:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 36/40] plugins: Added a new cache modelling plugin Date: Mon, 12 Jul 2021 13:26:49 +0100 Message-Id: <20210712122653.11354-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626093433511100001 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> Message-Id: <20210709143005.1554-37-alex.bennee@linaro.org> 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 13:17:12 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 1626094432684417.9770409168309; Mon, 12 Jul 2021 05:53:52 -0700 (PDT) Received: from localhost ([::1]:33402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vRX-000272-4o for importer@patchew.org; Mon, 12 Jul 2021 08:53:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7R-0004xb-65 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7O-0002LZ-Km for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id j25-20020a05600c1c19b02902269686f585so1107268wms.0 for ; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j10sm14003254wrt.35.2021.07.12.05.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B25D91FFBF; Mon, 12 Jul 2021 13:26:57 +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=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=l5Bl/l8bfm9CtcRNnat71enRKXTOBf4T0RgfBeo9ygzU0EfdVJrx0dK7EBrtMXoPi8 l2nrIbxmmu1TDfwGmCiFbNUl67SLQUay4gZVj25h9Ajl6OmSJ16uBrDiJ7CoC897G2Bb Q6U0lt6tCtYQuVtkzXEtbYsLvCikzEUWPOsC1xoURXCEYM2AuAW4xiIpoQvbkqCoSVlj Vm95ZN1CYv66iQGn8by/ccIHULYzjTvJ4uCz8+3NfDCAJx0VaED3uvmj+FPbiGs2Qw6M e8jDxXvJEfZ7s3i12i7TN5fWjhVcW8dKTR6KYouF5NET/ZYpAeVWRhzSLq2FezJX6JcI rz0g== 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=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=CiviOy8iPxGYem1qapkohaqsqkLpgUNTWYqxlVL99I5GSwmAcpC7AetcC1UngH59Iq UCVsmYM5QVHy9oz+ziRZYPhG7nBn7WoknSZQETa3Uw8kx5FidPteW8suG08a+qhfPGQ9 vjOfpT4EcrPHT0QDCApHK+ZSIV4oqrOUpWUwdkz1lfTsMNahD++TR5ZYvQdnt5nrn1wH 22TYDL4SwnWj8b/mVJepBkLIpWsB5E3vPpSYY6g9Jy5kpV77TP1j/8vKMqvx499kb3gR IVVgfvBLC9H2ZE8NnXpS6Q+NxzTHZMZvkakjLCKIj26LLkRvl7AaX7rgleVii7qggzOc TbSw== X-Gm-Message-State: AOAM532mHK2vDa07zea4uDAfnGhsHGJXk2gJc6+BKnhKuY4TVmeWajCP yvhs97eE5AzMgqpcyCzhWHdRig== X-Google-Smtp-Source: ABdhPJxkZC0zQp7a4bRuOX5J+LOF/+aOG3tikiQRWnhMTDN3HWN7w2DO0LJBc57YlxzZzKhrw5JnvQ== X-Received: by 2002:a7b:c113:: with SMTP id w19mr14345673wmi.44.1626093181392; Mon, 12 Jul 2021 05:33:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 37/40] plugins/cache: Enable cache parameterization Date: Mon, 12 Jul 2021 13:26:50 +0100 Message-Id: <20210712122653.11354-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626094433610100001 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> Message-Id: <20210709143005.1554-38-alex.bennee@linaro.org> 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 13:17:12 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 1626094937997992.9160750989817; Mon, 12 Jul 2021 06:02:17 -0700 (PDT) Received: from localhost ([::1]:48696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vZg-00063U-Ty for importer@patchew.org; Mon, 12 Jul 2021 09:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7W-00056C-B5 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7U-0002Nf-Fq for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i94so25362270wri.4 for ; Mon, 12 Jul 2021 05:33:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b9sm16929530wrh.81.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CAC131FFC0; Mon, 12 Jul 2021 13:26:57 +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=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=wOxid+OP4oEO1p1dOJXHcMhrJBAlaNc8ZRtJKz1536+eUpMTlagskqjQKvFGCcul7a OKyKjGOsI94KBmR6nsmN47oqRzq2p+Y4iII80wIkwSrGbhJ9H9AFnlQh08sBWZf78j9Y X3CtJiKCiZ622P/o1KIgbnZdKanrhBmCvJsoZTXQ1g55dZatZtgFToUSfqPfy1/700pY /ymLpUpdCWInzgPk1CasLvsGrK6/w7crUdfI74gD2AfON6ptn8AM4B3HnTz62lXcoI9+ hYIkB0ahzwqc6aJ62ONj7VZofk75roGn6aryURkIPkKOocd89kwla3dYyvSdjyZdy6Wf ptlg== 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=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=fDh0zWb6Df18RC5WMF6tSkk4b71Ball7szdrT9kolRHBcoyK++VovnLn3EFA38/Qv5 eyNCr1y1MrElkbip84S6BrSJI6hAiqHc5/I+ZhaaqOywotESJqOZ41WKh5FHuFCyaSJV 3l5ptyHS8lWHscvsG3yu62ED4Fl13QwMciKW98AqqGhdKc8mkymPOg1AhOuVM32sYWl/ /2XnV9aJixZrTxIKGmEDHV2XOk924ncQRb66M3MUg5Vn2iLZscTI+vS4sNFY2oibdHVa FjD4fw3IVhPBrB32/qOkm0A1B1O2mTu90UKC3NwF7K1os3+1umO/LRyUWcUR3rYES/oy kCQA== X-Gm-Message-State: AOAM533bH8/+Yty3kLrZCBywshunTmWBrqlAfXlmMuqWIt7VmM6wIdOB +ZwPCYISeFC4oPD7y1l/5nhZTw== X-Google-Smtp-Source: ABdhPJxZklxzpR3ah7bMtC3kvVJUIMofDz9vOQgi+gZfjMCTw/pwwnYCOiZ0jXeBegAGRXGxjkPlNQ== X-Received: by 2002:a05:6000:180f:: with SMTP id m15mr58817378wrh.388.1626093187246; Mon, 12 Jul 2021 05:33:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 38/40] plugins/cache: Added FIFO and LRU eviction policies Date: Mon, 12 Jul 2021 13:26:51 +0100 Message-Id: <20210712122653.11354-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626094940938100001 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> Message-Id: <20210709143005.1554-39-alex.bennee@linaro.org> 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 13:17:12 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 1626095233975898.2391358771048; Mon, 12 Jul 2021 06:07:13 -0700 (PDT) Received: from localhost ([::1]:57454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2veQ-0004ea-Rq for importer@patchew.org; Mon, 12 Jul 2021 09:07:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7W-00056h-R2 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7V-0002Nn-71 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: by mail-wr1-x433.google.com with SMTP id i94so25362315wri.4 for ; Mon, 12 Jul 2021 05:33:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h15sm14132998wrq.88.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E26A71FFC1; Mon, 12 Jul 2021 13:26:57 +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=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=UnL9Zb9DvJIxWWdgYGf1XuSawL6V1P1fd6VILrBYxHLzDjwhhiQ0zUCiga6eHR93r+ RJl4o3sopk84qTJN5wIv6UqzRKhqqHkwV3oiVzjW2XRseU7ewcCCEXEnmUzh4DXn/4QP ht9vPUm+Y0Dp6Zkbvsl4uc0W/Q9lBmAPG/FAgSJypn0BiMSh3j5EOlokMAAZQ1nD/ILW d2q0S8cdHcA7CZbV5eQH9MspNJWNyJbaY9dJ3dNIAXqIIEluGJCj/ZzZil3KUuht6HT5 p920U8FqsRMyl28YTYWst9ELgxNofKrH6yGSJj2knDQhNTNV1O6qE8JPnH/bvc3iVz8I 5L1Q== 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=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=rdPXJntqOoI0PgiQ7tqSDswIEHr5jep4VUiu2wPg4cd76WUWGGF4O//AQb+eZxTazA phS5LYVk/E8q8UAD7lYNWhT+pkuxoO2JZg9bx0+it0VcelnMK8OViMCvb2FIsyzwnNNX dutaG+wOEhTc7BUr9zCV9pSA1enn2QE7o8c+a7zeBJ3FOnddInH1T+fgFqKoDfU9uAZ/ v3NBFhUMQC2kypZATsdLPqBTvGLxV1KAk1kNt18XyoB3LkVL51c4+3yrmhw7F3Gwni2d UM8Ju7a1vsm9g9R6/E/15PO5yY0Y1XLewhx0O7bZ2tLE8aHY9UhV2Uva0C5T++Ai3sf5 eB5g== X-Gm-Message-State: AOAM531KGzARkhYQ4+ZB1Oxd0yWBnjkLSSYuQrxdtvwHaUNb5tDDxK3u b/ryw2ZJl56Ck6Q2EITkuAMxCQ== X-Google-Smtp-Source: ABdhPJyLCkWEFnn1u2LroUWUcFkrvII6S0aPisn3rQqQB0Tj2UQfpTyFEGI3J5aPBHSHjabssCoMLQ== X-Received: by 2002:a05:6000:1375:: with SMTP id q21mr26491382wrz.147.1626093187903; Mon, 12 Jul 2021 05:33:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 39/40] docs/devel: Added cache plugin to the plugins docs Date: Mon, 12 Jul 2021 13:26:52 +0100 Message-Id: <20210712122653.11354-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-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: Alexandre Iooss , Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626095236341100001 From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210628053808.17422-1-ma.mandourr@gmail.com> Message-Id: <20210709143005.1554-40-alex.bennee@linaro.org> 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 13:17:12 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 1626094877269403.34650569573876; Mon, 12 Jul 2021 06:01:17 -0700 (PDT) Received: from localhost ([::1]:47538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vYH-00056A-Ho for importer@patchew.org; Mon, 12 Jul 2021 09:00:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7N-0004oZ-Id for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:52069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7L-0002KW-V7 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id n4so888092wms.1 for ; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k20sm13143774wrd.70.2021.07.12.05.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 02DAF1FFC2; Mon, 12 Jul 2021 13:26:58 +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=6ostg12cD5MaGqrOjfyo2IBJRdLr2Aw7UmUZUCJ1UFE=; b=jQVXrWOw4NrpQ0U4Ea35l5qqnI3T1pMAsthDfYUJNcVE9QiAsZKz3KBgvwlAaO5tML HPYVbKeOsS9COeGnDZByEOvT6GiL4EOIY5mPhTqaayRRs0PIk6txqi/CPtZ8vyTFIV4W GW0IMxHRR2+Sh9M4hJFnwwmGQAolay0NJjbN2wsW/pysmy5DuS+csHhem3UZbQvNA/VQ VqxK2RSrvybvuUoVRygJehEWKswwnx62tGJEekS5Wvl2P8+CWeblqcm8qAHj+CmSqsc/ cUzsVPXg7fmY0bjSfeGtxu/MRcDvq7gZaGa5PfUMZ6F0WksqLkT+Z6cELY1W6acHInWb zJOQ== 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=6ostg12cD5MaGqrOjfyo2IBJRdLr2Aw7UmUZUCJ1UFE=; b=CoJynn4oCaxHYfj98scLWK/Zjs+8nfvjqs80/WBcP3QfZJ+CT/RBXNC9jPx/g3Jlof c8rSv2gX3NZLn+3sN7pskBcqZ26V/3SRXIQwLpjWIlrf1raM7toddQ3kug6KSQeTFvrj eIVMMhWfmHHZPhc7kyEmKbiwiryUNa/drPEG1bxwd6WqbpruIETYmNiyO1vskY1t1IND TisF5QjAoKr3Fj0isltxbsPbeOobx2kOAE4oVMif73F77nE+ltpNr4zlQcBE8QUj6uU1 Egdz8T8D2MSx9eexFLkZN7HdVFG9K6KeBAXHc+ij2ikaQV2+oqcQ7eGHZgRfFiT0FBrD nxww== X-Gm-Message-State: AOAM5328AUA4szALsJDRxALvhh1gPQtxjNLQBub6+g6Ctjhj/1+VURMv Sl9QuG1p924/iP4Cjibz5r2JSA== X-Google-Smtp-Source: ABdhPJwJef1UnHBC6F+AZ7a4PzUfo7iJnimlmNVjnEwH5jNvh05TJqSLHxm0WfY3MO7h5uJzvPjDcQ== X-Received: by 2002:a7b:c5c8:: with SMTP id n8mr14317188wmk.124.1626093178045; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Date: Mon, 12 Jul 2021 13:26:53 +0100 Message-Id: <20210712122653.11354-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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: Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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: 1626094880517100001 From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210623125458.450462-6-ma.mandourr@gmail.com> Message-Id: <20210709143005.1554-41-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 97ad270762..af7764e04a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3019,6 +3019,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