From patchwork Tue Jul 6 14:57:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470450 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5079610jao; Tue, 6 Jul 2021 07:59:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB2LitvngxwPNwxksbJ578GSkwnZsYkUBxA3K80JnW78Tty9nB0+yM5x+8cw/5MLrYwJDM X-Received: by 2002:a67:f359:: with SMTP id p25mr15914854vsm.37.1625583552245; Tue, 06 Jul 2021 07:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583552; cv=none; d=google.com; s=arc-20160816; b=kO0sLrx6BEPT00VY28pLGDYObs4x/y8zxnWiqGzEDKTELv2if26YNajc+b/3LzV5l4 LQ4C3cGUV6cRo1fJEw6iC8fOAlyXGk0mM9kjBG5ahfB78vvPLw+7lq05WGOUftngg13l AopsdsKXSJoNiSFFWP+540FFvuMPvFW6SJf0O4BwMBIxQkB87IxArtrkZX5WBHJHEaaS G3eLadJ5qtkqeoej7YJNPzdOFRg8ERqZODB8vN/1WGRWf7CV/10NPipOMMKttBaQHlAv gpl3m6KhrMvTX7Ekkv6GzE33we9+t96MMyfx8LaPYMl318z1VtmlNrfy3OdAWvFpbwln hFTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=M+Bmwitpli/El3tfQx09X6m1DsmvT8z7wFQh9OyOsVo=; b=Wp8VHrIzKDLD4C9mllHoLtJb7MYUdWL16JWQiiIZT3XFDsOQmwgzbs5Z8JbKe6ZpQQ 0Lw9goXOkMGSmtsNpbPKlBdtbsG5807c6akBoedWxX3fATQ2LQE4K58Ta65fT61L54VM BGUToVb+fPDWRMBeFC2+n4RsimugBYNZzHF8tSbMWR/V9egwb6n10c5yQ3NTLT6lC5RC pz/C9dYcSF5OxSr/n6SL67eAV0Zl9fv4TM6fsOzR7l7vs+u/0wAA3Rt6RznQUfHRN7jA o5z6WK63tvPhXQoAXGye8999e0/puxDyg5JtXuRkxzHW8GRwlR7w8x26or6c/awe3m3Y sdwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EahyWPQa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o14si15104547uaa.21.2021.07.06.07.59.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 07:59:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EahyWPQa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mXX-0004eH-IN for patch@linaro.org; Tue, 06 Jul 2021 10:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWm-0004ax-ER for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:26 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWj-00020V-Fa for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:24 -0400 Received: by mail-wr1-x431.google.com with SMTP id l5so9675344wrv.7 for ; Tue, 06 Jul 2021 07:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M+Bmwitpli/El3tfQx09X6m1DsmvT8z7wFQh9OyOsVo=; b=EahyWPQaxFBQLQS7c8MPMmpKDxz0MD7WM6y77XNIzI72zUJ9GxyM9HHEFPb8fYhB3E NXlzTG3Rljw532z9dxla73wx6ZIXQGCBb+SVZHNL4vTO/c3Az3TkVnkWFuRU/RCtLZ/r aB6tMkOn6GIIYyp8dz7qymmIo053sK16fc6OCIuJSg6hZimdIBbnL541yTTisIku+DZE DHLIZtMlIpf3ZzSKYVrkvtnY7QveWN2C/rZgRUymFwTmy7AFAznxdHs2jaHsXXXAl32n aMhlOV5JQ9gRzA7rY7WnTxKqPw73pYKgm13v+HNnQ3vG3TlupsYo4RDb8/n4KF1rczGF ewOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M+Bmwitpli/El3tfQx09X6m1DsmvT8z7wFQh9OyOsVo=; b=E3J8pAVh/56xJMyhnIDCUVSv+dFTsdp9AD2ZcjfwIebJUtENFPgrBQfHSUBeuxGPM2 WYdls9s9prfQ4FdO84sNYlIgv/6CzdRz6j1ixMgNE3pp58KKfGzOwd2x6mVqIdIxn9lB Pp9+idtapDUB4zOUijR3iAr1l9EnFfwwbeLg2Dzmtd7whjZAivvqDi5kGLWu8BsD6zu/ 0D4VcIS5hiNe/bP9coErBe3THQlqRTPJw+MXkhI6gi0NKqEWAzcDDlEEK0OQn+MqSiq5 jDkLqvyaY2zy5wtAZlS6NQPEaB49WRpFkNGvRoADsEZ195iY60fFd3WDwT8C/ovshfL+ 9Rng== X-Gm-Message-State: AOAM533oEIRs/MzLps54zT24LapVtgtU1x9O8bRBjX6lo7Bl43QRTTL+ os2MyFIO38bSuXctAujw3hsrjg== X-Received: by 2002:adf:ef8b:: with SMTP id d11mr22299838wro.346.1625583499950; Tue, 06 Jul 2021 07:58:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n16sm1008224wrr.73.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3BD61FF87; Tue, 6 Jul 2021 15:58:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/39] Jobs based on custom runners: documentation and configuration placeholder Date: Tue, 6 Jul 2021 15:57:39 +0100 Message-Id: <20210706145817.24109-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa As described in the included documentation, the "custom runner" jobs extend the GitLab CI jobs already in place. One of their primary goals of catching and preventing regressions on a wider number of host systems than the ones provided by GitLab's shared runners. This sets the stage in which other community members can add their own machine configuration documentation/scripts, and accompanying job definitions. As a general rule, those newly added contributed jobs should run as "non-gating", until their reliability is verified (AKA "allow_failure: true"). Signed-off-by: Cleber Rosa Reviewed-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-2-crosa@redhat.com> Signed-off-by: Alex Bennée --- docs/devel/ci.rst | 32 ++++++++++++++++++++++++++++++++ docs/devel/index.rst | 1 + .gitlab-ci.d/custom-runners.yml | 14 ++++++++++++++ .gitlab-ci.d/qemu-project.yml | 1 + 4 files changed, 48 insertions(+) create mode 100644 docs/devel/ci.rst create mode 100644 .gitlab-ci.d/custom-runners.yml -- 2.20.1 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 @@ +== +CI +== + +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 +====================== + +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' From patchwork Tue Jul 6 14:57:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470452 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5082765jao; Tue, 6 Jul 2021 08:02:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxf21nwtfHkZiBnAuQNvlqzE9QVjWJLip4ohcZTrkBpRb7B7jeyeyXabNRU0j4ud3v3Zk2 X-Received: by 2002:a5d:5088:: with SMTP id a8mr20018230wrt.153.1625583739759; Tue, 06 Jul 2021 08:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583739; cv=none; d=google.com; s=arc-20160816; b=W2yz5qeaUo3hWXQAC5MPQlrIN+kU2Msqt0EBxAwfLeANApb9ip4Q2qz/10LZyvoQAw +6PeSnZGTs7ukn1+6ZOWVrNbuYaQtNJezuJYvfIF7eJcjtK5+y3hrQNtAobLlT+gsjqr rnibUkTSCEQCOYcLbdyFArcmz4ic+/WgbTU3+pgXpbRBQjA5dW9KyliJzopqXgXH7J5R 1NAHfOgchNyZEPFKWEDlkrR6ES1XnR45ZUSfgxt32j+JhlgSzZssAJemvJOdO7b27J8x UxZH+Kca/3ic2eOMyFK1TzVEGcmT7Zo66zHY11g9NkwFaB+ksWEwega+nyHzuRXjj81C xn5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OJ+a2HwSuRNejGfA9xMEuP+rnbpPniiuWoFoxeydpO0=; b=Tjt1iGhVW5OQT9dFdhJUr+kKkqI8ND1+2aa1SFKZNwhnQtkPKXMHbVmM+ujBbX5Q+2 CWRwyVgGhEZx0WVNYjEMY5IXqMNgvPqJqirvrmrX+gpF1NrFYKiJWRJ7iLH4K48LYeqD 0Gnxo2B+7UwbdlHbqSP8wYY8KvAYWp46pzC/beifDbUHRwV0LW6a6lE1dUtFzJ79Yi0F qCKjgl/GJoXIPO/RK7u0LcIG/nrM9g5lcHvvBXP93I6CTzPfDG3Z0HU3SjClhAv/UUVL U5C5qEGt8Jq9fUN3twuGWaNNBjhmg7TV7HWAD281EYGNg9J3Bkv1uSZyh1jD6vJ89WKI 3CNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZsTzpG3+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ji16si16164542ejc.362.2021.07.06.08.02.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:02:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZsTzpG3+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0maY-0002IH-HL for patch@linaro.org; Tue, 06 Jul 2021 11:02:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWz-0004ef-Lk for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:56098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWl-00022M-L2 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:36 -0400 Received: by mail-wm1-x32f.google.com with SMTP id j34so13765173wms.5 for ; Tue, 06 Jul 2021 07:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OJ+a2HwSuRNejGfA9xMEuP+rnbpPniiuWoFoxeydpO0=; b=ZsTzpG3+wrOCUHovDttmLdau8dzLHzKTofNv9dhnmqakTkMc4Tm6CKgIPHS4veD1Nn +XlPAsYCW1Cd08FJaE3itFphF8Z9dsuZFxsPMCpZqZ1JDH4D+b+TqAPn116HQOzycKWH t0dVPowesnXajd42iiwN9w4+lqkENGyxs0AKBthnh5lUttaSPrxrDrQdYiC2qBecvMsw GlQ96MkPCqBGMY3VpOD8dV7OMXN/UvmBAH9EExOSldX/WlWqLMRR/BotdwWwQfZhftft pM8W9N22VQzuiqh0uNXdLOclyRoJ+x3M7QUli2lBBj5BAcEOt4Eze9np7qvU2HLdXOLG VpXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OJ+a2HwSuRNejGfA9xMEuP+rnbpPniiuWoFoxeydpO0=; b=k2Y2qkZQiKOaKJ55PGrEt/lvCXsLfS0sJKW2xlyuLHE08uPvNVGymtXhnAYXm5z/N2 p4ETH3QX0s/7fjEAfwKtKTg4pVDnYMlIfZdIGzI3kCJBK+5tIoDWbeX8EUvbPHn2lVsh uxrr0Fc2Aa1eWt1cW1dtpCMPyrDxyzxSsRfK+LLPLb8UXYDa+hqNt9sF2oXXhT/Fkexx XJlhLmdI4h/Ez3jmGwJCfuFJZ5cZNP1lr4cio8QnHpzb30XEFMqT2UuzGytnIkX/Yc3k BunmeVUhmASb1Eu2IP8FeuimKl87pdyWdgfTlz1V0pfto3tvDkcXrhIqX18EdJ2QK2es MHow== X-Gm-Message-State: AOAM532tGy0NmXQeqrp3S4nWuxb7RtS056N+F5huPV4+GGLQ6oSRVlLg oKyzcVEianWe4fT6J7ZJeYTIbQ== X-Received: by 2002:a7b:cc08:: with SMTP id f8mr21237212wmh.58.1625583501642; Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm16137777wmq.3.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F21A11FF8C; Tue, 6 Jul 2021 15:58:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/39] Jobs based on custom runners: build environment docs and playbook Date: Tue, 6 Jul 2021 15:57:40 +0100 Message-Id: <20210706145817.24109-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa To run basic jobs on custom runners, the environment needs to be properly set up. The most common requirement is having the right packages installed. The playbook introduced here covers the QEMU's project s390x and aarch64 machines. At the time this is being proposed, those machines have already had this playbook applied to them. Signed-off-by: Cleber Rosa Tested-by: Alex Bennée Tested-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Reviewed-by: Alex Bennée Message-Id: <20210630012619.115262-3-crosa@redhat.com> Signed-off-by: Alex Bennée --- docs/devel/ci.rst | 40 +++++++++ scripts/ci/setup/.gitignore | 2 + scripts/ci/setup/build-environment.yml | 116 +++++++++++++++++++++++++ scripts/ci/setup/inventory.template | 1 + 4 files changed, 159 insertions(+) create mode 100644 scripts/ci/setup/.gitignore create mode 100644 scripts/ci/setup/build-environment.yml create mode 100644 scripts/ci/setup/inventory.template -- 2.20.1 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=/usr/bin/python3 + other.machine.hostname ansible_python_interpreter=/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/build-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 == 2) and (ansible_version.minor >= 8)) or (ansible_version.major >= 3)' + msg: "Unsuitable ansible version, please use version 2.8.0 or later" + + - name: Update apt cache / upgrade packages via apt + apt: + update_cache: yes + upgrade: yes + when: + - ansible_facts['distribution'] == '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'] == 'Ubuntu' + + - name: Install packages to build QEMU on Ubuntu 18.04/20.04 on non-s390x + package: + name: + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['architecture'] != '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'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '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'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '20.04' diff --git a/scripts/ci/setup/inventory.template b/scripts/ci/setup/inventory.template new file mode 100644 index 0000000000..2fbb50c4a8 --- /dev/null +++ b/scripts/ci/setup/inventory.template @@ -0,0 +1 @@ +localhost From patchwork Tue Jul 6 14:57:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470454 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5083638jao; Tue, 6 Jul 2021 08:03:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBVMAvq3cBrwiwwsYhF2mAgSf5tvqek3NHMdMakKDpWvY/uuEgpq4hyuNdTBqwpvW6T7WH X-Received: by 2002:a17:907:72cf:: with SMTP id du15mr19435213ejc.54.1625583790982; Tue, 06 Jul 2021 08:03:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583790; cv=none; d=google.com; s=arc-20160816; b=Oil33W5L89K99cWPWz0NuJEY4T9mx434SEdeD3cV6jmbIwY3jLCOO6ETws0PK7cuRv /GThoZNhx2iHGARu71/vmOHIafa/pFX0FDGUUJs8cugHrK/yTK6oG21xCM2qTgI3yf6e c3oE6fc1dLWvub+vc4uaSgQZhhLWDtaKMOK94Nerx7XCU8/2lR6ZtokbfRK/aRSBy1hV tSB2KRI+WgAQBmz3y/JY20YaK0l/uKdaEhy/ASLEwNtg0wGeJMLe7R/hlEhBUqjsoqaG Rq7ptxFtImtKC3F3PGsKcPPhqyWEZTpX4nsALw4RcZhwdQw5qW9V4N00CK034566U2uY lBAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=crTi4XNq+Ingn7CUQ5c/evQBVola36pTXX+nEdv6k1Y=; b=AA6Iy2V8Vqu2O/9PCqkfNDtsI05E+kGkH7WAgAwl3+rWclZgTMzzFOmInUYuPv/mUX RvjXDsx6WMyle9jU8VQ0ZtsVh1bR3A3mZkAP1tnK5XPqwJmO7lHdydP8H/yZoPjI3F8a 7iAZQK2p9lUiHx2CNq+rDkdDXPrGpKnwjZs8Fjut3MrBbPUT4v2zgHB9aiJhOpP4sge+ MVTa6fU5l9x+AkfL92zlnZvrS7+JBQlWf5BfILesnFZNV4U6Lw8ESdequxh8iyuZlZel PEkLLK8j8N0orPA/iehq8z9K08anTYH9lMpryudm+kupeJL/BYEjmsLLeT5MH/ycnNXE m0oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ID5O+jwt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ne24si11895315ejc.688.2021.07.06.08.03.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:03:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ID5O+jwt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mbN-0002Mf-Rd for patch@linaro.org; Tue, 06 Jul 2021 11:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mWu-0004d0-3A for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:33 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWm-00022b-52 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:31 -0400 Received: by mail-wr1-x42b.google.com with SMTP id i8so13547408wrp.12 for ; Tue, 06 Jul 2021 07:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=crTi4XNq+Ingn7CUQ5c/evQBVola36pTXX+nEdv6k1Y=; b=ID5O+jwtIxXt6VMaowEtHQU7LmgigMMXnZHCTJGO1IVUFF3+w1D2nhVUFubi2Enxy/ yRcMAQH1090hytEqxxtSZooXfHFi1WZx8BwwqsBjAtterPk0QvPZTPqr3gLDDiB3xIqG FNN8BclA2+S+evGV8qxyKTbgA0XAgahvnwqOeZyZfk49VsYka/q8bLsN3IMK7jkfoFMq hHT+GJE4GebCphNzV2qZDmrVYmbaESCLwxCHZECuJx3qzk+p7nHx0/L+DKpv1K43AWCC Mwx1qEGgU+QirOVYLWhOiy+SwHq8+oEDj3cDly7bj1hVXRSrjRZDZt7PeMtaG+pt1oWP XfuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=crTi4XNq+Ingn7CUQ5c/evQBVola36pTXX+nEdv6k1Y=; b=pMiy4NOz643QWgD+krgN/SvD9Xip4JUljRwnpgJ8KlwW5PURX8UHyVuB9ypSOmBbo+ QrxY9zlEJZ44KG5+sBrxpucSbB6YegfsGIQtb2JgrHWzn7+818rbHrMA79ok/wvb2BjD LR892tMW1mC+lpTQMAVQ9REQW69TaHWttfnfE+deJkQ7i8V5mw7rjL/pVhG95TKMvXgr +/wZdSFDwQtBmnUQfBBgjbdw0vJanO92CPaHbj9EJuHPwemkkQt4WOZRMsHjQcJDiTyf qvhgLLIe7kchLJulDYkdkXuvcJZqfUB7RBytyeQ/iwb1PW27/S6CY/GW7ajzDkrwA1Wy dw7A== X-Gm-Message-State: AOAM531tv/j4xu3a/Bu1eW/N8yhxgeRzDPKT2XmEQuhaS1QVk5VilqEP xtMC2ZzUblShracb21OnLaVyIQ== X-Received: by 2002:a5d:508b:: with SMTP id a11mr21845439wrt.280.1625583502551; Tue, 06 Jul 2021 07:58:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm15357659wms.24.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D8031FF8F; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Tue, 6 Jul 2021 15:57:41 +0100 Message-Id: <20210706145817.24109-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa To have the jobs dispatched to custom runners, gitlab-runner must be installed, active as a service and properly configured. The variables file and playbook introduced here should help with those steps. The playbook introduced here covers the Linux distributions and has been primarily tested on OS/machines that the QEMU project has available to act as runners, namely: * Ubuntu 20.04 on aarch64 * Ubuntu 18.04 on s390x But, it should work on all other Linux distributions. Earlier versions were tested on FreeBSD too, so chances of success are high. Signed-off-by: Cleber Rosa Tested-by: Willian Rampazzo Tested-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210630012619.115262-4-crosa@redhat.com> Signed-off-by: Alex Bennée --- docs/devel/ci.rst | 55 +++++++++++++++++++++++ scripts/ci/setup/.gitignore | 2 +- scripts/ci/setup/gitlab-runner.yml | 71 ++++++++++++++++++++++++++++++ scripts/ci/setup/vars.yml.template | 12 +++++ 4 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 scripts/ci/setup/gitlab-runner.yml create mode 100644 scripts/ci/setup/vars.yml.template -- 2.20.1 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 those 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-runner.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 == 'PLEASE_PROVIDE_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'] == '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[\"architecture\"]] }}" + - 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=rwx,g=rwx,o=rx + + - name: Register the gitlab-runner + command: "/usr/local/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ 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 != 0 and \"already 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 you'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 From patchwork Tue Jul 6 14:57:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470453 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5082783jao; Tue, 6 Jul 2021 08:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMVCXDtEHfq8QsDXsql6cKQ5Pf2AwSi7eyv6t09yZtDcxCA1DcyAn7KDlgTJNPw1Kt3r6p X-Received: by 2002:a17:906:d551:: with SMTP id cr17mr18577552ejc.257.1625583740449; Tue, 06 Jul 2021 08:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583740; cv=none; d=google.com; s=arc-20160816; b=a5LjsMxPt8esgW3YrDoIB9RpvjjDbL/480/AHTyMkraxBt/M2dnQvdYtZaU+4C55Nw D6qJ5tU+YT8nohN5EFbD6OOp21JpVLWUwhLPPMM1tn4bYuAd4HRhD5gIWthCZClxQMra zsSDIn6PaFV6R15iHnm/EmrTv89ShWEPwIr0eyQbFjYHtI8PU3e5MrhDZ4qaZHrpxLZn ro5SLc4A7Hy8GayTqIKaEpqmWzLFHAvWJSmkX2rOOgoyZ867aU9eHIQWWp7V7CerfQsb S2CQq3mpTBjRf24KhJ7GNLf6fXR2C7RiN0gRLLUKornYh0fgO/Utw9hn5ZtHo+xlYEpL s4gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=isRhm7PtwuN/k+yKMymzpJRt/x/pmEeyNtpyI5WWM24=; b=CUlT9t/+0Wtw23Z11gFb8AOh6nlr0HVfmHavjaqZLVH0vZmenTAMit2IPzR7rIEd75 3sZR+OeQR20YhTudNgt/FkBHqSqCefZUKzWpnljlkPVhXpkO5WynUnRCxghdfrjg7qMm pxcABh0iKdFnXSFkYjDvmKBy6JiXSyYB0O/UmhgA126rrFx5ChWKTJnheV4tQZ/OkBX6 8WUZ+vPRrLaDsn/W44QI62c16g3PYIFOGOIuSUrxxOUcp5kVHFrKjjE/xirzQNQ8Z24S jHWMare1KJMqxYFQE5VWnNE6+Dhrvgv0DdaD4y0N9w3Xk4CA7SMGjsXZMNoo9ksBYf1l khZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ClQC/Eyh"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ne19si2111620ejc.288.2021.07.06.08.02.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:02:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ClQC/Eyh"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0maZ-0002It-8w for patch@linaro.org; Tue, 06 Jul 2021 11:02:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX5-0004iA-GR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:44 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWq-000233-4U for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:40 -0400 Received: by mail-wm1-x332.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1982795wmh.2 for ; Tue, 06 Jul 2021 07:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=isRhm7PtwuN/k+yKMymzpJRt/x/pmEeyNtpyI5WWM24=; b=ClQC/EyhnZT3e/lT318LpzLR0SOIGX6mzEMFH+RsLhyXEJPreUkSc4+D9Wf4hoLj5X 5GF60RVasp1qEhDQfTfH0eRNdb9f/0HJigN7ZNFBYrkUYt70bGJ9v7EVuBRnTxuYdxFf MJOGz7d1Ss0AkOeTX42mgeSWqI3nCVFNtre106agaETKnn79LpLp/qm9X2yd4I7JTbd4 IP/dDlkVPMHD6rVTHbG01355UDXQyKHv3Qg+Ks1PAujk+msrImnYoY2oK60LGxrpsCOR CE5GqH0p8GgbqD7DGDErzJ7dai/G6CIpRuemWvPGvA6a5ZyjQ8nATRBOuCXusaOVcy1c KMNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=isRhm7PtwuN/k+yKMymzpJRt/x/pmEeyNtpyI5WWM24=; b=qb1nUTI8ZnWL4lUpxESuq/idRij/PxeJn258yee4YpEjQYnNLlcE9asHvWabDTjMBu qFgBf/YswBmENmeCprr6BVCC+1zM1bcKNA+fdE1ubRY5BcWZ9dqmzvIY/3J9nQGgFguQ UO80CobMd2hqfyx+A3EpQcnwh39/x0Y4nNKw2crbmZ7k7/eEkVPIrlH0MnNCjyaWs8+F R/SB/QcUF8e91HCfBZLkIs6r5V5eGKh9jvPBjg+L7YR8zORI5xErB46ZzqcZw8K2uzLW ocsbndidSovIy4QJ2nIschtYWUiwMHtjVG0Ume0ZK3dUJE4qCyUMA4g9IrYzdJjNyyzq 5sWA== X-Gm-Message-State: AOAM5334s2xqws04xGhecfcB0OeeXgfibjw6d2LaHcpe8jkceuS2CokT i9b2h31r2mWplsUcrdIkQBgM8g== X-Received: by 2002:a05:600c:3b9f:: with SMTP id n31mr14081318wms.123.1625583504325; Tue, 06 Jul 2021 07:58:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u1sm3141966wmn.23.2021.07.06.07.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 367E91FF90; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Date: Tue, 6 Jul 2021 15:57:42 +0100 Message-Id: <20210706145817.24109-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa The QEMU project has two machines (aarch64 and s390x) that can be used for jobs that do build and run tests. This introduces those jobs, which are a mapping of custom scripts used for the same purpose. Signed-off-by: Cleber Rosa Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-5-crosa@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/custom-runners.yml | 208 ++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) -- 2.20.1 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 =~ /^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 those libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check-tcg V=1 + +ubuntu-18.04-s390x-all: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-18.04-s390x-alldbg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =~ /^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=1 + +ubuntu-18.04-s390x-clang: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-18.04-s390x-tci: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_18.04 + - s390x + rules: + - if: '$CI_COMMIT_BRANCH =~ /^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 =~ /^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=1 + +# 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 =~ /^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 those libs in distro supplied packages + - mkdir build + - cd build + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check-tcg V=1 + +ubuntu-20.04-aarch64-all: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =~ /^staging/' + script: + - mkdir build + - cd build + - ../configure --disable-libssh + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-20.04-aarch64-alldbg: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =~ /^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=1 + +ubuntu-20.04-aarch64-clang: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =~ /^staging/' + when: manual + script: + - mkdir build + - cd build + - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + +ubuntu-20.04-aarch64-tci: + allow_failure: true + needs: [] + stage: build + tags: + - ubuntu_20.04 + - aarch64 + rules: + - if: '$CI_COMMIT_BRANCH =~ /^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 =~ /^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=1 From patchwork Tue Jul 6 14:57:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470456 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5086838jao; Tue, 6 Jul 2021 08:06:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx/ccgzY1EbHWB3mEaTaN+xAvAtu33TgwFIjEIX9E90fTuDkUjleWa8qE/q4/SRpJq+HFj X-Received: by 2002:a05:6402:d0a:: with SMTP id eb10mr24166027edb.139.1625583971227; Tue, 06 Jul 2021 08:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583971; cv=none; d=google.com; s=arc-20160816; b=OgbTHrponNWxeSQwTdWZ4nKa0h0Vwkm/DKxzzUHoqJTbtas5QdGq1yeJ3HGPdebEqU Rxfe31e0BWxgOcxvodyRlZbTHa1XDqA47OZDvNu5DB955yl9hAxstB6LWIpycqsSK7Tq L5gTEQtogV5hOhhMXoxButpX7go56Gx2cy0a5zBWgeOdN+Jme9pZFnSfS07V/BVXr6nW UHt/lkTKWIfmFXh9QMHYlS/YrlaSH+E0js4n7usISUS1yIJGAYwxfgyyMZVN/QjTrxjK Z3lxVJ9fqtsyg8n8Ur7o45P+EwdD0CS8Z2tUEArXwYW7+AddeYCUzpMQJ7gdsKGyEv/9 sUQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Vp/dNCh38Mi79xbfwOjgNPw51ttemhaIbt3S+P08Mv0=; b=w5pjJKAJ+TjESlFxQLoEyDjkCMWsGvpkK9AmtnXwFxSZcXO8vTDQBoYLMYJ843qH7y IMgKI8A+4+U5J8teiRtTCgYNwBij16LgYh5rcXzHzW/RH1K8PcRu7qSERm3yOe3kB/rn KzTIVP1CIl27GKwZy/pF7Nr8/TqudVK5hDd8Kis1Dbn/wuxZJWu06rqgJK/RgbUFAh7d cOY1OEugqP/JkvTfW1YP+WmYN7Ga5JqyVr0vru74kODKirqAxQWn4GrKU6DuAyEwaK2k oyHq5mGNCNGxBup9fAme39nbplOxFQw7BP7KDhHMMx4DpBrwiDfAPZ/Vfms/tyRvdABw FZSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zkxF2icf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5si5456541ejq.621.2021.07.06.08.06.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:06:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zkxF2icf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meI-000827-5t for patch@linaro.org; Tue, 06 Jul 2021 11:06:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004iY-1A for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-00023t-Q1 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:43 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso1973757wmh.4 for ; Tue, 06 Jul 2021 07:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vp/dNCh38Mi79xbfwOjgNPw51ttemhaIbt3S+P08Mv0=; b=zkxF2icfug0NRuruMY1yTiQazIKm2zIYAjywenaj9Ddx64+wRlQDWPcDHv65aVrD5k H/xW8VOWV8ZB+qRAjcxbEgsXfuqQWJUoV9ijzdzZS9/gXzJo0flGuSrZ4h7R0tDXOiFY 4bktjXcJKfJqLAS9UgZLwbSAHnnVeiOjNl/wVSb934vn201KDS4ioDqEhN08qwRmcp3N lMohRZS4UV5Vp5dEb5y89YXa4hkOFC0odlTMEKno2zERcIADyrP9gx1QQR+/U5O2yxRn DjvQqlETA5Mej4jgosKhMdiUz/lmbV5V8rl5PN9DZve2uvGpjRh8ZepXjkzrpgAEnlle JZeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vp/dNCh38Mi79xbfwOjgNPw51ttemhaIbt3S+P08Mv0=; b=nURPhjK1g46g+S2yag9o4EXEAzgto8BtVcU+5sVb51MegNuGWvD+IJSNP3hBlLbBSR U0WCBZ1BSe6/h0RaL+s/F4YOIIT3xnnalKkqNMVQUpIZ3sqpV+LSRMrffDfYwFqJej7f vAXoysEDempusBGTuEHCSTWo360nxfmW00/N+Rv4mAS0Q2qHpLcF7YpL5OZmzh/rhvWQ IeRfqbpJV/n4CTyLZ5k9Zn0bF4RNKUY/uRzGuBSnNKecmzNpKtTTqPQaLMnK0S8wkC6a 6qUV0O/7Pt1a2PAEiBgEZC6IWEY/3k4nel3XJcD9FppIWqK7Os8iCFu+QgVQ1EKoRdJd w3Gg== X-Gm-Message-State: AOAM533B2zSZn62nqUFSpSTAkPCT/8rC7CxCJ9ZaNfY1WeWrnGYryjPY vd18L8qJNI2NHFggVggp9qFbFQ== X-Received: by 2002:a1c:f314:: with SMTP id q20mr1271354wmq.154.1625583507761; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e23sm3133843wme.31.2021.07.06.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 512151FF91; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/39] tests/tcg: generalise the disabling of the signals test Date: Tue, 6 Jul 2021 15:57:43 +0100 Message-Id: <20210706145817.24109-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, David Hildenbrand , Richard Henderson , f4bug@amsat.org, "open list:S390 TCG CPUs" , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It turns out you push down in one place and failures pop-up elsewhere. Especially on CI. Disable for now for all targets. Signed-off-by: Alex Bennée --- tests/tcg/hppa/Makefile.target | 3 --- tests/tcg/multiarch/Makefile.target | 6 ++++++ tests/tcg/s390x/Makefile.target | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target index 71791235f6..473864d1d4 100644 --- a/tests/tcg/hppa/Makefile.target +++ b/tests/tcg/hppa/Makefile.target @@ -5,6 +5,3 @@ # On parisc Linux supports 4K/16K/64K (but currently only 4k works) EXTRA_RUNS+=run-test-mmap-4096 # run-test-mmap-16384 run-test-mmap-65536 -# There is a race that causes this to fail about 1% of the time -run-signals: signals - $(call skip-test, $<, "BROKEN awaiting vdso support") diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 3f283eabe6..d57a115873 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -32,6 +32,12 @@ threadcount: LDFLAGS+=-lpthread signals: LDFLAGS+=-lrt -lpthread +# This triggers failures on s390x hosts about 4% of the time +# This triggers failures for hppa-linux about 1% of the time +run-signals: signals + $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso support") + + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 0036b8a505..5d3de1b27a 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -9,6 +9,3 @@ TESTS+=pack TESTS+=mvo TESTS+=mvc -# This triggers failures on s390x hosts about 4% of the time -run-signals: signals - $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups") From patchwork Tue Jul 6 14:57:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470451 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5079625jao; Tue, 6 Jul 2021 07:59:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEvpn7aJKHnGlhns0Zr4oiTLNki1ChpsBNVAxTbQtxNRRiyp08ahreadDppK3ly4ccGSIv X-Received: by 2002:a67:cd85:: with SMTP id r5mr8600535vsl.44.1625583553748; Tue, 06 Jul 2021 07:59:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583553; cv=none; d=google.com; s=arc-20160816; b=iPH5GiP0CREzYElwMWjSe/ZQF6ChC9YHMpoAVNQtew/Z+iE6zWyrY7gfCM5UV8wKYK AxIcyBjaai9fccgt1hqb4p80EDex+l17Lx7kF8J225iQuL+b5MClU91QxhwpuzuRgB5d QblCW24trfKWF3kmZ2eQCjEUNJuE29XT8y8FcqPjY1RTZBRnLwEGSYq2JCbL2Nq3eMCf NaINNDk6HPqiokOvRBYf2S+YtzMdhuL0VIb9F9SHq8gfmvuejXM+daOzzhUDOFERRoH0 OiDKrPq4EpsJ5JUTPINtlF0KhRc7bZ0T7h+TN7tVg6pgic/2EPMk6/FGMwD4LhB0A36d lD8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=0eF6w3zVopQBzPSTFBR62+tiaUZ2j/EPqLLYM4z9rd777p/YHwUnU6GN4iC+m9PKrm qvZPEmrLiqn8CZBNasdjMi1QVXUCO7ar/eKhvNjIzzB1kvgVlG7/PTflV2cbjvfooatT q37DtHDGzgJoNmtQOtYyEsfDh87uQFhf81w74haWrbtw0v8H5OrZM1UVA9/6JtwZw1jX 4YVUMZ7xyB0+LCf63dem8gnNpbBg3/Vmf3D4NMtxJTvLYpYWoYDWpcP4abtwXbLo8L9w IUbn3wYarnIfBFcSCrAB8LEn1JcSt5ZOUQv+9cHx5EOEZEyvLkkECICDp7EqezCIP/7p 13ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CbXCJ8Ya; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 65si11464868uaf.110.2021.07.06.07.59.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 07:59:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CbXCJ8Ya; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mXZ-0004jL-0d for patch@linaro.org; Tue, 06 Jul 2021 10:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX0-0004ez-CS for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-000237-FB for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i8so13547589wrp.12 for ; Tue, 06 Jul 2021 07:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=CbXCJ8YaRX3KP6VPziblomeo/5M4vdKJnHQcMifN9E/vdwt7f2sFyCi95J9ezyoTxp 7C3aie32E6eAcevr2n2HQWkxbuivXWyjmXaiWC2jvHW/wsxq/pyt4gk3W3ntpRpot4GI ea3ofLjSosMuUBF6B1NkKltw+HkgntAfWDBFTr3/jdku3TdacSKhn9PAjdyjxSI87urS VvDQlj8JxW55+kdoagG4BtehDKMKn+EnHEdjaxAaAcjhoAHW5dL1ax2YPmew6RjqXUvG pikVRLwvorjqTCcXrhhS7gyToQovVrenvc/gLFG3Od3LyAKGFB0mFivp4cA3GrsPwl09 agTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=tHCh6WhxjZ4Sq8+9oHDDxfAQGFCm1sUQaEIewsOAkfBmjMn21yOULNw8dseCtTQWH5 Uulc0GofVp7JH/oxCByypEzmJJzLBM/vp6uC3lA0q0wg1X9tmTRb/2InvKTy6OrEBAhI HEqQbqBj0EA8KH8HWNwAZ5FyzLxCpLV5bowjH3q1P3T2ET1zicrHJJJJzT8EiPLFhwa6 cZBwNwpLWjyQu4ygmBaQ5IeppHXn8KH/c8SKAGoSH9LhqSPEbhEKK3ubGn8ELV/7gYHP m/WZu6fy2AfDj6fovh46XUh84EU6N34oXJoU77F7bYXsdM8RaDlFzbE5XJvSsLCCRQ5r wUUA== X-Gm-Message-State: AOAM530jNHICR++7JVU0OjQUMAcnzhBT9IwleYPuUz+RHrLnd/knhGfZ wA86X1N9EG9PBcmGDbaxEaMahg== X-Received: by 2002:a5d:5088:: with SMTP id a8mr19996266wrt.153.1625583505222; Tue, 06 Jul 2021 07:58:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c1sm16964984wrp.94.2021.07.06.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E761FF92; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/39] build: validate that system capstone works before using it Date: Tue, 6 Jul 2021 15:57:44 +0100 Message-Id: <20210706145817.24109-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210625172211.451010-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.20.1 diff --git a/meson.build b/meson.build index 7e12de01be..2748721d71 100644 --- a/meson.build +++ b/meson.build @@ -1641,6 +1641,19 @@ if capstone_opt in ['enabled', 'auto', 'system'] kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt == 'system' or capstone_opt == 'enabled' and not have_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 = not_found + if capstone_opt == 'system' + error('system capstone requested, it it does not appear to work') + endif + endif + if capstone.found() capstone_opt = 'system' elif have_internal From patchwork Tue Jul 6 14:57:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470458 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5087200jao; Tue, 6 Jul 2021 08:06:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDz2jIa/HHMLB46wcmvgFCD8Jjnufe9L2JhQIosQ5w1HEf30blBFCmOqK2/bSV4Iz7wYyd X-Received: by 2002:aa7:d143:: with SMTP id r3mr3022244edo.110.1625583990746; Tue, 06 Jul 2021 08:06:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583990; cv=none; d=google.com; s=arc-20160816; b=gYpageXoIe5F0qC1acqjnfIz/Ytss987K1mhFl46xZLNSX+FcUffY64M4CrJO8wRBn 2bklc2XRHbrFL2ItybRBHPJutrDCnETSfhJzQDi4PKBC63K5BEeVxoLoRe5bzg6X0qGF 4ROLjJGtcjoU98DDm07CqD/c+40dF5g2dRQuV1glerWjTdm7tMhfDZNRzFlhRFj9dIJC nAiVc2vYlM3AwG2uiwmLG3UHunR7jMYZtCPMwzscnSOuJIWeBFaRx6xRLTM83ChtvYoe mMQihB+GFUDtp0VLVBFcVGaW0VKTn/kgJNXV0ZOQyRwRZi7l9XNH37M2G1DC9Td9ODB2 vtuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=88Ii6HcAWSALYib9d0gO1JUFEgQlqOc09D7AHpUWIH0=; b=Sp5nBhJrrI/NQsDP7Ts8D6fNgkj8SgGGDcR4yZjHjk1pBNdE8E4gWTMxCqCiFZZnJf HjrRTtOKrf7WyS5/KqcaA+v+cZDo4ZMsB7DGD+nCGHCCLZqor5Ad17vNAJ84CzXQaTj2 KZry+OgzPVaOwa74UWu8oE1B/qH9tG2O9wJ1o1iH2Kw6ss8Mt1lqRuF4AI9fLMXzy0TP Jis7mS4OEpIJnSjhP8ZFvFtV7wRRr1WA9TSByYkqMYIESetwrHeMuoy8vUF5E0cfzANT 47Sp+KY43dd0AH7kaJNFETYggDkI65KC4tM1yAtQWUd+2AhckP76q4EHGbDEGE66Fb3O QTog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NnxHmyw6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d8si13138419edx.456.2021.07.06.08.06.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:06:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NnxHmyw6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meb-0002XK-Iv for patch@linaro.org; Tue, 06 Jul 2021 11:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX8-0004mS-A9 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:46 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWu-000245-V0 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:46 -0400 Received: by mail-wr1-x430.google.com with SMTP id q17so6044794wrv.2 for ; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88Ii6HcAWSALYib9d0gO1JUFEgQlqOc09D7AHpUWIH0=; b=NnxHmyw6ObbEch724OcshND59hwsuTUjUmwaV7l2wqOdulBx+Vt9ndlq40ArluO7gd UHvvLnkMnUqX7PA/5f9P4/6yxXyqTrA8T4sH6wfqAMFGDH+1ZWZN0T0vpUcACxGFsQCm 5A1P22V+R57iyoNzJHvGqzDIZ4WcxoRDyYUhOD2gKvsgHXFKQd2QZP7w4ZoMZhIhNZMN l4NBltRn6glFzgkCxyOe6hbFE3wecTlqkC5nVG3VfXBMBDpWZzheYPTaoT0Hj0PSpKk5 UFEDT84ZLTLtIfO0kuNbkMbcfbcR2Xt3UHnTvtW5Jw2ePqi5wFRqrI9PUaA8stYA19ga uz+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88Ii6HcAWSALYib9d0gO1JUFEgQlqOc09D7AHpUWIH0=; b=Bxmep8llgZJjOddYzXZsjtHTvqsPOzPfLiIlvUkLPhODrTuSDjIfrh+6AZeTTB6ss1 f02b844M5SFVP8B4PojVmhkzGTprqZrDlOWD8jeLBqSIhpv8ou9iDWR2jmH2+3Whjcre lvtOGGLNDkCOgdbRviQmVPLv6NqsiGVFO3zQuD/dt4xwZiMs/YNwCIqygwp2Mg+l05jW 76ybERwFlrjgDJtM4up33VJgDrPLHY9mIndv7s0kjcXAZ5w+9Mh76axK55ZewYpwUDXN x7hQelav3PN7fm+0oQJKPrJYiMibWlglHbprGcUNaiU2gwhNc4SAq7LLZRBJmSvAYKKN SLMw== X-Gm-Message-State: AOAM532/aQK1S+2FDOwW6dTxgEsS/1r1YS5vdSTQhAGVKbua7bT3YC1u rXK75hlgE8dzwG872kwzkuWcqA== X-Received: by 2002:a05:6000:c6:: with SMTP id q6mr6827944wrx.252.1625583509522; Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v18sm17210266wrr.54.2021.07.06.07.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BF4E1FF93; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Tue, 6 Jul 2021 15:57:45 +0100 Message-Id: <20210706145817.24109-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This adds support for running 4 jobs via Cirrus CI runners: * FreeBSD 12 * FreeBSD 13 * macOS 11 with default XCode * macOS 11 with latest XCode The gitlab job uses a container published by the libvirt-ci project (https://gitlab.com/libvirt/libvirt-ci) that contains the 'cirrus-run' command. This accepts a short yaml file that describes a single Cirrus CI job, runs it using the Cirrus CI REST API, and reports any output to the console. In this way Cirrus CI is effectively working as an indirect custom runner for GitLab CI pipelines. The key benefit is that Cirrus CI job results affect the GitLab CI pipeline result and so the user only has look at one CI dashboard. Signed-off-by: Daniel P. Berrangé Message-Id: <20210625172211.451010-3-berrange@redhat.com> [AJB: remove $TEMPORARILY_DISABLED condition] Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus/README.rst | 54 +++++++++++++++ .gitlab-ci.d/cirrus.yml | 102 ++++++++++++++++++++++++++++ .gitlab-ci.d/cirrus/build.yml | 35 ++++++++++ .gitlab-ci.d/cirrus/freebsd-12.vars | 13 ++++ .gitlab-ci.d/cirrus/freebsd-13.vars | 13 ++++ .gitlab-ci.d/cirrus/macos-11.vars | 15 ++++ .gitlab-ci.d/qemu-project.yml | 1 + 7 files changed, 233 insertions(+) create mode 100644 .gitlab-ci.d/cirrus/README.rst create mode 100644 .gitlab-ci.d/cirrus.yml create mode 100644 .gitlab-ci.d/cirrus/build.yml create mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars create mode 100644 .gitlab-ci.d/cirrus/freebsd-13.vars create mode 100644 .gitlab-ci.d/cirrus/macos-11.vars -- 2.20.1 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 +===================== + +GitLab CI shared runners only provide a docker environment running on Linux. +While it is possible to provide private runners for non-Linux platforms this +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 Cirrus +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 macOS +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 need 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 GitHub + 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 earlier. + This variable **must** be marked as *Masked*, because anyone with knowledge + 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-protected + branches. + +Once this one-time setup is complete, you can just keep pushing to your GitLab +repository as usual and you'll automatically get the additional CI coverage. + + +.. _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/ncurses/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/ncurses/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=1 ; + done diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-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/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 + +PACKAGING_COMMAND='pkg' +CCACHE='/usr/local/bin/ccache' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PYTHON='/usr/local/bin/python3' +PIP3='/usr/local/bin/pip-3.7' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sphinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-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/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 + +PACKAGING_COMMAND='pkg' +CCACHE='/usr/local/bin/ccache' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PYTHON='/usr/local/bin/python3' +PIP3='/usr/local/bin/pip-3.7' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sphinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 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/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 + +PACKAGING_COMMAND='brew' +CCACHE='/usr/local/bin/ccache' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PYTHON='/usr/local/bin/python3' +PIP3='/usr/local/bin/pip3' +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' +CPAN_PKGS='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' From patchwork Tue Jul 6 14:57:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470460 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5089074jao; Tue, 6 Jul 2021 08:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeGYnCNweXzuMXY4EWzYiMfZzdSBjfSA0+1HeWl3a5pWwJ0+b5TbUftPz1Dq09UH6xHNrK X-Received: by 2002:a05:6402:177c:: with SMTP id da28mr4665325edb.129.1625584091464; Tue, 06 Jul 2021 08:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584091; cv=none; d=google.com; s=arc-20160816; b=mmWqZOdJaya0SfUqEJ58FsyRuZwRvWjVlXaEbHgDKuk8g16aUYbyqgqQDUVj6u7VLj RvW2rh+6cbipKgQLumIuGrNwl+zdw0adXld2OcNbfFADQaIc8VNdWjwBf09VfOWhC1v+ 8N8CqR5bX69BfkZef7cek7ftqppTHp1JZyouY3mo8S3Lvzml0D08yXA2i4XL52TaZ3Oa Ooh9ksWsVtvu250vW1EeHJn1ezkiV0AUvjq9Pz8DkYT7CntqeeDyAdU0V9c8r7nNaS8u /8UKsVJq23dzFf5mFA0hrShHuctuYhZsVqvcgDnyN+PnBOZTgtgnZHQg3GwnK1JMZWKC YV8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bTttEc+oJXhPYrt7q5iIhClUXDghFeYtwNO1q7NtVDA=; b=NsAyQ2pEafu2OO0B3FkGUaafcYxIeXbRks+UEk+8TpqoWZXs2p3MIeGcqLaKvH144v wOe6rR+9ilBoARCxmlBHOhKyKnlf20Y7nBQJZWlFIcNrMAWgiaxVwUxuqrpyCFrfShHZ w1qStvUSUFcTygtO2YW7cGrbLNP/Ul/nOoD7uBcGF8Y15cPidz+9zf1QPP/CLniMQdZZ Ax3oUVED+zAFCu3iaobUWS0QlT4173tQTx+w7Fcp40seFL+3VShUks2PgV791XxhT0wv 5WpXYcUeMnBmDeR0/dgCX/24rEZOHXeLMEyCkGwHl/VXOa38XpvVKgnkTymcEKaqqZJ7 J12A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JCIQL7Sn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id eb13si18113881edb.245.2021.07.06.08.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:08:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JCIQL7Sn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mgE-0005l0-FD for patch@linaro.org; Tue, 06 Jul 2021 11:08:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004lD-Rd for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-00023q-Pu for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: by mail-wm1-x32b.google.com with SMTP id g10so7937816wmh.2 for ; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bTttEc+oJXhPYrt7q5iIhClUXDghFeYtwNO1q7NtVDA=; b=JCIQL7Snl+Ug+GZDN2TtwyuTPwWQ/as0P8NZlcpOeXaW5OXyd9HK0TqQl9GbNS+g5e isJA7ObpljUic7Vg5WgrzQLsE3BmJSs19Y5b3n2w1tV6JeB7JoVnpa9VGZVlmAXXFhS9 IKrlT+aTCTHOJ47DcyIuIt6EDfbnjnopyOdjlQFUWL+lrKBdS8FdsMSxcLgTY9HtzCD4 +q73qTi4IYUN1YGGp53AtoDd58OXyTbEMhC4WGl0EfiLN19FU/yAGQhewItT0Xcv+Zgp lzOB3uYB+2P8QhZonwgZLCJ3kqfNiyBl+Goa1jeEgUOwQq4+Pd7xBzk6P1lcbXpSc6P1 TGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bTttEc+oJXhPYrt7q5iIhClUXDghFeYtwNO1q7NtVDA=; b=feygw1cYUCoCIV3QZc6oMxbw0H+23tidIpr6kTjuw87vVT9B4mkuxcarQjobqJbIGP zQuMNkJj4WF9b56UVpucZ+2LGWphx5zdr2u9zR3D6dIB5OabaT7CZeO0sOvfSfs8PLdl u+BL6D/iHqj+0DpyiJv9Mc00Tnd7n/L4qQSxgRbAbiTM5JkgwgBdD2SA2df3fyuLT2TL G5VGjEQiFuOJkO+FhCKSj9+GWSrKq7XIPGc7uqGU9PVUO4b7iwklbGyCMCp7e4d40aNx xTF93tC4Nh6MprChUdTEW8CQ9Q1OAa7+LLppl3tMJ8/3zPyY1ilQ2xPYiOomnGj3gJ3O /8ug== X-Gm-Message-State: AOAM533DUCxgA2PUL6e9yKIXyG8AvxWwhxUKHh5Ztvf7vwaRo7bVTwYz SDchwvCxHX9VgLSgSSExmSnaUw== X-Received: by 2002:a05:600c:4f41:: with SMTP id m1mr20941645wmq.134.1625583507016; Tue, 06 Jul 2021 07:58:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n41sm2959445wms.26.2021.07.06.07.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A3E231FF96; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/39] cirrus: delete FreeBSD and macOS jobs Date: Tue, 6 Jul 2021 15:57:46 +0100 Message-Id: <20210706145817.24109-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Ed Maste , Yonggang Luo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Li-Wen Hsu , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé The builds for these two platforms can now be performed from GitLab CI using cirrus-run. Signed-off-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210625172211.451010-4-berrange@redhat.com> Signed-off-by: Alex Bennée --- .cirrus.yml | 55 ----------------------------------------------------- 1 file changed, 55 deletions(-) -- 2.20.1 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 -freebsd_12_task: - freebsd_instance: - image_family: freebsd-12-2 - cpu: 8 - memory: 8G - install_script: - - ASSUME_ALWAYS_YES=yes 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=1 - -macos_task: - osx_instance: - image: catalina-base - install_script: - - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja - script: - - mkdir build - - cd build - - ../configure --python=/usr/local/bin/python3 --enable-werror - --extra-cflags='-Wno-error=deprecated-declarations' - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=1 - - gmake check-block V=1 - - gmake check-qapi-schema V=1 - - gmake check-softfloat V=1 - - gmake check-qtest-x86_64 V=1 - -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='-Wno-error=deprecated-declarations' --enable-modules - --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; } - - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=1 - - gmake check-block V=1 - - gmake check-qapi-schema V=1 - - gmake check-softfloat V=1 - - gmake check-qtest-x86_64 V=1 - windows_msys2_task: timeout_in: 90m windows_container: From patchwork Tue Jul 6 14:57:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470459 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5088605jao; Tue, 6 Jul 2021 08:07:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4VK/gTpuYEiqpsD8ZiEgEuOYP5Ic+7el4sR0gVobxhUFm/FcF1D6b5GUl1R3AabjH3X5s X-Received: by 2002:a19:8c0f:: with SMTP id o15mr15357035lfd.509.1625584064565; Tue, 06 Jul 2021 08:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584064; cv=none; d=google.com; s=arc-20160816; b=GGwpKO3q40QpgnPLiTIRpKuSACWdMl7s/ghP7COuk50eWnfO/xO2BCPW+JLZSxuaOo eLHheQKr4s8LFprb6CZydBtFH0xaGGjDg2KP9lseAxKPAceq+YOs+aqNEFc8zp1Lql7u 6nI9vo6joTXP++76u/MXiK2W8l3P0CE1LOQt4BBsjMl1p3aZKrjFgoCmfpDx3qnYo/so MLUnmj8b8ngRKl43vdiSpjkyDO7BNcTlm+ZwuVkoZrXpGKlBiNn0h0hnrieoAQrsma/o I9t6phaOZzzjvvhOU4hec4TL6K3bBtiVQDAeZB/sjCiVkYx3kBSyoSsZlLCv1LpDwwsq 5VnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=E97zDkztn1ghpbpI4qLhI0ts3kWGpQflLTduoQ8YLR8joXAhmUDmd+/im4YQGhzPAL xo1xjZr68D1y+ncVIxYnPKDJx/s/aFOtznj25mYxXJngetzMS0pTj4MT4rPNS78kw4zA Ova5AJ4ocM+38g4ev+cgaiHj4ze+9Y8MMnO1Iw5Bvlsy5SoyxxFvCmMDTpcm3dmpGabk noWguRYJp505ufK8ypDqUP8RhPu0QrarlTlIgsBY+G1Kamh+n2JSu6/kZijkZNs8lpRd YoLl/bQ6kQgaKPDlAG7GaNEm41TOzpEo6RKeQFgoUCPybau0o7+hoNChdYoLo6m0cylE 2lPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xzF5y9hW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v23si3109053lfp.187.2021.07.06.08.07.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:07:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xzF5y9hW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mfn-0005es-9S for patch@linaro.org; Tue, 06 Jul 2021 11:07:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX9-0004sH-So for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35606) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWx-00025I-IJ for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: by mail-wm1-x32e.google.com with SMTP id j39-20020a05600c1c27b029020028e48b8fso2005877wms.0 for ; Tue, 06 Jul 2021 07:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=xzF5y9hW4ssuQaIiUDOsfwqb4TKvG1zObUKZqpUP1uaCDHCljsdUYRNMH+hWYHivGm pDE1ueKfXLWw9GG6EsYhB2/mv8RR9OXOd3xf+uTRUoVjB7plKSXPhylJejWoIHwKMgNL 05z1iePMKHZBgnqemFYhS+tXSykUW9T1J8WBikWJke7M/xRPUFZGDiF4C5ocVv7JxoQi aY0MRASmqJ5QGG6qLAiGpunpJUwkcmJnFc7bhylDlydsRTUEsPVYYtxVoSeqMltOlGIX iLMuFHJ/vh+jhAIILa/q5bgFCyDQtKTnFHw66c/iW3PZX6Ai5eURsYYzWdWcFp/L/Cmp n+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=cZr4h8KZUcnlcmUj99W1TJTBDaG+3RQFhPSQ9e5G+sZbFW8BPm6l1Cm+6qsmfjhvp/ kjq1OudgIoBnlr9kDb7dZQfS1/trT3gK5ScfZiRW1VdyHTmJCEAau/4iRvjtGuEwfty+ V6Lr2ILjLvpF3T6eBTn021HDVyDEG9YKh7zad3alzGJ5uTdZxCJlRt1g6a16Ac4dGe1D sldMFclaYxE0qcM/JWQT6YOJYxsWVI1mi9eoJu9j+H/q5tau62X06Sw0DVN0cdbDHnKN icQO7lno5zNehr3HC4eUPUcIq5MJ9RuHjTBk0dCyiAI8+/T9Wa4fxCBmZeJ32vDmX4Vg 58Ug== X-Gm-Message-State: AOAM5301o4qMoc0Hfq1iLgOwtwgz6NfgNFsMgJ9IGdRXJatWrbk8lYTW Tyw10Fcda06ACgfuLYu5HVn6bg== X-Received: by 2002:a05:600c:17c3:: with SMTP id y3mr20716494wmo.40.1625583513530; Tue, 06 Jul 2021 07:58:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y7sm17586286wro.51.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C77EF1FF98; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/39] hw/usb/ccid: remove references to NSS Date: Tue, 6 Jul 2021 15:57:47 +0100 Message-Id: <20210706145817.24109-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Lureau Date: Sun Aug 30 11:48:40 2015 +0200 libcacard: use the standalone project Signed-off-by: Daniel P. Berrangé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- docs/ccid.txt | 15 +++++++-------- .travis.yml | 12 ++++++------ scripts/coverity-scan/coverity-scan.docker | 1 - tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - 7 files changed, 14 insertions(+), 19 deletions(-) -- 2.20.1 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 device) using this device. 2. Building -The cryptographic functions and access to the physical card is done via NSS. - -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: 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 Configuring and building: ./configure --enable-smartcard && make @@ -51,7 +50,7 @@ Configuring and building: 3. Using ccid-card-emulated with hardware 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-emulated: qemu -usb -device usb-ccid -device ccid-card-emulated 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/dockerfiles/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/dockerfiles/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/dockerfiles/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/dockerfiles/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 \ From patchwork Tue Jul 6 14:57:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470457 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5086858jao; Tue, 6 Jul 2021 08:06:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDvkEz+LeacucNUiA/VxDamSXwXSmnCHgt9jLM/QNB1ik8SrzdKlCF918W2r/4g+Q6n3v9 X-Received: by 2002:a05:6402:1357:: with SMTP id y23mr21701019edw.244.1625583972221; Tue, 06 Jul 2021 08:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583972; cv=none; d=google.com; s=arc-20160816; b=wyxfA3ZMA8M/IedYUdCVwCqYNFz7vA+RMNydWqmd+gfG4yZTlBu5Hqd/ysJiHM6RfR zau+wWvb+EBF4/jbbUCCy+pE7IkIYPXeRvmKgCG7tsY9GKF5q0hgN0pak74Nk1jaMxFT qAGiASaAuiPtcehDkiD1Ev+jt3EZqkS/1Ldxg8QSvwySyjjXA2FHT22An8BFzdavJLjx kdYbxUQ0m63LbQLlFGcGsbIOzeIp4TSwvSYDMy3vdcdPQYpQjQHmMmvGEzogtRjVr12A Jh9g0eMcCCiU1F3dewqXy1Jkxa1ALMkpd8Pp3C28plWBgtIyUh4Q0pR2YjWzK6xmThjV zKnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=JjwE5mDhkDJA2gGv04ZaexUu9e9C73W2NrFCtgqMM7zpoIG0WeDvSBc5+kJ44k2oyK GhloMADBGRbMJ6hNUPkeM5ryuro4TqkfiKOGFhRUo+tllYksXcRHyscLl/O7E3omvBku McvwFDyuXsAXL+yRQu3ti9T0WrrbLknlZ/F6nW6RnnlStn1AiTZCt/p9N+xeibo5aXx+ CBI3ZpdaczGEc6LbiZcQ0mcyX6lrohDIDmbHHl86bidVv3UefF+AnghalYReO+ZgHnMZ Ray3A5BgSB+QDysTasQA3IEX5Riyz1KpdZ8Ylm4meYFYo4t5pXxyPIX9sEVEzjEuCZY0 bJYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q7ndubA4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ak17si16836368ejc.234.2021.07.06.08.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:06:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q7ndubA4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meJ-00082v-7U for patch@linaro.org; Tue, 06 Jul 2021 11:06:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX9-0004sV-Vq for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWz-00025P-CI for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: by mail-wr1-x434.google.com with SMTP id f17so1840668wrt.6 for ; Tue, 06 Jul 2021 07:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=q7ndubA4R6lUyedVGgXg6NdEBbsItZchYncSIqWcBN6/g7yDLTJwQyExgTuoqMSpzh i2gB3DdGptai5/STOHFAbiHo7DlOgV/pU35xyx5vjEI4aOIbT9mVPOpHWZGANTUpDpO1 3P4QY0r7vcwfTmgeFSWGi4VxPJunarxcIkSxATE1UwPa+lALY+WwAKMGrxkVHDEYFcqf s9eB0iS/4c+kqa8gqtVEfwLZ2YHAvFZ+WaZTO6LvxMqiLYuMo+yLHTYFBsHSqTa/qI5k s3pNBBfgFfOx6T1u5/VMC7o74/ZVMpyxsVpAn6CvP8D7JwE/VZC9HBoosD8M7n6ZBHfm QULg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=V1Om+U7U+JgOX0jJwUrn+4nQyKBOo7G6/Eac3YEHBnATexkCBSKVWT7Flu0PKtftWD ZZzqPTRGvSj9HIHt8MlfvLmTaSuKLiQ4FlYvyubeqauEmmh3Qi9mm1mYdBp030eJ7r+B AJUN0XV7UcfwUKTUb1GUXQhlltN/yGKCFbC78z0g3IibdRwlBqfJoTaYMR6muwdOHzSO J0utTaAL5aeJMBltT/SuzemrpgEhd0qZWMkPh9NsnMjnFB2an9bgrshlcjQcDjWcDcAF sHcme7iej76sISLlUdux036pc2NXCrsmJwGaVa1c8Kg6WQ1ZYRTFtEE6LxoBz3Z+8ASA RoFA== X-Gm-Message-State: AOAM530r7trV5CouOZ5HwVC1+JRpd6QGgINJcBPuMZwv5cRZATYVJ/G+ w7sA3Wtl3tFN5U85DhNuSt6Prw== X-Received: by 2002:adf:b605:: with SMTP id f5mr22424323wre.419.1625583514364; Tue, 06 Jul 2021 07:58:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y19sm3287863wmj.33.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD6791FF99; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/39] tests/docker: don't use BUILDKIT in GitLab either Date: Tue, 6 Jul 2021 15:57:48 +0100 Message-Id: <20210706145817.24109-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/docker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 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 = _guess_engine_command() - 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"] = "1" self._buildkit = True else: From patchwork Tue Jul 6 14:57:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470463 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5091774jao; Tue, 6 Jul 2021 08:10:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQigdULNTUl2AkpIEJcqwE6jZTrzXQjJQt1koniGgKuFHcM9M/T5qK90ppoYkbNOBVb4PM X-Received: by 2002:a05:6402:278a:: with SMTP id b10mr24420565ede.54.1625584251164; Tue, 06 Jul 2021 08:10:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584251; cv=none; d=google.com; s=arc-20160816; b=EvNHhbiDG68ic0Jz5W/CdGfBe+NDqb/YvlNajZkZle0QzJE7IxfOFHVjxcRGkItOKj sgDhvyWfYbe8Zd3Vbz3qJ7/yqsGaMnsHXjGWKHOE4rrnWzPSlGl56rIU+pNv9cqng1M6 cLm6AnCNn/bmITyxHF5fduJjQnly1OgpyO3lP1bsYziDmMjG3iUHUiFml11WoNFwgoAP Tu1bJxxjPTad13wrBtSKs72SiZdmHkH7EjYXNnw3oL9nR6RZOoyHuDSwG3B9Gy+pOZ/k rGZ53BF0UkbgRWJWRrfUcBl+bIwbrj3P32d/v8zWC759Y9o0yPPCoCM0r9HRDlQb+U78 N2rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=zj2em8SYvb4pOTZr2587EJu0UWYCfHybq9t3jcT80AsS9n4l612rgeNrgXyi+uyC6E T4jfJcwqm7+XTP7EGdjUV+fbNO2miMpT5s7etXHubKHi0fWKh7US4X+lLGv3pSdbBHzz Y1VqF0UJpeRGCjBkEj4l7KkVarTzOXFa/zGqfIvkxQL3X2zBaUEehpWXUVcx6ZrRjKbc XuTa29kl/lwfha0pX1102h/7UeAwpJFn6++timmz1xri7dwqn4atB4cZxRKBkLQ6Xd4k 43HMT/HjeRkteGSCvjxWP4EJeG6UVqAgrn3tgWAp15Gnzkrg72cxDFkbmLPfSzu3WHbu hSuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KqI9jAVl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s3si15138859ejs.220.2021.07.06.08.10.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:10:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KqI9jAVl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0min-0003CA-Nu for patch@linaro.org; Tue, 06 Jul 2021 11:10:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXA-0004vq-Qz for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:37628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWv-00024V-Pg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: by mail-wr1-x430.google.com with SMTP id i94so26452895wri.4 for ; Tue, 06 Jul 2021 07:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=KqI9jAVlm6IxDc0+v4NdLJCDL2SWt4Y34TjwQApiiNvWwwH4rvHLtGnD5Sx1i8ywiu MS81BMddekGr/P/vpIaW1OIqCtbieGNmvIISjm7XIPpaXHHnO/qMqXSGfCietHxWoRMx DSnZI81CThd08nOD50A9RTVBULqlV0SMb+3++gF8jQZog6356VHOp6EQT27Wjssy3cbt iflvrf1YSFAjBceS1THIr4FL0SHSBz6UGQTASuUUNzkK7dWlJdTMjaZ5P3fbz6PcXEmT pKgBO71KNYkqHgch7AxaWp453fq+KbMhWRrVEnJW1rGcZX1S0z3PB/5SbcXyNY3Eiak3 a2oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=fDphdkOWskBa5MZ6LxNy8MmV1st8DMLJR1J9IvFgMfzfCVjNaZk/A9aL2dMAAKPlKv CGrERE+tib1a7nHjpQ++ezkA2mDaQLGEVFIldx87lvIdnqRHVMsz4Tz6ugyuxQIFT82K I7wK9UWzwxLEdrDk9xmdhJGPFzHLY6Gmc1k28GwzCvh4l3G/LVgolnKLGk8xgXd1BeqE H20HH/uMbbvJNvhm3TXNuQpvmVYFoTsqtjKnHjYRjDso5+iw3sw8Nszqju7sovWEUOpV XpXfeVs6pUHTPHX48VBqkfXMDgD3So4gFv6s0GOJHtPO8AizVomTJztrOGlqJ+mJDTMI d9MA== X-Gm-Message-State: AOAM531liohkbfqKiXAeOfZYtdwbt6sbuzr6Ie8cjG2tc0snjHiPZCVe 1TqHwVI9B3pS7InpAW2M5+4iww== X-Received: by 2002:a05:6000:12d1:: with SMTP id l17mr22256519wrx.225.1625583511829; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h8sm17027619wrt.85.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B91E1FF9A; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/39] tests/docker: use project specific container registries Date: Tue, 6 Jul 2021 15:57:49 +0100 Message-Id: <20210706145817.24109-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-4-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-cris-cross.docker | 2 +- tests/docker/dockerfiles/fedora-i386-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/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 # -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/docker/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/docker/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 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/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 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/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 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/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 # Please keep this list sorted alphabetically ENV PACKAGES \ From patchwork Tue Jul 6 14:57:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470455 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5086217jao; Tue, 6 Jul 2021 08:05:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJB9WLH/4ny6kFKwoQiJTb980ug1iTtCFlafAkX4NoRx2cSCqpkIpn+8KK15JwPBPs1QD+ X-Received: by 2002:a1c:f312:: with SMTP id q18mr21579096wmq.12.1625583937309; Tue, 06 Jul 2021 08:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583937; cv=none; d=google.com; s=arc-20160816; b=FWmCl/KAHEBny0cwqvCjo5Qa50JhU3tQYa3HIUfae3/ayWPrkjQz9QTtbKkqrAQfvM 0zBL7bPU73rsULPemxVSQG3ou0QDcslKkNn8IvT2UlOOqQNoIlU4YxoBbPz1y5oLl8la FhjefdL93ZUb3l4T+pWE2Fyll6j/XTUipxQVfrXuF+1dJNTmIO6Am78pCZ9ze4gG3nKP ap1IoxCfGjGwpC5JOI1ViR617bCG4gA0KbXs4WDBecbFcFPJUGB++6IPcIlK12Pvna7G oqGI2jFKDD+bapzAfpnjgFCvYHSFFFk1sASWUQIeGRLWbizluXFVfLZynrIU07c0MhLA lCRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=jyglul0ixakTMUBHr3QNO9VvsQu5pNkj/ekkvX/tqmfW6XpZPdJ5RhD6Bc7WoPKWZT Zy7RCOm7co0JIRtOgGxs3kDw91+RmLr0uCMEHLtR0INebs9xNdm3IhyACvVnEw4iNQ3V ETKuQs2e4xbKKiwct7DtVJUZUlXHFhPKNG8j6Va390cKpMXB7+u4e8iXJPI8WroIneTf BPtQ9i50vN6MavJj132JOFv/CzvlvZPDUjrn8DesY79MpfXeLe9rvczxCMa53BrnioWS +E7H9ZJqOhI3Q7vCMOliovZKQF8p+JvqKND+/u1SX+Z3oaOzcLCyn1T4mRkQIrX3n2R6 H6Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efa2nTxk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r21si17613156ejo.665.2021.07.06.08.05.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:05:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efa2nTxk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mdk-0008CG-4o for patch@linaro.org; Tue, 06 Jul 2021 11:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX7-0004jt-Fo for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWv-000248-PP for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:45 -0400 Received: by mail-wm1-x333.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so1983150wmh.2 for ; Tue, 06 Jul 2021 07:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=efa2nTxktRp7zXniq746JdLr742k0jtnT2gf5cBc47kIxAz9+s5prHEzHJzxhAfHm0 xoY8s9p5oDV3q8OR5ZyZlLGQ8gQowwqAdM8rAwVSOp3f69EI3D5HjcvgBIl3WPM5TbLx P701xtt8jgni3DSCHI2TS2A9NQamlsGQIbmt4uUyKSphTZw+d71PfprJuRx4k86lvyCr gYhn4JUzbGdtnswk33OCTI4QPb3ZKQhcwS6wSeCyDJhmzvMNwDg8xh7fue0Uedf/BT+9 snzqdHzUlb84QGPTmlTDGnHxE75/HH0W/LEMN49zn2Cy79f1Z7DfVkAo5cg7mPoyB3xE wpfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=pYytinO00byzst5d52Zs3hU3yFKgQ0RB1MBoab12FfRrIlUiwCRo5B3u1AHtn47dtX JYd5wvmuC5m/v3VI3PtjKlRc/Z0arv8D2zu4+ri53KGl5rxPk4MNNU71kGRJJInhTGLP KztEjVOnYyl/umE8blayzVIsuZUsHh2BWu7Mf78hcf4gq8hN0IJd+qUicOHeuwN3vOEY u4/Dz9ZGa3pp66laPwzGzQPUC2VQObM97WqC2Y8FmgbClzQVny+P/ZExuhRBpLy9kyKx +JVRhMxjHbF42xOrTpaVhZnXrfw6NPOcE/ndzwfDjpkJ7vjjQ+GC+XtAgy/0+Chdr6HW 1Uig== X-Gm-Message-State: AOAM532GQ2zp1NAJYjzH0hPAnZxfj4SSwjM7DoSGhf3xdh+t68PaJV+4 8tNxHlr+oRECMglhcdN0smYUfg== X-Received: by 2002:a05:600c:3794:: with SMTP id o20mr16425042wmr.0.1625583511015; Tue, 06 Jul 2021 07:58:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm15754753wmf.9.2021.07.06.07.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F8181FF9B; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/39] tests/docker: use explicit docker.io registry Date: Tue, 6 Jul 2021 15:57:50 +0100 Message-Id: <20210706145817.24109-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-5-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian11.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/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 RUN dnf -y update ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/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 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/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 # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/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 # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/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. # -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/dockerfiles/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/dockerfiles/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 \ From patchwork Tue Jul 6 14:57:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470462 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5090136jao; Tue, 6 Jul 2021 08:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHJzdANn4ylEr7G6s9b9CcW8RFTmcY9hxuTJTF2th0bf1X9ieDhPmKAxyytWHUJd0pPCIB X-Received: by 2002:a05:6402:1e8c:: with SMTP id f12mr23441556edf.169.1625584154197; Tue, 06 Jul 2021 08:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584154; cv=none; d=google.com; s=arc-20160816; b=AizFgwsmHC1/REbDPWYkAHY2qUpRKHXOkryuevbhymJ8/QaFuiZK+kyO5uWShivDD0 4UfxiIE8aXafWvtS4PX+MH3iBA41zWBruxmH0H4yajoXfx4Bq1oLB9KxfWNYDCI0ZE5M mfuzXSX8pRcD7Js5z3t/K8nQF+zheAqpO8HnsBOfgwlPrj0uynLBpzy7tat8r8cRaN3Q qDFX8wtJ0T84zmBdubXHsKo7H2RaMaImjMAXLDSiKddMoXvcmJXQEag6bj7Fm3Zo7iIv xpescZo1mGjVeBa+1Op0kmJZ96zQ2jGoxJzANnsIrO49vBTi554MEatsWlk6rY1Fx0L4 7tHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=xEz3w9ifd0/IecYFZVIrf+rgmTY+ZOSV7IWvXa4bwatTGikj41OSX4RExPHUci1AxZ pXfQOKeMjwxSlyixUXM1KULwXEVNtA0hCKyw9Ns4AydAOo24vZGIiSZJ0sb511+Ic73f KqOjAHEhoxaHBQxoqdADy0SG6x4010g/BF0iMJEATlCqJ5cU2N27kbjS9rumeBflSMQj GygKfz10ZtX1ISgUJ64c8aBlHL2OLKcuIvN4DTwNbprrG1WeZtSd+D5K/uWh6kyA7D8F T531cwH5JIU3SymOyyuAH7q42lt6qR6raTbSJUHvmtwyoggktKNJSxUjdrjvOODyrXI5 cmYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dxN3O2sh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r9si15040051edd.15.2021.07.06.08.09.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:09:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dxN3O2sh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mhF-00028n-25 for patch@linaro.org; Tue, 06 Jul 2021 11:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXK-00055m-Jo for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:59 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mX3-00025e-QC for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:58 -0400 Received: by mail-wr1-x42a.google.com with SMTP id q17so6045285wrv.2 for ; Tue, 06 Jul 2021 07:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=dxN3O2shUBDveDdRza5Kbsx1GJWEDtP+psl3NNbeSj6rZaC3G5/87jalX6OkOJz8tq POg/oqqcG60V6R6DDNQyJqcaJuaJxFrHrtkzOiBD4xzisKIOAjffNPTccYSEOesiSas/ Gi45/GPJxnfVdgLnsExP2PjPcRQyDfHUuGro7idzxpyF7Es5yG/uQKSbRjHqiMKfdXzg aVsRfwc7pfIIwXg2DxMWdtox8tywGp4kNeaL/aSgXB4IozhupAaJV2DsWs1zqFidx0aI UQ/qE2YevcaecW/lVgPEBwxvX6eD1lp88sqDohmUWDVZITRIZvjtgcaOxxu2lnF45o5z wJug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=i8kzf70bkd6USlZ9iVpP5DdUA8h+HoZsYmDxAXQeYnwqnyNGRwIP0nIi4UQlFgYJSW ss7M3njZOI5SSv68a7Jsv/rQ+7DvBz6zOvOQuA77XhneCnkfdM5zMApkuKLQah3zh8L5 nVURV5k/lxb19kb6T+lENToaNXiVCJaHStLTnp2WYhZglDY8XzBXu9K7D+Peou/J+OUP c5tXuw6NvGbSi2mwT+QH3yAYe5nf6cI50cFBsHNquyXwDG2zpwnfu9Yeql0UoTvlwplN kVZL1/DXHOP1TSyTJcy8QhYHESsv9KGNyam7IIRVuIX4FFqxDFqaoQjt6kqwjVPuoG2O ettg== X-Gm-Message-State: AOAM531umjOXOY2oRZ1Mmj2Rfe1RyQsa1LnQh0a7vusl2fdCYRfAoQFB FY0ACVkdkZhtCTEWSVDwU2jLLg== X-Received: by 2002:a05:6000:154c:: with SMTP id 12mr22722209wry.97.1625583516293; Tue, 06 Jul 2021 07:58:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm3128179wmi.1.2021.07.06.07.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6152F1FF9C; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/39] tests/docker: remove FEATURES env var from templates Date: Tue, 6 Jul 2021 15:57:51 +0100 Message-Id: <20210706145817.24109-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-6-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/common.rc | 19 ++++++++++++++----- tests/docker/dockerfiles/debian10.docker | 2 -- .../dockerfiles/fedora-win32-cross.docker | 1 - .../dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/docker/run | 3 --- tests/docker/test-clang | 2 +- tests/docker/test-debug | 2 +- tests/docker/test-mingw | 3 ++- tests/docker/test-misc | 2 +- tests/docker/test-tsan | 2 +- 14 files changed, 20 insertions(+), 21 deletions(-) -- 2.20.1 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=${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"} -requires() +requires_binary() { + found=0 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=1 + fi + done done + if test "$found" != "1" + then + echo "Prerequisite '$c' not present, skip" + exit 0 + fi } configure_qemu() diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/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 '[all]' | cut -d\ -f2) - -ENV FEATURES docs diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/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 \ RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/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 \ RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt -ENV FEATURES mingw # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/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=/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/dockerfiles/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=noninteractive 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/dockerfiles/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=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang pyyaml sdl2 docs # https://bugs.launchpad.net/qemu/+bug/1838763 ENV QEMU_CONFIGURE_OPTS --disable-libssh diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/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=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -ENV FEATURES clang tsan pyyaml sdl2 # 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} # 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="$FEATURES dtc" -fi 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 @@ . common.rc -requires clang +requires_binary clang cd "$BUILD_DIR" 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 @@ . common.rc -requires clang asan +requires_binary clang cd "$BUILD_DIR" 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 @@ . common.rc -requires mingw dtc +requires_binary x86_64-w64-mingw32-gcc +requires_binary i686-w64-mingw32-gcc cd "$BUILD_DIR" 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 @@ . common.rc -requires docs +requires_binary sphinx-build-3 sphinx-build cd "$BUILD_DIR" 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 @@ setup_tsan() { - requires clang tsan + requires_binary clang tsan_log_dir="/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-tsan \ From patchwork Tue Jul 6 14:57:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470477 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5206245ejx; Tue, 6 Jul 2021 08:25:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdzPaJTA7J0cmVoXlYzLnXcM5xPJM9qv2Hbs1rJA2S704mCKRPTxuF7MET4u2dHK+6fMzN X-Received: by 2002:a17:906:85c2:: with SMTP id i2mr7062913ejy.27.1625585133254; Tue, 06 Jul 2021 08:25:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585133; cv=none; d=google.com; s=arc-20160816; b=i1kBoohF6q3xjCXb6CqIDo5+1yyHjRPttatwNUAPnSvCJJD/AHWf1w6ddHvUzdJOtR orI+Wt9OYT4sjDHuH1TFMQrY5UaBRZghhmKxeh+id3gf5iOTZcFkiIZ8iZJR3nuptVHS qkZSAuyESBuzbhqiwsCOm+QQRYaf7pAbZLfmN3jnAxMqEOicbqhKXLGCglLR5lwhvkPT aDmT4Hi3rEQInXACTnH/yds8p9xb0aIxyKUp4OJ+Qvf+mrhs4OMLuIwVa+/25aYFyxyy k9NSxYTF+xNp+oSeFQYsrpHAVDfyIfNOpFH/MKq8DBMrwV9CJc/JmQnkYeySIylSmJQI /C2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=IR4ugy99Ms2UptSTXr0jEYDbedSSAHyxZwWSCgbTgyjTQbJ3y2Qek7eiRYPd9Ntc+R hbJmnkglSODnoBmbpQKEzRXGach5PwbJ+6x7IFs32TYm2auGlFv0O1FuKuiuEy7NOW+2 oqQ7+ytunBRiJtdgrtevphGoPKO3JhsqCjfd+rfgcOuGs+Bdf8Lyy2sXcZGsP2JoucIg 4NFdGWHLX+VnspuLbPuOOdd2MzKE/1VMjs2L4X3/24a66dpbOxf55dVny0/waAfb1xfd xDGaYRP4XEfTHWfpippXMeC2QiVY5N+RTWTl3iaiJ+UXnqC8mxa+HrLRxBIL5rsZb2FX cZRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HiJngSbq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q17si13919411edt.177.2021.07.06.08.25.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:25:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HiJngSbq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mx2-0003ws-7f for patch@linaro.org; Tue, 06 Jul 2021 11:25:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfS-0005fx-0q for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:22 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfP-0007Hd-VN for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:21 -0400 Received: by mail-wr1-x42c.google.com with SMTP id n9so9126644wrs.13 for ; Tue, 06 Jul 2021 08:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=HiJngSbqS6k+mUQCr3YV666d/elEh1N2PJdFFPMLBN9Okjv17qAXcSse+XOSFN93y7 6SAmrBwJBRoZN2u+Vbk/ejY1m+YARlMNgJpj9o1+OupJLBV8ENbU58P1GqSw+yZGVHN+ 5l3/smIaChJmyEYvONPE+EsKAB6dgLeX72isp5AnONZqRzNDndY446pLe0sDxPcfr2p4 LD85R/2AocMT1FDqcIZYLHirbLqMIoNKpIPEffIPTtkIoH4Dvub1FJm+RwNQi5XMQy2c 9Onm6SWcs5ObmryQ51zbmnMYrj3PCNq4rRWgPKkc/ymwrxo4I2J/4KF4G70Xkt7vsPvs 0pMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=C9jDZCjNll1Qvvbi6/e54NH0Ieif6PJMctxghpoKRgSAS4yyPWL2EoSI6YGB37iNiu SG9gH4Q1DTiq/ifFlOgkO4dWOOg+k3dIUv0lffmq3snlviqqUPAFugozl5gGOhUXW9aW i/8VxmW7bvpJD0HPxF76NGvv/G4zriB0zkG4sOb1NCWvyzcG3cnZSRt9Yl8/LiETijvt 9PeVM9Aib9zJBneOMUUPf6/RpQWwfiiPeuXeY808Y9jHCknofiYmX5P0iRdzLxzYOU9D QzNeUPmKroVkx3j5NzZ3qPwaT2ux3kelOAse1cEqchSskEAm5fnsnfy8EEJuzifTSpnf LgPg== X-Gm-Message-State: AOAM5335P6WXxUxMOfLl1SbGsJso8u/3yEDm0hywtSmDmCtUbsFCwJUl yHr2m9TJ+B+sGK7DzrDj5xb9cCmL6iu5nw== X-Received: by 2002:a5d:4906:: with SMTP id x6mr22805718wrq.387.1625584038555; Tue, 06 Jul 2021 08:07:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm3151308wmi.1.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E8431FF7E; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/39] tests/docker: fix sorting in package lists Date: Tue, 6 Jul 2021 15:57:52 +0100 Message-Id: <20210706145817.24109-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This will make diffs in later patches clearer. Signed-off-by: Daniel P. Berrangé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-7-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/docker/dockerfiles/opensuse-leap.docker | 16 ++++++++-------- tests/docker/dockerfiles/ubuntu1804.docker | 4 ++-- tests/docker/dockerfiles/ubuntu2004.docker | 8 +++++--- 5 files changed, 18 insertions(+), 16 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/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/dockerfiles/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 # 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/dockerfiles/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=/usr/bin/python3.6 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/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/dockerfiles/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=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt From patchwork Tue Jul 6 14:57:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470466 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5198304ejx; Tue, 6 Jul 2021 08:16:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwe6OGtzs5JGXwMv09o9hTohNq+C3IbDWwkJBaz9Mi5CyYPi3JrWtK78gsf70t1YZ7+DtDb X-Received: by 2002:a05:6402:501:: with SMTP id m1mr23855408edv.163.1625584580061; Tue, 06 Jul 2021 08:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584580; cv=none; d=google.com; s=arc-20160816; b=o7A16vUeJKemsomDF4cpsUDyWQgUHK9d4K1j8nL8+bz5gwV0AkKe0j5de7J9/2IMPL /WCyUF9vvpL0jheTMI4FNPnWpoM+cTJu/jDN5TvxQ4v82/+adZ7GFih8PIXIwJHsZoea ybbY33gIGTTgjUP1dDdinR3y1LU7lnj8x/hkSAljBgKs5B++802b6eLIqY2hAWGZebVd K0CBuWC7PKer9+zQPd8K2jXNzGjo0+UXQVBtGEiRv0rWuWRiwqBmW3cYsDEgdpf397XG wqX+M5vJYS5dCmGHnLi5Qg9aLK3XIznwRHNvaavGCymkyYF3BGOu4fbXQ09gRbZtGewQ a/+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=FVhahUAlSdmv/66dCwNNrcP0YJIpgAFkboxsdkp+IDiH1K4papcDfwvL364wtnaHgj HnSyaBE//g0955cCwAFJEch+RIl1M5SvgQ+RAjkCGMiMsOnfdHGzxXAc9FC28QXapH3N KcxP62Jr9JCnH3DG5nkdUAfQTVWghnENqWypc7d8Dyrq5+1BVCewltiGiwg0hn91F3So y5ZU7RXDSZTa9eO8HkTwXFTIwjLkLvC6qGQ5KDQar6kMIPUB3xkYIQc5SvwxGahxGQxv VLZwx88Mg14sN9y4UHRpxU+8U3mSp/MbYrVED8jyZe3tcKVNtyCocUEY6EVTdSK2sfp6 B4Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vlhPRkny; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id js4si4608663ejc.580.2021.07.06.08.16.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:16:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vlhPRkny; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mo7-0000Xr-0p for patch@linaro.org; Tue, 06 Jul 2021 11:16:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfD-0005Fm-F3 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:07 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfB-00076H-65 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:06 -0400 Received: by mail-wm1-x334.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5373780wmq.1 for ; Tue, 06 Jul 2021 08:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=vlhPRknyqzBI7ZbWNCRYZDhIHAwbm/vqLyV01gjTmZ1PprWsjv82Nh2qz3P9CpOkWH 7pvMaCXV8WN8w56dyiEg7BGHnpHv1cv40ORElHC+mfmc+0zeXSDM/q5AtLyZ10UsP3Vv 8SXO00A51wGnDPWZlV1SM8UzRi/vp8K/Q6Z1flBWs2SfNYZq1jLKjOAm8tI4If5L0IZ/ QtHImcEma/J027xCcydmHKUMMK2tcnOXaNU5PcK7KApp+i376TITE1crgrPsSjoddvPI AGHwHNP34bwPsFLKDr5VOEkknlvqnDoktwgw4yA25hmmD6lBuJQk9aIM/CLfEHP75p2r yaeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=t1QHVwwOoZh8SWCbgY185kUeD+UewqB2cZYATez098wsd57jrEv1hQzEAF45208lqE TKm7RZCYKY8gYsj5aHJqASxMxk/OYD5PGfzrYrwSvXDBiI46WoJdx6fac4FLHgF9Ee+Z zN8VAsQyvssokApSwFlMHidWFt1P0zKhvgzjIn5sGkWKRDMgowXbA2II0EVM6UtHCosx jY5VPHWjK79b7BsPX3QjbA9Ew3cQhRHvARL2VeDs+zbThZonBj2f5Ap/yHD/9M02JwvP 9CMxgS5cJD7PN9PixY5t58eEpTRVENpUV3zGvsMP+1Io/0tnyfpnZJhiJLOnf6G9T9kK T+WQ== X-Gm-Message-State: AOAM530hlADX/v7L9wQTqai63ezWPmrfhzbZ87Fbu0IFHh0oRhajddJ1 7dQ/59YZfHK6s88tuHCyfO4gXg== X-Received: by 2002:a7b:c949:: with SMTP id i9mr4070373wml.168.1625584022611; Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r3sm14574113wrz.89.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 95D8C1FF9D; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 15/39] tests/docker: fix mistakes in centos package lists Date: Tue, 6 Jul 2021 15:57:53 +0100 Message-Id: <20210706145817.24109-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-8-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/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 From patchwork Tue Jul 6 14:57:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470475 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5204958ejx; Tue, 6 Jul 2021 08:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFXeIOfDeA9aH5GJJHhvcebBBsIdBg5SzOfv+G5o5iVMqEhw9V+mPscvsyqTS4dQSYoDgR X-Received: by 2002:a17:906:25cb:: with SMTP id n11mr19189003ejb.539.1625585048260; Tue, 06 Jul 2021 08:24:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585048; cv=none; d=google.com; s=arc-20160816; b=xoSsoekgT0MREsSzsOn50v9QxUb3cqP+t8rJyJ/oV3CGXOmnUJqRIguFWBQYP+nSE8 GCtZivjRlY4vrS8pJr9VKCcdZykjLvPHsOI1GmVtLOEqaCDnmDOYVSBA8yU4NusRdWnp hgiYVIVMgZRXmwlNmmh0k0v96ac6EUlLvAz2mSqiSnVGDXe5msdEqHpdmV0mXYEdYAuK cuNG1crqYoJ6jSqagzdRhgOKBgkrWVyLTvFBzXGpvC/n87MAjNdgrvwSkyBLSqVptMCt 8ckH6WpS59DkTED+WZ/TrsKcq3nRwK/St/Ad5Rez4xEex7tqbqVPB+U5zRCQzCgzAAvw fFMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7hYG9gx99ZdrMKH78PnqlgUjRUSFo9m2QUAYrIofBos=; b=NS7La7HsiWmu5fG6k6DfgPsofiQqDZEGeFC6ZGZTC9X87f+jVsfwzZuFB4F39WyBhm g8gozyBwGtcYtOjUiZJveXVRRAd43kbAF9F1oYo0DFWUSLcvkPMyWaFVa/TC0ISuD3Yo ut9Vu6pJyG1CmT3xsLnrb4VQ4DDBrWx7Fglpewo50bjWUpB0qLtdPGDPk1jgBb7qpV4k LJscvkp5AOmOjdLCqnOCPoLe9cxdxUAZodsjHwrsMAHGMlhFucIIVg/B+4DyoPDD/AHM wGEKHyai/wLdmlqhg+auB1RrAR/EMpbfeEvT0tu38q12ENmfcq2UxN312AY5oWc95Io3 yAeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="XY/WQuKs"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t15si5631285ejx.139.2021.07.06.08.24.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:24:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="XY/WQuKs"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mvf-0006wR-Cv for patch@linaro.org; Tue, 06 Jul 2021 11:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfO-0005Yf-Ql for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfL-0007Fq-If for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:17 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l5so9712099wrv.7 for ; Tue, 06 Jul 2021 08:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7hYG9gx99ZdrMKH78PnqlgUjRUSFo9m2QUAYrIofBos=; b=XY/WQuKsFNQcZHYMfzje3q7DeLZyFSNZtDd0YXinlaNv+kKwQJBSuZCGSc7NVFquHP DWZuw5nNfeH+XrvaIkoShB4ylWNdqBAowEVIGRlD/Laqy2VoKzJt14wETQ16O2bqmbI7 kBb9NvJpoh05FpeQ39O1aYSrqUxBteRmj7Nl3WDhoXi8U/e33TIMspnfmYDG8bp5jNKZ H1N3VpWISZ5fHalnb4F6vCk9gnHQbxh2jkLFjrW/u8+21oSiilNsOZQwik/5ATWKmcB8 soVVVST7oTaOO04ADmqqJUZzW5Q6DhiEkqVdQLRCpUERUutOp4jPH2iRh8Kp/2GSTX5K uUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7hYG9gx99ZdrMKH78PnqlgUjRUSFo9m2QUAYrIofBos=; b=oAfYadtuBIYszLxZSeBh+MexvVn3xodSlTrLdVFQF89otEHMbbjacZNVw3f9hSWRku XQiZ5o0uiu9zM4jZzT8wsMm2ZaqQU0gDkZCR77hJj57Rj4hRDFgcGAOn4btwZtZnn5uP H8rxkfDK3D5mrc4i8hLX/gWgT1vVRexgkDY9Ksl/LMCSzHKClfdHvZDeKTWDDpMRfKvn EtotwEp8VwxDjnNcq7EFYwj6HEYvpRvcO3gzhF6/SQtsbHEDUx9ERkd7V2qAI6zniNYs mXfbKiR71sK6u6IwafwKNEvoBfXq5pBLwxEXEJDwbop5mPeu01ccuFtafku8k4gUc52K 6eng== X-Gm-Message-State: AOAM532l1OW1ifWL7mXj5okqO17tCKUGeiAlc8P7LF7Zt3nx0vvbdlaJ CIT4n5K6OMdmnfP1lre7Hxrtrw== X-Received: by 2002:adf:ba43:: with SMTP id t3mr17193812wrg.184.1625584034186; Tue, 06 Jul 2021 08:07:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y8sm16932969wrr.76.2021.07.06.08.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC4681FF9E; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list Date: Tue, 6 Jul 2021 15:57:54 +0100 Message-Id: <20210706145817.24109-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé libblockdev-mpath-devel is not used by QEMU, rather it wants device-mapper-multipath-devel. Signed-off-by: Daniel P. Berrangé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-9-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 1 - 1 file changed, 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/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 \ From patchwork Tue Jul 6 14:57:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470485 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5113501jao; Tue, 6 Jul 2021 08:35:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLS3rXoLk+OUFrS9SbX25SU1V9iAweVm83dadk6qeKRgwx/nwNhVZUD9o+0C1RYVgJtqGt X-Received: by 2002:a05:6402:692:: with SMTP id f18mr2054831edy.327.1625585736079; Tue, 06 Jul 2021 08:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585736; cv=none; d=google.com; s=arc-20160816; b=LvmpKoZJYiWn2RF8fvdoCUamm7t74fh9U7A3yr13TdVVG4z1HwOa9nZoSkiZHSC7Ij vHBxNOAOjNJUD8tzb92EGeSwKq/t9FpkN6NcMqxNDIgo01TZoAOv/S2Je26soIUtXLh/ 7rGtDw1E3EHaudH8C1qfychFMuXrmpL7TslIkEc9GIL+X+2ptZpUIIExk5g2Bud1ZiuQ iHXhu+F1bI13bah/fAKD4mM6mXcq0V47k41nEq1J7SoqrZaxMEeBgY2KzzFhdtBkySoV qmVF0QJSFeVTIuYFaYaDN0z39FSrIFjtrtFpmbIndetFELPiQPRSGDl20G3LBHYXF1JQ AXhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=yaQDJuLmz4ili6kXXG11DGDCshi6V9SejnMQwMeCCpu2VepGPBXccpbKH6JUcG5rMm iKUCG6BaHu1OYjNNDSkx+B/uZV4reA8TpkzinbiLXwWUbbU+Yrs18QwPoP47Nj65Ls3t EDp0gcwMzMWNgDQZ74eqpAt58vyIE1P8vCDecHgNkS1akGlK0mEBsRWqRLpfupUYrhrT liMNF3SoakBV309Kg6KjmtHNY9bPYkUdBLUPKixBjq0rkJI7RyZsW2NfLgT90GvGoD3G RzN5fS/3be/IuJFOcfBRszeS4oFPdRNeEjhhWPP+TSrbXuGpqNadZIzCi8ava2HWL4FP 9V3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xEESpXov; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bd22si8568996edb.583.2021.07.06.08.35.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:35:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xEESpXov; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n6l-000879-4q for patch@linaro.org; Tue, 06 Jul 2021 11:35:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moo-0002MN-37 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mol-0004qH-OU for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:01 -0400 Received: by mail-wr1-x435.google.com with SMTP id a8so14819045wrp.5 for ; Tue, 06 Jul 2021 08:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=xEESpXov2DK9hBWSxMI2qWVcTc5c59j/GHKKdstorTXWATFqJ2sg7b721EWKvPFqbc KbMsU9NpV0GOGsGRRQPoPn4FNg036bDZevseXQtexhmqBL4W2TTwoFzb2yW43UtjBzdz jaEp+bMpEVxP8dbWnt2bOpvCUn6iwoygg/xddxzxzfEPzdXonBIDBdzVP15SX3MBJeqL pATtaUUVcESWz//QpHKdJ8kLa/TZbGADH0+mWK9X8/aaNtLRQ6WM3kGD6uvUmmNfGnFI N9Ydx14XqQxgJGOmYnUp6pLBzmBDe0XPmqxoA39NuvF6bwQzlLUYufY+HR1Z1NCqeOsf Pkxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7K2T+7/xRZArnCf+GLaEJe8OjH8H/Pc9dQvIHChB5w=; b=mjVMgB6o8q3P6xr7aPM/+IqgoVI2UyAASXcnm8hvSpIdSvQhAS/J4b12YkJJZGV+lQ cUkhL1A+LMAV/tsQfIiZ0ReWPGQlnYwJ5sScTsglCS1O5Nu2IPFqXF4rriX/eloMM44r jIp91f5jlyfDW6kCcDnq9/JM8Rxxf3TSsx8GhART4iMxA88PZZYT0m0GzEami457J/dM eCkTe5lfptCf1kNpGsSRiAgwfW1GsP+ETC6dPHGIXOH2W9M4lcPFHeMpl+LWHVg66Iw3 9uRcCJzIsQXr2TDz6ovnM7D6YOyTB3mopiqkO7aP5sNUxiHXuBltbwoNUU2bepQoh/Qk U2Lw== X-Gm-Message-State: AOAM533zHdKIdtXlJCYUB6T7AqdUDd377lHkYuoQmi6EldAgfR4U5aDY N4Oi646qS6QTEaz9fpjVXQCr7A== X-Received: by 2002:a05:6000:1361:: with SMTP id q1mr22046681wrz.179.1625584616705; Tue, 06 Jul 2021 08:16:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i2sm3199147wmq.43.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C65C51FF9F; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists Date: Tue, 6 Jul 2021 15:57:55 +0100 Message-Id: <20210706145817.24109-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé 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é Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-10-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu1804.docker | 3 --- tests/docker/dockerfiles/ubuntu2004.docker | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/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/dockerfiles/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=noninteractive apt-get -y install $PACKAGES From patchwork Tue Jul 6 14:57:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470487 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5115657jao; Tue, 6 Jul 2021 08:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvKy9C2WwxJn6EWYYR6+GdwK4m77USrMeLwj4q4JH2xKbg1ewxmEA+96ZNlZ+FD+jDLVe7 X-Received: by 2002:a17:906:9b8f:: with SMTP id dd15mr14871931ejc.77.1625585889519; Tue, 06 Jul 2021 08:38:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585889; cv=none; d=google.com; s=arc-20160816; b=Ebg7oUPcMjkW8g+Ao3UZ+YZfSbQE3gwH/07INi05fNZrMUS+LDqY/+KuWPnDQiYRpN wxTiEz0o13MDKJ8qxcGvSHX49MKYaqCKOMIK2LFEbtdDQPod7S6gv6Vd50llRFaM80EC iel+qwNAcc4JPJkDYLejXIMPGqulnRcqp8N+qNtEZ7RdVIThCowpTT5AWphrDX4gvYBs 9Gcx8vebaI4KkvFKchhFgLlQ2zYoy9LjCmD4sNGhIIVFSQl0muEr9yWTX8rQ8A0TTxpk 5WKsV1EcVOGWvE5U3iZh3nYzxlPZDt/l1n68Y0DTVOYU/nob6IygNX8/cehvpXHeiM7r yDRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=P9Upb7I6HMRjCcJjpxGvstVHkB7w6Pb+oVKK25wH7Y4=; b=TmJOyRkxQK7l5Coay0kyRFzhn4N6kl7yNF1qDYVDFj7w4gB6XK/6MFcPqKY6G5aVoa W1fsbiVBbsaNZ6HSgN2QP5kIv08htDtmBNcTjkLtJBdVItKHGKroYce5LoJYArRJbdf1 qO0NhSiD4XJCGKA10QavfsqG2JZOd3zmi/TgjQ11PcO2BpQRnwt0cEbes4bYMNEcgWN0 iLWQ/5G/mfn0GQ34feQ/edrRJX91bcWldWWgVq00gnJUlk7lN6R1g2RZYEIrUYL3bqID SdB5Kr6l6Y7988R8yqRBM2mE/fB8BnqUlN92K0iHfPjR2ynsdaSlZiGhI2mBznkD2Sbw uqig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xbd43Pk5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p8si17358501edj.155.2021.07.06.08.38.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xbd43Pk5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n9E-0006Zr-Gw for patch@linaro.org; Tue, 06 Jul 2021 11:38:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mp7-0002QN-UC for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:22 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mop-0004sn-So for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id q17so6122491wrv.2 for ; Tue, 06 Jul 2021 08:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P9Upb7I6HMRjCcJjpxGvstVHkB7w6Pb+oVKK25wH7Y4=; b=xbd43Pk52PsokX/c1MFMChCGHn58nclzeHXQ6KjlU1U0A5wNRxPi3910ekQrO3zsBf 6B0ic89Egk5xgpsqr/nwNao1Jok+zD59DgdFqXc9yEgXmnESfaDljE/FBOW7R/G+sjjh QiEO3o8l2SlmpZEEs1IQqONPcY4cO3fcvayz/6oNIYT07z7inYTRHQYl1kSK9ur/gRFG X8mM3EP5PNn+8DB/bPjX5q/D1gXbAqrjZAwLjykLS00PJSso0GxeVjU3LgKb0KDyKw0k zykkkO8XtUn9zeq9vpGQ2wJu3tYok2FJskuF22h4cdFY+wcVjWDBAsOfsNOSh+tj8Yia r5tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P9Upb7I6HMRjCcJjpxGvstVHkB7w6Pb+oVKK25wH7Y4=; b=FglaToSw5k5DTewORu04MYzwz6mEtCk1Qi74g52b5iyrXj4r2nNH0sbWbYF8F12cZc bjzA5tl80WF0nC4gQUcU8hnBkwZSVOIxTtKvh5XkaYMcQGnbsBTvoGzQnf59UcGq4/ky d5HENPKZgDecnXUuXJJojd53IRatx3ywce2R4wFb9JWfpEUES1dJ3x2MvlfLF0X9Qbn7 V+1EUhxu0zKU0dNm4aTQCDEV4OIZ71LHDr8c4L7d1FcFrdsc+5bR0OrW+G4Pv2Rfa6YC ELjfZHG3ds0JUVCrF3tFbNVXD6hhXEnLoVd9t/6Z+X0244nCzKXYEmNUgr2rwS7LH3tt Qmcw== X-Gm-Message-State: AOAM530Etkr9IROuNY2MEjUJmuwgLEcp/iS8m5EARW+/JnelazQ5u2mA S3Dh0FBwAZ99nU7cDW82n5bfSQ== X-Received: by 2002:a5d:64c3:: with SMTP id f3mr20888424wri.101.1625584621818; Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c10sm15617088wmb.40.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD5961FFA5; Tue, 6 Jul 2021 15:58:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora Date: Tue, 6 Jul 2021 15:57:56 +0100 Message-Id: <20210706145817.24109-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé There are dedicated containers providing mingw packages for Fedora. Signed-off-by: Daniel P. Berrangé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-11-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 27 -------------------------- 1 file changed, 27 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/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 \ From patchwork Tue Jul 6 14:57:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470470 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5201899ejx; Tue, 6 Jul 2021 08:20:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIq/4ap6TXMM/48QijLfkyHyr0od4c41TjUqWR6OB4SsuhhZkdDS1+BUViAiRkVTiqw+Ui X-Received: by 2002:aa7:c857:: with SMTP id g23mr23137854edt.100.1625584825275; Tue, 06 Jul 2021 08:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584825; cv=none; d=google.com; s=arc-20160816; b=DvFPJTGT8s7Sap1MvEm+FTEuo2FLr44j0xZenzdTJkxynCIKOV5kf9jy/AJ7onDvd/ W6fw0EKrOzMlN8BwP9WOFKB51ahR5fU53j8AF0sSIf2xa/D8Kvk8GaXizMUHdIUh7H14 gQPLxR0tSG9jGa8Fh45Y4mZdsbmC7RVC9d0NL9wwh7jsehUNgBny/cUPFL2C6A6XiGyv AQGLES5QPFqqcQidzyf7woIiPvrb9rHAP1r3HEcVrVPpQEl2dMBlE4dY2RmKUZs8DxM4 xHyckO3P/jZX1cYWwsYFVboxVAdXVerhHBlZGQ0lFEh/ESWwPz73wKuqeaF0mdfzfnys khrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=fUUMr+O8DE1MPq3pVhPqjMrb1eLlL+kb1RQcO49hlSbgbLb82MkKV8s3Ax5zRSatpv O5VVtvZFtlN3A/Rg7dbiMjEfwTKfMdVyswmQ3mQYzqilFf5q9xF+ghq24cInGSJ0ZLp0 hGwn51wQKZ2xVj06HgFjrC9IB1wkDgbXh1v1J+/e79WxT4SDc5yJwsdGrbmaezkK9YQh 8PMVUU+LWDzcwLyFY8Fgq71K7dOyZPnatyRE0YDX0aJ9lGKgsYWI0d4mYYN05BD4z+Ph YWPA1IIKVFZ7aDu8fblL/idnrsUyvOqqUEAiv211JdVuFcFizmSU+ENH1t6hkRD3GBCC I+Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bh0vCDd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s11si6828481edh.596.2021.07.06.08.20.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:20:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bh0vCDd4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0ms4-0005Vc-A7 for patch@linaro.org; Tue, 06 Jul 2021 11:20:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfJ-0005RA-NY for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:37791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0007D7-Oi for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:13 -0400 Received: by mail-wm1-x32e.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009691wmh.2 for ; Tue, 06 Jul 2021 08:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=bh0vCDd4ys4vhyrP0NOBDo5lY1mEJvTGuVTX0PlfJ2IVgSH8SOAt4pSC7tXAhR1CDw 72Mau83TyUodva77bXQJwO8rwPHHX5DgOxy+gtvkL7No6wCCgB02dPqjBe8YHxsW+nWO pOK108lW4H47bSwtUAMQ2dFN9rh5Nfi7+HnCzoJY2dAnNSG4W+mLPT+ZdTUDParN6VBc DuUBuDiClFWas0KR+ZJRD1fz5VBf3O8ya2z47uNlLXAV8V0xvOqaAqcrhQbMAGylEwW7 HIQ10DoTwIqKCLZfZO0U1tEmDdswHv3BlLMe74fO9oCY7GUJV0PQzJ9t88wCyEg2q1gj UkIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=HdaGbNcfURauEZ1bo4hx6xW7TDBJisA12J6ltPcE6T/zMthnMu/d/1nJoAZyLlRJ9j 1cRFNY21M8HCw6jhMqx/31lhAbY2QF/SlqH5iCfYIFBunBrN7fpJSvsCMfiWn4AEOwxS An4V6i4iLlBLsMGaobJ53nFv/46QOhp+6JnJo/+pdFkv/6+PJRKxrZTGXOBq5JPG7qj5 HVg5KZ5t51ism48CxPOVdRLIEp+nErf2bZ1puoVbZQ3fAiHy5aaS8W7bh8G42uLbq206 J2Lo/6wqZuzkrPpZk6PtXrZewE9UA/NhvyUel8cDMevyGpoU5E5RBZyuEZyw9nKLKi2u gzSA== X-Gm-Message-State: AOAM532Y9bqZleKE5cUkHlAPOnUjVcTcfFASlpjHxp29Vp1rlifTCqLx AuvxfPp0kmBDnp6d+IwFU4J9fg== X-Received: by 2002:a7b:c5d2:: with SMTP id n18mr1298361wmk.97.1625584030310; Tue, 06 Jul 2021 08:07:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m18sm15728584wmq.45.2021.07.06.08.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0141C1FFA6; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 19/39] tests/docker: expand centos8 package list Date: Tue, 6 Jul 2021 15:57:57 +0100 Message-Id: <20210706145817.24109-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Message-Id: <20210623142245.307776-12-berrange@redhat.com> Reviewed-by: Alex Bennée [AJB: added centos-release-advanced-virtualization/epel-release] Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/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 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 From patchwork Tue Jul 6 14:57:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470467 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5199298ejx; Tue, 6 Jul 2021 08:17:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywAFWV/S4RbGhyQ8RP6hOny5vDFs3/NOIwRImGTLJoIAhLEqe5ottE5XOL97/Q3mjGRKVW X-Received: by 2002:a17:907:7d91:: with SMTP id oz17mr19555900ejc.250.1625584548817; Tue, 06 Jul 2021 08:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584548; cv=none; d=google.com; s=arc-20160816; b=QPaLSfpPDuqB3NlRP8VbJy8mMV49uoVGDMM/S0KnOEbfXhbR4gsVR9ptiR6JZKGPGL uZybZ+/fgz3H8Me6y6au8Mcu/oFIXU6DXAt0gyLAAmy3ACyAIJP1oLfiQflE9wCW5DbN dlkvPMWEbDQssOEPxqDeYBTwEuQlAp4xIeJwJxyPrGfBXWZHmQr6Jt/rqWdaXPRnuu+F Yt3oKzUPSwhElhv87mlc8JQZtzl8Fv8+dSXc7IMStw+Mlp+/1Sy8HUVWYn5Uy9n/GyKL pIVGxo0tcm0t1JVQ3O4obE0ExlcjVNKq22i5Sw8DEzsJoy3AN+vZWRuO1eFJXbN4eZel SR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=VVwoXJxN0w4BVIs1QrVvZVjiSPfXg+qHgBjcWCRcXKcINze5u8iZVOTevNUdkYV6A8 YANJQakZcSHImalwS8QFgOecppTUnLlQcghd8nmhRKI99UvC2TuUf0j0RgcsfnQkHvmI 8cSlKKUPJXleyYiyesNS7CSCxRv3+4Hv40+IhLk5IQZ5WVsuTV/Ba8VCLc0Q4fuiEHoA 4h3woErOxv7nuyP0MCRybmQsSvC0BABhZIR43Ust1JjP9NJTaAbU7XSJ9mgTl7vV6pR3 a9n+BfiVql5fk6+F5eU09r5p7e7rQIqolhEdo9NTcSz8eYghaclrxR8b1jsx8rmEraqF hqdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MRrSwHta; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v5si17279258edi.582.2021.07.06.08.15.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:15:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MRrSwHta; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mnb-0006fu-Ij for patch@linaro.org; Tue, 06 Jul 2021 11:15:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfE-0005Iw-RL for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:46965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfC-00077n-J8 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: by mail-wm1-x32d.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so2481668wms.5 for ; Tue, 06 Jul 2021 08:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=MRrSwHtaqQbHLJ5hNSBszU3KUyVW8WG4vlq2J9qkMgnc00BFkbafCg4vDAqBeG+2LR DRDZco5ff34zRDr67dVN9f2P/tcNwKw8AfNDrwGnmMyVLabFod4tCNt6KtoS5yWcsCUL ZAKRZtu91+yr84Fvgk3Fl1YeR2uesaysOeZObGQneTg5qhvp6Igjgxh6R3oYgFEVm0VZ RlbjaG3y6g3y0qDoq9SCRBWFAC5Eow+cmVqK/Qppx2b0AB3bprZ47C3t9hGZDIG0G/v8 duGT+b51WylIkhxXNtu/sYTb9CKhLNt2lDvcVTaVO/DYN14HQVyQ0p0BghM13GfD4U+U cOdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=C3xILZ2Z1xpD7X05XWzeN+q4vu/1g7q4Ee3Tjfr4CqBBdXQKxtEz9b+nRgdxYRXEW3 +cBHQdJc94334MdrNqFNo11UmDceDT1Tm49Q657j4cJkPqzwcFi8QKnoc3LceE3nrCwP O8dw+3hjKCecqLr8jrVEZfnHBSUl2N+f11lvKMCbV79ZTscdy7L2CVSjyHhPMzRM0hI3 fFE2nO0kzNgZJQ9IOcD/yX2QVInnNt+HLCEV9tZr0a97Obpkca2a/g0Cri9/y2UzGG+I bUnIPX9yhG1KK7tw5vwYdZetYGCbi4p37/Nzo8UT0ZzZ1EvR8hv18ksJiAJvMSLg/v3l onWQ== X-Gm-Message-State: AOAM532SMUA6MayCBA4lGMtG7gHNuSAF/tvKd2ldfzYdQvkOifvCOWXv /fMjwcvN6UFaHj2uXGKUbKcZDg== X-Received: by 2002:a7b:c214:: with SMTP id x20mr20636505wmi.171.1625584025168; Tue, 06 Jul 2021 08:07:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r9sm11662485wmq.25.2021.07.06.08.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 19CFF1FF87; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 20/39] tests/docker: expand fedora package list Date: Tue, 6 Jul 2021 15:57:58 +0100 Message-Id: <20210706145817.24109-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-13-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/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=/usr/bin/python3 From patchwork Tue Jul 6 14:57:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470481 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5209211ejx; Tue, 6 Jul 2021 08:29:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJrn/z1nb8dNzgwjA/KivDui+nrB2tksEIwmmAQTNiA8G0ZB1ylXz7cDjoby3Ng7IRA8TD X-Received: by 2002:a50:81c1:: with SMTP id 59mr24173776ede.3.1625585351198; Tue, 06 Jul 2021 08:29:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585351; cv=none; d=google.com; s=arc-20160816; b=Vk+qBOSZ+EfLigkbKUhcFZfdLQr5CpHp2i/zV4gQQh6Pe1//6ADZrgIHNDVFxF7pyl tHLNXprDs4EYxuSW0uJtYizf2wj6uljQnS9IMAEnLL4Zy0Xavs2vChUSe55FzpMZoheF beHfa36QMiHR5cigZesdaQx9v3QeHoriKxlH37Ofpa1SayP9mILbxMSU3vEW8RdVCCkE uUrsUtMJ4O3jiiDLV4OTD2x1dcL9Qcmc0qRTERpSflsVlkhA5E7Tggy6grXpmAz9dYvI pOgdMoycAvu2fyUG7mVq7s1NKROBlkArrlmTaEeY6GKy/8Suog2EWt3hJx7qLxso9laJ 0fbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=tF8bWYxsQGcRleISDRlmmZMgN3X+seF0H+X1VXx63VuJwefwacRNKOfbVQvOPQA1hD mZyLRhOLkBSj3uBFKWnnMEfBAE/auHWLHw6aOBjz5j6C11kF8rg9Fu0n+SEN2YibKz8B lPswQUDAsqv+iOseUZTIu78sH1gKJu8T5BmYAUUV4+faJHWTEqtWtIuXxl7LNEdk7ngD CO7+n8AfgrMhtgtStYoAXgrrB9nMPqHFaxhQhtKxxiaGTFB9teIeIJvA27xHRF0hp+7j pxDYpCRl5b+GuIELSZ6IjfHZqtL7MuLUWWF9XF58TCJBQpKxziCEIqsPKRDrutOiW8Uq JnKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZrshiQV5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g4si15662189ejo.319.2021.07.06.08.29.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:29:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZrshiQV5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n0Y-0003VH-5Q for patch@linaro.org; Tue, 06 Jul 2021 11:29:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0005N1-II for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:37796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfE-00079p-H7 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: by mail-wm1-x334.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009533wmh.2 for ; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=ZrshiQV5Fw96d/n7aPY9mlByj+APGo4TkHHi2e1Su74zTwNykq29sqC5EfaqDlFsdp 7OZ53zSHBJwZ6vsv4v4ddDc4HlmFZSjHrOa9ZkhTwkj0YyNYGPts8Jz5ZuQu9Pis/W+3 UfScjVfne/f2wqrZpF6I8sFpXM7eJN0qsTi07Ke8J7hNKb5RvZ9xInn1kP5XUjJ8j96j 5L0xWS0PooT7vuDgLEDPvDAAFpxeOg6RmSKOd36gGcGURmXPBdUrTOTlJO2hLhjgBNPB bgEz2XSJIDZZzdmKancuW9MF7YbJuIR8JuLxYM/PAOVH+F5NcgidsNqhfhc2YGbXwM3B JHeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=bYe/NgbJpISMaJgC7ZlQkAQaHUyVhTFQJS6HdaNo5QLD5sPP2a129USGdSTLrnghcU 2ZTVnIfMjt49ZiEOe89lw5zUD7MI6WMS3my6wKqAl4iZi9OL2CunpWsMT7opwgcPWl06 oDL3sOQ2K7+Y7H4ZdnVI7U/jiVaciCjKi05w7UiWjOfD/r9O8cxo8/WkPTwfLxz+6Nfx k3sOHgBeQa/1/H4MInItI/U+3d1Zw6+V1R+DKto86DhtslFqR8Kdd8YLVSUMin5HLQVC RrrIr/U0kdh4A06Tz7tS7EqtrK3nNe1tWzEnhnkputAEBLZ9L9RosoKxavamxKwi2c3k YsFw== X-Gm-Message-State: AOAM533taEU2gI8/JgAyMGHnUYUHicaKkSEigng64xAYUIOGY4gYXTpw bbLA82HqcCfSDHpeet+5IDdBug== X-Received: by 2002:a7b:cd06:: with SMTP id f6mr1372689wmj.64.1625584027047; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d3sm8861862wrx.77.2021.07.06.08.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31DF51FFA9; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 21/39] tests/docker: expand ubuntu1804 package list Date: Tue, 6 Jul 2021 15:57:59 +0100 Message-Id: <20210706145817.24109-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-14-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu1804.docker | 61 +++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/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=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt From patchwork Tue Jul 6 14:58:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470473 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5202938ejx; Tue, 6 Jul 2021 08:21:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxW5iYQcNAiBQWcbthyR8Y/fyRxSbLEfB6LBXg1dlZriQ1B/WAw0hRI3B4xIhQ2Xxn/IDwU X-Received: by 2002:a05:6402:d2:: with SMTP id i18mr7985795edu.17.1625584889104; Tue, 06 Jul 2021 08:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584889; cv=none; d=google.com; s=arc-20160816; b=YO4k5FJmuYqCjr46i9SZPaD4g5/gjnBzKQDMuPtO2SVTdtpL0o9UmSlDOeeGE1YsI8 pZtrG4WnaOH9jDEmr3CAtZxt7IsTCwgAzcpDfHoqPqSbyL+5xGXnG2SE2M3/wlQqXYLi y1FwdcTDwJkX5OXzYzJQAQWzy8asH/fHixqAjcZHU9quFIE/OZnlOsbealSpLp6c6LQ3 bsMsFqc4QJ/1f2UDTOwPuJqTTzdpfyr2RnaEUdMaEEkKqGrxiQSlbUKnbxynCCbylLU6 2yLghL1cmZmljvSSSNhGYmhp+/vPJCJvq9lJ9dLzOYMo02Fao08ac+zNbJX75YxSszVs E4KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7OPU4as02HZtXljAleSB6EF+rLr9JRR7CPBqu3EwDbk=; b=ndqJha9AtCJzXv1ODmYYEEl2R4lMU4SwooNz/CPa25VvD0Z1yVJK/RYCqSrqSfuh6W xtot/j34u4nIvSxR8L3UulLZefYZJ7t7WBffPvaXPg7nYm8i9rfVVwd82B8Awwihaulq i/tdF1xuhqS89xDd7PuZhr0hQsPXK1uCyqp1MSRDhnC+aMT77TxUPwkLJrHqqtAqRAG2 FZI4folY8C/e6wjIUTgqaRjT8bctfcdi0M84hzW9b7FCRffYONRUyyVZ2N1xSShnxUuD k1Miw1KJu62d8pqox3w4RKk9cOIXi0Y1iNWFFx+Mn6vC4FgB2RS7rrn1qSUohzNEC5U6 l1Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ohPrejXj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a8si14114924ejc.334.2021.07.06.08.21.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:21:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ohPrejXj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mt6-0002De-1V for patch@linaro.org; Tue, 06 Jul 2021 11:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfL-0005Tj-EW for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:17 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:45611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfJ-0007Dp-DZ for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:15 -0400 Received: by mail-wm1-x32e.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso2482498wmj.4 for ; Tue, 06 Jul 2021 08:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7OPU4as02HZtXljAleSB6EF+rLr9JRR7CPBqu3EwDbk=; b=ohPrejXjLeV55gw1mRp0b29hETRRbm5+G4BLd81qlFVWwSx7r6Mdmseo1J5SAaa2Kz ZCCY+YAUuic2gy0RXnVVzWGOhQl+P12gSKhXCw/LaYN2NGni94oelWbJ7qLQkht+Fvet 7pyejERx4ijkoXZmTu4hEssQTdHeh9+Q1pAwBlGqR+s48pkdkaFC6hosGIoaH8rnqdkK W7YZnZ/KOdXwBxDSOC5Ub1ARaNgC3AqaMGJs+KBQDkU+uBE1ISkKY6OLKsKUIDGZf3gX JiBypZvdgfvrCf6i8DVUeydd5H2kp3D09pBqr26GXtaOSZB5yPQGqrsyRBQwe5wXdGo1 DDwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7OPU4as02HZtXljAleSB6EF+rLr9JRR7CPBqu3EwDbk=; b=uXih66psGSeGDsB4ncJaSOICQOjbyj8Mdieduef9LTFgLPk6yU6I04BK9qKSbm9faO SEVV7c7+lnv2GdVa7xN86hopVLH5YR44V1VW/7vNE1WNdyxNTUsF+YQNrpHZ5JcmqhIW +Hz3UBzh4YHmbrXoWIsSguwTa015OGVENvZXZ9U0cZm7+H0dT/aCKUYhHm8QUdWYhEQs XzoNkkI8/swARbA+HbbxqI46GJBBwOGyT4QNIeFYRmUbpmIx5jEfvuC8vM44U3D+j4u4 eHrDRqg9Ox5OGWdTmh3TwSGMq9QE1AhfY1YERyMMtGS+VFdevMIVPDQVxXveE9KpHknL DSLw== X-Gm-Message-State: AOAM53199reAM9c2yzSSqpM1V8I7wWsTXuf8J9MUa0geRGGrbn7a/kpE XmVQyAaPlOjxmALZklQQmF7Iyw== X-Received: by 2002:a05:600c:2251:: with SMTP id a17mr1071553wmm.153.1625584032064; Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm11546440wrx.40.2021.07.06.08.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ACD51FFAA; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 22/39] tests/docker: expand ubuntu2004 package list Date: Tue, 6 Jul 2021 15:58:00 +0100 Message-Id: <20210706145817.24109-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-15-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu2004.docker | 50 +++++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/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=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt From patchwork Tue Jul 6 14:58:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470465 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5095277jao; Tue, 6 Jul 2021 08:14:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpfrZJu6gwKs6Hrgyv/dzeT5TgEn0HaQt7YRdCGe6kv7Ufg+Kozvr3KmUe5RudLxf8I1xc X-Received: by 2002:a17:906:99c4:: with SMTP id s4mr18847270ejn.20.1625584455786; Tue, 06 Jul 2021 08:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584455; cv=none; d=google.com; s=arc-20160816; b=OIvG+dZEgcaWXY5G8nNL1I2wFrnlycQ9nkS3Imvd7U2WpefssaoC55K/of3ZsRfnEK vSGQIE2Catauqostno78Hk5aiCJgsIyhLc9FZifXhxS7F6PzcYKANlqq/amclNzx0bMC 3YAcOujg4zgEDJunKZ/WUQMoCviAvGXKSP2P9SKZFZ1DcgqFknIB0EBv2mPA33lNB+xS RAigTkILR1+NwA0ohWnEqLL0Xbm1RK3m8lVwOnoxZWNxEGEsbZYPCmcCa41YpVIp0vbx BVbFiK5PYmPD7U9ECzlAp+ezrZuLgL9sbisl+zHo0aT+GHwUdnb81rUkXBT+UFTob5uh V8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=PTbSNFKjXKCKdFBGSuPuXAUvJub60359Uv7kWWUTYfKgKB3p837n98T85E/eX5ccaP sCGJKtNzwcqUC5STdfpoUcglweMGOAAkl2sf4YqQsCvuNJUJb4LBjJrDcuF7xXJ7lP1u VeKNmtYc7D3halV+Pd0yIS9JDP1+v46dbM4INel54C+Ll6Po866WgwmljwUZv4IgG/iL 8zNGvcyurbB8royeBVNi5Kd9qfp8/uWVkKEZYT1GTRtHbH5tGgXUYfY/4yVb8aJsFlLo pCUCRoZg0FLf7Dd1dpvpixtFOTivv7XUPk+qfXhoOBVAleFWyS4Cul7yu0L3Gf4BOYzz KwLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IQplr5yF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ka25si14484039ejc.354.2021.07.06.08.14.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:14:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IQplr5yF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mm6-0004TU-MU for patch@linaro.org; Tue, 06 Jul 2021 11:14:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf9-0005AG-O4 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:03 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf7-00074d-MK for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:03 -0400 Received: by mail-wm1-x32a.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5373174wmq.1 for ; Tue, 06 Jul 2021 08:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=IQplr5yF907z8zyHJDfrO1Ew4B4d/05xIyq4rbpCxS+r3+m/wlvyHKIIZ0pAxj/bGD TDo+KlqUsrQUeGa5w5WrOpB41tFx/2vh35FmnfRoOQ4NWMWFhutRgO05Eu4x26w+Ki03 oDkr1yiUd0C12D0ZAUou3ZtrA4nkjuGfe3DL7CqzCAlpFE7q/UNvAkg04uONgH1RbuTx 37OgccFJ67V3eOMsgbcvbVGk03nGVLJ0sMsukX90iqzFyUlcCOt0CUBpN/kPbBGUZvkZ 70vm0seW7y0t2iGrX6bIiyaF6PAdc95C1KfzD6iWURLX460V88CY+AbJNiqgwLi+C1QN g35A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=c59j362HxV4thmjUo0Vin9IV5RE9OUblH3IqVCwcg6zvy5k4xtgzliZ+lHF09FvkN9 ve8mCYr15eNTmJxhEzqwluGnKG9w0kfQK6ByGgoQ958QYns7daTgyaEeYgbS3bkq3JYW 1DwVlIVxTDMgJardFHyMwpGpgYsCoo5vKDAtamSNSqHvpEoKXTeMZyAY4ZRwmbuZPBqa 2V2NM8MjbCt9CoKghbRKncmz+chS4SrzudzKQixcrK1l3BpdplehOr+wPQp0U+P4Wy+0 T2puK7Y4tYVm5zjvlOANqqP/CFsvFVPYty+WpMCMjnSrykZpQIQLIhLra69XiWjMK4lf z85Q== X-Gm-Message-State: AOAM530VXS4bkbLqkYfEYTPS3zkfl2S9qFCeBbosF4Tx6y50r09SQaIL cxZZUPm5jWL5PO54p5hsN8kxDsQh2sK5sA== X-Received: by 2002:a1c:f613:: with SMTP id w19mr20948447wmc.141.1625584019895; Tue, 06 Jul 2021 08:06:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m18sm15728514wmq.45.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 60A271FFAB; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 23/39] tests/docker: expand opensuse-leap package list Date: Tue, 6 Jul 2021 15:58:01 +0100 Message-Id: <20210706145817.24109-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This is the fully expanded list of build pre-requisites QEMU can conceivably use in any scenario. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-16-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/opensuse-leap.docker | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/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 # 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=/usr/bin/python3.6 From patchwork Tue Jul 6 14:58:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470484 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5113500jao; Tue, 6 Jul 2021 08:35:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSe95mNXIQ2LOoRi0FPBJBQYE2TPL6eZZoVC9qL8Fmc0Oz+wbtcxNdsib7hPXaxltxvbio X-Received: by 2002:a17:907:2089:: with SMTP id pv9mr18934243ejb.246.1625585735891; Tue, 06 Jul 2021 08:35:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585735; cv=none; d=google.com; s=arc-20160816; b=Ie8rs9QJuBNRybanGwVmEAYqPJwqkR8ebO6HlnNdtpi9UwhMcR6HqfspS+qcxQQSh5 y8DK7OGYvCLQ/yvHVRY4blb24f1n5OwCIwBjogi6mxLLpclil5kRBtBlBSdyMOAbdLL+ jTYfa8MsJ/8vp3aSUxDY12XaKn+o4B9Y+/rD2HnMEzXk19izYD4Hk6QKGhmZXmAEoern cd7fzAUl3cI80sLV6vz8Gsglj64UYpodajeLn1RGCz1GtCNiCQb2pnoDBhQX5N0092pP AkV5pfOGxoyDKfHe1H6Cg6exis6vNxMA/V+sTdRoobgoOa32r8cw3s4IeImmTYYK/EQf iiKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=oWiGQ2s45prs4TtmDubqKULDTLLtpZZP9U0iq33vlxtNYMpoqcnkfq42YznE3+o0s2 JucTlOK5l23rZxZOvn15SdRLvG7098CoLco6MdXLeid3qp7HklONlU7qmhwZKO2HIpW0 TFqUwnKgnfNNotwTjCIut7NV5pdr2Z7d0BA/48ljREmHczRFycfNrrAdyoKzS8D0IFKc Yx7f4VFm8ytE3Ih2mGMlMXmjCZutBoPbo80ZTbfvRFKjk8PJ8t1SXT+Xqov0eQOSI6LZ iX4JjTkO3EN9dYU9rZiGZNYpKHStVy5O+9Knvk1sg4Z6O1z/UQCOpFgWScKZDoUYy2D6 MmTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gARORN8A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i13si11622129edc.466.2021.07.06.08.35.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:35:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gARORN8A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n6k-0007Bf-Uu for patch@linaro.org; Tue, 06 Jul 2021 11:35:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moo-0002Mb-S9 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:03 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mom-0004qO-0M for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:02 -0400 Received: by mail-wm1-x32a.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so2019291wmb.3 for ; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=gARORN8AFiQ86ohPNMOAfzjb3+YsOohcxtV7DiiLwrSV9fwK983DoztMHlsXbg3+dW n4KItquriE+W7j8WfzYkfQV3Hy5srpZdD1jNksTsoE2laiq+ndKU0mScdevwXCYWyUrl JkwBWe0fj7IIWE3IAQX+P6bj3E0fAPGDz3ze7l1ET5YduPa/mmzzi9N1V1/P7b4/D1cP QHavbaqJ8NfdbTmWf+l6MLIgMiPBsfgJhAZQHi6nhfR8Iyp0/QFg2fHjIWYZmWUHwp9M Nn8Bwen6rD4vMKWNw8rTFBv/UalQGIxrbdTdFOx3taVVdD6Yw8VOIlYBaSBqhcRppBpV HT5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=Cfk7G+zNJeisM6G573XMbD/DlLN3FDfti0JSWnGkst+sgrbWFSX/LQf/Th+2klldt2 wsb4Wj/8GcIAleYBoWjYw3u8QBgUjE59dlLdsk9RbaOBih/9UpwUZmOMu6JtJ7r0OOKr fCGJmrAKbAWmGpfblYzmxRtJ2Md1LHTANlQYsE0pWtc+TbEpBG/bf7s5eK+pEYVRsJdi c7EqKEdA/Fy+A6IMEvNJ56BnGg3HMF4nJSSJKlTM3Q+xm6aijpMoxdw8JitJFQ8qltw8 /w5pNkb0alHdCsdWxQZpUazALj5KQTEL0H+YdiRdQOi68bMlGAvcKzvSR6lb3OU1Crt6 bGPg== X-Gm-Message-State: AOAM533Tz4QxrVyGtqvYRZIQ0ef2/cHuhYhFyxliOckmdx4rtLWX8WOE b7cQ9CQPoEEfyLLZ7L/LUoJjfg== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr21156737wmh.104.1625584617557; Tue, 06 Jul 2021 08:16:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r16sm20301818wrx.63.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 759DE1FFAC; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 24/39] tests/vm: update NetBSD to 9.2 Date: Tue, 6 Jul 2021 15:58:02 +0100 Message-Id: <20210706145817.24109-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Kamil Rytarowski , Reinoud Zandijk , Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Ryo ONODERA , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net, Brad Smith Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Brad Smith tests/vm: update NetBSD to 9.2 Signed-off-by: Brad Smith Message-Id: Tested-by: Gerd Hoffmann Reviewed-by: Wainer dos Santos Moschetta Acked-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/vm/netbsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 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 = "netbsd" arch = "x86_64" - link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.1/images/NetBSD-9.1-amd64.iso" - csum = "65bddc95945991c3b2021f9c8ded7f34c25f0a7611b7aa15a15fe23399e902307e926ae97fcd01dc1662ac67b5f6e4be643c6a2b581692ddcb616d30125066f9" + link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/images/NetBSD-9.2-amd64.iso" + csum = "5ee0ea101f73386b9b424f5d1041e371db3c42fdd6f4e4518dc79c4a08f31d43091ebe93425c9f0dcaaed2b51131836fe6774f33f89030b58d64709b35fda72f" size = "20G" pkgs = [ # tools From patchwork Tue Jul 6 14:58:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470476 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5205625ejx; Tue, 6 Jul 2021 08:24:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDb9e1fTumHUNm9hNQDVD1u480WsGR5St5+xdAUzOHhERTrUH2E1fK7Mbd6STl2dC2VVMJ X-Received: by 2002:a17:907:2cc7:: with SMTP id hg7mr19250216ejc.214.1625585094729; Tue, 06 Jul 2021 08:24:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585094; cv=none; d=google.com; s=arc-20160816; b=Xa7z33EpjMHD27iEFh7vzX0kinm+Hf6klCOZHLI9VwIBIAvoUSZQk5nf4o1mCny744 gvQbb8lIqEhUuIGG7pE8FHUFiSGmW2E5WIPBk+t2qVIbZjyLx3eqB9dfYHz+0LY5J5/U RrgGlZ79KTYYq5QFP6Mkdd1EHEoVBhRNgY7Tmi5vLMNhRwdsgAsIF0roFgARn4lX22DY RkwxjtJBCKa1UUJDkHeWzDN+XWdMPcZE1zq6nvHDLeMWQPuwmcFtupyepuWuYQvrz16L hv0uNYWPBZg05Bm84x0O2x8CQ0Vzi3WOHGM4J4IANZRu0Jk245+VwbApFr+WoKk/O2Q1 pERg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DPKLxk04De7Sb5Hr8SfgY3P9LZx+smJYFH9/zYZ+ZF0=; b=zi0N26KHKiDzDpogAeFCRWfMwSil/OjU4D4MOrskW0/Oz3YV8HXH9djIIOY4kXl3Kx brsA+GXUfL50rWewHDoQhLS/TnYDBsBi66b/2Zjb/Hmnjfv1pSBW/mpDwW5ssLZB7KuU PbU5/YgP0it7T3wKSLvohBJled0ulLab+eDRFRIwA1xWIOh/fyakLJgz9SCQdfueuf5B NhbjglYJk+qzhxfYL9Yroqiwf1+l2McFpU+3I7hGT2IETHSZTRaGawIHYv9mElvtheyf m7810CA7D+MCNy5MC6rHxwH4FivBk3/aDQflZq2KwZXVYQ1TGGYZNHxVNEHzEzZ1cYp+ vpFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Lqbh9cyB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c12si5531571edy.159.2021.07.06.08.24.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:24:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Lqbh9cyB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mwP-0002Sp-UP for patch@linaro.org; Tue, 06 Jul 2021 11:24:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moz-0002Q4-OK for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:45662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mor-0004u0-I2 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:13 -0400 Received: by mail-wm1-x330.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso2505814wmj.4 for ; Tue, 06 Jul 2021 08:17:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DPKLxk04De7Sb5Hr8SfgY3P9LZx+smJYFH9/zYZ+ZF0=; b=Lqbh9cyB4tKdGWFGvfgio/p++gXxhtFWWILhc8OpdFWEOS+sPDJCFJVRIgcVUsJYLq hftQgdGAIx4knV4rfYVhzyPcbWxJotxS7BqNpYAUB+acLMIQePh1uxhyHByrk3MiVN2D 1UJN+780whMtwbtMXZ+FJmicmc3jIrQBvTH3E1bu3cZBVjnw6OuPo0cnR6EBmhdI+1b1 CUrAsK/7bVRz0j1+3YsLRGgPJmCuoA9xmuiUg3NbCQw0T+VtbJmDfBDnsLKSk3n6QsIY ruJgntVJ48lvFp436SjkqN+4whB08w5/sNFjgJE9jt4LYBhvUUq/qF5qEICik1wJOGOO uOdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DPKLxk04De7Sb5Hr8SfgY3P9LZx+smJYFH9/zYZ+ZF0=; b=LqNn1A+u6kMLyXoG2223EIsItGh0s4IOVkxsnsE0WX3swrpWmBn4OByjFvFWxzTzqG tkE8zjkYVYLNFllmbhuevtzGGqivfOQuNYBzLJzbeUxyQrcOSgHu7Jqqj8wuGkmfXC3i hDTXqa7RY0vLl8k6yvemKdCP90iw3lp2xCEmLNwyMIrrt6TTQXOuK1V5LpCpwKk0ShKz HG4e5VYYPXpWzBXUPHu1mjo7iLSI8HOX+cScP3hDPUKCVcAYtlwjNgOJ+jlhiaZE4FA7 5kWjbTfg8EQrnlLnrLcoGosZjTi2Ye58+ORAteoZtQ9TDl2aesf/b9wSAWXs1Sa5btHe Mnuw== X-Gm-Message-State: AOAM532PJ60jxRkn5I8pUdHZ5ivRXWSU8k+v7uV5VwuNdx+5WxYmfEs/ T0JuCKrYHz/OBpgyOcBdxxYtmg== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr1397435wmb.27.1625584624221; Tue, 06 Jul 2021 08:17:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l7sm16412461wry.0.2021.07.06.08.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8D9521FFAE; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 25/39] tests/vm: update openbsd to release 6.9 Date: Tue, 6 Jul 2021 15:58:03 +0100 Message-Id: <20210706145817.24109-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net, Brad Smith Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Brad Smith tests/vm: update openbsd to release 6.9 Signed-off-by: Brad Smith Tested-by: Gerd Hoffmann Acked-by: Philippe Mathieu-Daudé Message-Id: Signed-off-by: Alex Bennée --- tests/vm/openbsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 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 = "openbsd" arch = "x86_64" - link = "https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/install68.iso" - csum = "47e291fcc2d0c1a8ae0b66329f040b33af755b6adbd21739e20bb5ad56f62b6c" + link = "https://cdn.openbsd.org/pub/OpenBSD/6.9/amd64/install69.iso" + csum = "140d26548aec680e34bb5f82295414228e7f61e4f5e7951af066014fda2d6e43" size = "20G" pkgs = [ # tools From patchwork Tue Jul 6 14:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470482 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5211505ejx; Tue, 6 Jul 2021 08:31:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtoV5+hdHL+9wRigh79hWhMj6WzENpc0CBoTD6Um4eYZUPzAcs8ulNuS2VRiT/CxZRJuxX X-Received: by 2002:a05:6402:4393:: with SMTP id o19mr23647121edc.263.1625585513212; Tue, 06 Jul 2021 08:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585513; cv=none; d=google.com; s=arc-20160816; b=sxSBGm8p0uGYBDPPrJafLffulXHaVi7Nz7eTDDUla6EwBId0wYr2BHRcceRnooP5wo dQTcDs5s5AyFZx6A525DhwrtQVJH26pXsugfhD6j6RLrChT7FkiJh4KnA5rI+dLdRkmU ZMnj2bIYqVj3rAF+WFmOkphYsDp7HN6L2Fwbgzzwr4URt4pfKr4PLZVLRGn1sR/8Hz2v EZoDyUMfkKGkmIV86T1pWkqX8p5uopaTFvpxkUfMtkVPNn8zZAeQo8Y1kF1d7Ln4TobE l//rR6QloqBSddRpdhC+ghDiV5VaNznE/U4H9SBmylONC0Gx4Jru6hBLHh/VXElYigH1 IceA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=MBMtJbTz4yMVzFlz00RkMvRLhdNpGH/CPgcaTbJQVXx8ozEQtrXJhuGpqdCiE++YRK pM+rOpywHxXw7IOdzaitJvKOTN9G/3nSMnKPTC2mjzgmoGFCu+9jflZsKV10d8uXlVEk RE1Zc1DjsSAmFmjS4YQAGTM25LGvVY+NMxRioaA84jaQx9rr3q6Bl9ZnRQ7o151+PgEE CeNNQCsuY8VbIuLkOWxGHNXRXWs7ffHKL/CbZsN2mudp410Fs4nWtkjhOey4x0Tu7zzj LxLBTrrDa8XMTR3AS6MH/uvNT2SKItIY3yKeU1fefbe9yhwY2gV6MuK2MvwDMC2HtiUr 9mCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MfgABMvm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y19si4248454edd.281.2021.07.06.08.31.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MfgABMvm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n3A-0007xT-Ah for patch@linaro.org; Tue, 06 Jul 2021 11:31:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfI-0005Nn-2H for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfF-0007A0-HR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:11 -0400 Received: by mail-wr1-x430.google.com with SMTP id d2so2833216wrn.0 for ; Tue, 06 Jul 2021 08:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=MfgABMvmaqVxUuAF5tu39k+ZssGDi6H6fx9AaroqhAVkUkJM8lPHiAsGxEIFE4X3hZ df9XOCFqPs0OHnJQ9mWTMEAXT86Yv1I+Z9/pLlbdELNbQFcwBORF2/C4fnyB1e1xteWw SSc8GARJ3L6E0+XxmCFyhX6eg4dJ5ttaSi7OyNDv9Ue124gHUgAoL9cJU3ZhTx1lyD9+ 1/x0QlQNwuFbZOoVqmN6P1Gqu4E4h3R2ctKulnWtgzkEkFSrJGft49VP1+rt/XqjmmcO 0ZM27RVNNCHeUEh+EoAl3+N6BG3ArTGwtrV5WnSjxH1A9G79OhP2c1BrYqB4mZRhUkxh dckw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=CkZEPZupzSa+xrNohpd6SU/5SENxvY/8CG3r+GAJKi9lBN+ybG92A6o53MJETluiLo gvaPQCiYQWQX0cASsbaadcoHm1QRuGchA2/MZ01C8c9F8qh+vufqAbxsLUpZU7ebRRla oUrzVNx4LCvV9/oL4BUe6q24f0YBAKGYJilxAoWTkhN+XwWwCEhhZphCTKDyu3NMR+eT ENw4nKkfMezvkgmrfdL8Y6ogEhRwtGAGNdwqkc8Y24knu0z+sihNPXg0c2jdeb76AKqy joLjRku1JQjXAqxZFEX5eqRTuNQWf9jKIipN4EMwLoN1brugsOutlCJ62ubVH2TJbLMo 06tg== X-Gm-Message-State: AOAM533INq+/2wUKKHpILdj0bRGKR6JrJpxmpoK6hHLJF65vjPhR/jR6 mUw4ZOCExw/YSmC+quKQnGIQ0o5DI/j3FA== X-Received: by 2002:adf:f710:: with SMTP id r16mr20807316wrp.124.1625584027743; Tue, 06 Jul 2021 08:07:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm1539983wru.6.2021.07.06.08.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A30A61FFAF; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 26/39] tests/tcg: make test-mmap a little less aggressive Date: Tue, 6 Jul 2021 15:58:04 +0100 Message-Id: <20210706145817.24109-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The check_aligned_anonymous_unfixed_mmaps and check_aligned_anonymous_unfixed_colliding_mmaps do a lot of mmap's and copying of data. This is especially unfriendly to targets like hexagon which have quite large pages and need to do sanity checks on each memory access. Signed-off-by: Alex Bennée --- tests/tcg/multiarch/test-mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c index 11d0e777b1..b77deee37e 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -58,12 +58,12 @@ void check_aligned_anonymous_unfixed_mmaps(void) int i; fprintf(stdout, "%s", __func__); - for (i = 0; i < 0x1fff; i++) + for (i = 0; i < 0x1ff; i++) { size_t len; len = pagesize + (pagesize * i & 7); - p1 = mmap(NULL, len, PROT_READ, + p1 = mmap(NULL, len, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); p2 = mmap(NULL, len, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); @@ -142,7 +142,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void) int i; fprintf(stdout, "%s", __func__); - for (i = 0; i < 0x2fff; i++) + for (i = 0; i < 0x2ff; i++) { int nlen; p1 = mmap(NULL, pagesize, PROT_READ, From patchwork Tue Jul 6 14:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470480 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5208253ejx; Tue, 6 Jul 2021 08:28:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYUtW2hab0XX0FsxgC1V6EnQZvJhcRUcaJ0d2KUPUDuDbPEybMnozTfdRd7WvpvMf8mpwt X-Received: by 2002:a17:907:724c:: with SMTP id ds12mr17066558ejc.125.1625585283517; Tue, 06 Jul 2021 08:28:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585283; cv=none; d=google.com; s=arc-20160816; b=i22yZ1+CUjKAXawwfx8PQMT/nkodcrqRHWW3ZzmKan9iYaoI016eOYfEjZUyGV5c5f 31/AERRmECwncJU6zBAUkj2JVgPHPP3SQuFtylt287eObhJGbAGvby48c3pWpuYZvyhc xaEqzVg1wINtRhFgzsSqTZ3qCudd8HyqkAV0BBGbfrf4Z4NDZ5cbTJTCYJjRi/m5yg4j ohcmfHOAa7uOMBJtQPwcdstmQymlNjfUDFcTX9dWXmGZb9qOL9mazFWUsr3wPnWJpdlD 7lunuRsb2iTMhXVngo/dvMH/JJ0mnixlb8d/YbTR78UAii5bSFR0fl31DuEkQ4aOHR45 5LSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=2VymeSF+HdKxVWyy9+ZA+5+qTRIVWKC1/sXMZ3ShAgc=; b=q+uqiI9ifu2uEpKpwtnuXOn/3RkZYg83x4XjY3+j93FARXvkg00ZsPz8r9Ajm/9roT O/I4PuuAdc4sMJwt09EnpL4F5yV1XzcklR73B9yrcKFhmj0j4SZ6uWWna2CIn8CwOLA+ DjmqSii5UG6ytAhtPX9bTwsr0rkXa4gZXOTbHu8POo5dm/eAip/YFprqv6RrmGZvqpYN Q5X65doL7vdXCdrFAPVwq6P+pB9zUcVspcLLE2zs+Yuh8G9lfIStwMn8BCYFs+rcJLsW uVMTJwcU9ZPB5U9crTfm2Ld/X5XIANEyBsrYzRoX/LNo7tGJodXfRKZxh8UsAq/ZBQR4 6Dbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=inVrLCvZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s18si17079209eji.59.2021.07.06.08.28.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:28:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=inVrLCvZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mzS-0000xa-DI for patch@linaro.org; Tue, 06 Jul 2021 11:28:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfU-0005kJ-Kg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:24 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfO-0007GU-HS for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:24 -0400 Received: by mail-wm1-x329.google.com with SMTP id w13so13807617wmc.3 for ; Tue, 06 Jul 2021 08:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2VymeSF+HdKxVWyy9+ZA+5+qTRIVWKC1/sXMZ3ShAgc=; b=inVrLCvZ3um+Z2JhemhX7Y8shk+Q07CoD/IXnPguGjLTHHS1+UktHhmrfEZv0Ai1f/ 6twbYCFI3tes/EdKfUTfl1TKHfv+8i51tcZA/eUh7NG0jrg6EC5dpGILTdpNtapG2nRV p5/lvk8FghHdeP2HSAQ7EI9WhHAqsbkhqO5ItQp9dv4rSYtalxA+nB9SA18UzWQJHSKu PDizFgag5szAbPrdpooEpY9FfE5Hj1XSxVYn7gvZ8WN+coVdsWgPd+Qxj5vJzJb1hEVP RM+bJrcFkkpdIcmWE2SO/j87ZxenEyURwVCp/EblbtWA2koDJSoCPKltoZiG2qE5hmQ8 czyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2VymeSF+HdKxVWyy9+ZA+5+qTRIVWKC1/sXMZ3ShAgc=; b=gO9ltncqLK6+nWueUDpuq9W9nGrxRiEjI5Kd1GCKaDCzuFowqLdY14Pp4e6UdP7U8U 5EVFZG3f3qG9kZumYUuALRTSGgKo1Ei/CzL/EUjY3SSY3cb2wT9EIIZ+GqHOAD0mWV8o aD2qaQS+Zis1u6BwWWOb7OUzjdZtCVD54n5GWGw9alODoR0ISgWJ9CGPg66aBJ8O37Bj 6eVTJr85kNGBwGm/+HqI5nHQXVG320il60bYUcie3uvaWjCU8FSPQy51i76S5kQOZLef nYsTLkhGaolPmFn73/fkWqXI3hFZE1h36UZQRj8RIULk7I+juxuNIQW7oAl1kCGsm3DK Kc6Q== X-Gm-Message-State: AOAM532HHzp3oRR+fgHlLzmV2qHPC/tCwa6AGroJNiKWmK2+V+57X5Ug g4yeD0aj4ysiCwiDGgwGXMLDFQ== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr1276378wmq.181.1625584036751; Tue, 06 Jul 2021 08:07:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm16160991wmq.3.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BD5A01FFB1; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Date: Tue, 6 Jul 2021 15:58:05 +0100 Message-Id: <20210706145817.24109-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- include/qemu/plugin-memory.h | 2 +- accel/tcg/cputlb.c | 2 +- plugins/api.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 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 addr, int mmu_idx, data->v.io.offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr; } else { data->is_io = false; - data->v.ram.hostaddr = addr + tlbe->addend; + data->v.ram.hostaddr = (void *)((uintptr_t)addr + tlbe->addend); } 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 qemu_plugin_hwaddr *haddr) if (!haddr->is_io) { RAMBlock *block; ram_addr_t offset; - void *hostaddr = (void *) haddr->v.ram.hostaddr; + void *hostaddr = haddr->v.ram.hostaddr; block = qemu_ram_block_from_host(hostaddr, false, &offset); if (!block) { - error_report("Bad ram pointer %"PRIx64"", haddr->v.ram.hostaddr); + error_report("Bad host ram pointer %p", haddr->v.ram.hostaddr); abort(); } From patchwork Tue Jul 6 14:58:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470471 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5202185ejx; Tue, 6 Jul 2021 08:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRYeFTPsL1HCx31EcER6VF6JhObaxYxPF7Wuni7BwPCI1pHjvbgPtJgg5M68mi9FWeY4DC X-Received: by 2002:a17:907:868b:: with SMTP id qa11mr19421892ejc.338.1625584844194; Tue, 06 Jul 2021 08:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584844; cv=none; d=google.com; s=arc-20160816; b=BYc8UH4fu/bCcfvHZasIScZjso7sXSHmG8huhZAMuZ8iom03fvbaDghLZv1J31CQPT r0Z2VFN7ytJDf5TQNx4QreLDlbgO8tvIHfuH5JHXDE6NS17Y7X8ouA3uhh4llhc2TYg/ GLozjsSrbXanp9JRucmB1gIy/lHvCcUtJAK8WAjosbUbl1PgXoMb3Yheiosf30J/xpYn A1upwE+kbCON/OgpXzVMSP339DaSPaHJPB3tvZe3ReNpj3Qi2Au52lyCelFwb+RL+nSY oV5ziMaObLH/qmqPC9yyxtCXB7WMWDWfyRN9FI9UQY7eho3BWjAa6RCPC+6Zb69F/JEE R5oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xE0TnieLHvCOXePCMLwmdgueEmPs2D/V6rLGpH6wEAg=; b=aGKgJzN66oG+riTJr/8eGvkUWKj2Re56O1hFme1FiWRq+GWceLSL1x8TtI3UaNBjO7 oW7cvx0SuK3Nr5EI1JA0mbOkVaLBbgsJS+sxgXz7PyS0oLPWsJ/ZUBWg0/7kVVE4Ur1X tIlnZqtGIPdJuf+SGQW8rOVeJFgvwc9GKtB41KtuUieMdrz28fdgJaoVQBsXynstw59+ y3KBh19YHqj6m56DHysXms4VEP8P/UqRiXMILy3x8bvWpAqCtg0aiQulRChKq6ltCmo/ kOhPVSomYFLiNjxZo3876s5l9EPjZzlmrH7f1UUQm5Ia+lQ1sIB+aNsXodOtiSTiyMpl e+8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ya+TBbNb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w9si15763611edx.331.2021.07.06.08.20.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:20:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ya+TBbNb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0msN-00088P-7X for patch@linaro.org; Tue, 06 Jul 2021 11:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfE-0005HR-03 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:08 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfC-00077j-0h for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id f17so1875580wrt.6 for ; Tue, 06 Jul 2021 08:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xE0TnieLHvCOXePCMLwmdgueEmPs2D/V6rLGpH6wEAg=; b=ya+TBbNbb8CqVpGPyP0rhz/m/cYtPoevzikVbePStoKnagVdAJNopA4ZICqTRfIpt3 xDep0Bx0kTpNVbZRlTuMdQANpG/iakrjtc+U0xZvJukf4LTh+lGmFTCnnanbc717i0KF twtJiqHHxyROlF8h+fl/FVRqZ9jj9W6FYxQ+PSdA9OD0mhBaVNLbyOWuWwkMIVHiLJCi Aj33W6XajAaNWSYWTPj58z0/piwHW4/cT/ZtGHiFkt0jAC2KtlwPKwy1RRBe+3yg/Q4G XfNu4NsEfMChPomCPwZB3tCcK5A+lJVI6v+tHhkxBwjDoAG9xh1Cut3arVWLIxXrsSFG 0FCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xE0TnieLHvCOXePCMLwmdgueEmPs2D/V6rLGpH6wEAg=; b=EWy2vID/FQHPQVSglKASeinQpWb1EZqOkMEknrlXFgjM+ZL4MMT00ED7BqSJy49xOe fqEtTJRs4l9QVsIe/b5EokWo7hnXwFeNvmLcAkN5uoLduygvaEAivFyV9g1JLWA4CU2t T3lmpEJv2LrkEsepoT8MS1LxD0AKQJ95i3H+tesz7kUmrzRzqxi72deDCo7hpy82TPqG pOWlbSykC2Gct4c00BDUs7JjQSITxHgw0eftAIat2WYYAfr1QjG22qCXlfpjyO43Qlr8 tpYvkdQHBjBQF3bgWXWsK1GFuP2x+XDIB7/gtKzw4ltlHaestNdoR2aSF3IbSS4Q4frC VT7w== X-Gm-Message-State: AOAM532gaYZzkHjIBFWgRLJuPAU+CLO3OEdCM/eieBSOT/gDReHDQGVe 5AqrtoLH6qMO6qZLB1yi09cgZQ== X-Received: by 2002:a5d:5043:: with SMTP id h3mr22431888wrt.333.1625584024623; Tue, 06 Jul 2021 08:07:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s7sm17518597wrp.97.2021.07.06.08.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D40931FFB3; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 28/39] meson.build: move TCG plugin summary output Date: Tue, 6 Jul 2021 15:58:06 +0100 Message-Id: <20210706145817.24109-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Let's put it with the rest of the TCG related output with the accelerator. Signed-off-by: Alex Bennée --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/meson.build b/meson.build index 2748721d71..9b5d53b6d0 100644 --- a/meson.build +++ b/meson.build @@ -2737,7 +2737,6 @@ summary_info += {'module support': config_host.has_key('CONFIG_MODULES')} if config_host.has_key('CONFIG_MODULES') summary_info += {'alternative module path': config_host.has_key('CONFIG_MODULE_UPGRADES')} endif -summary_info += {'plugin support': config_host.has_key('CONFIG_PLUGIN')} summary_info += {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} if have_system summary_info += {'Audio drivers': config_host['CONFIG_AUDIO_DRIVERS']} @@ -2853,6 +2852,7 @@ if config_all.has_key('CONFIG_TCG') else summary_info += {'TCG backend': 'native (@0@)'.format(cpu)} endif + summary_info += {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')} summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')} endif summary_info += {'target list': ' '.join(target_dirs)} From patchwork Tue Jul 6 14:58:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470486 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5114549jao; Tue, 6 Jul 2021 08:36:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWwT81Nbs0DqgNKocq9jJuI/L5UDqlAyl7Gp4kXMMqv+tW2LatUn/DNGkY7vGhWkz7AiFG X-Received: by 2002:aa7:d283:: with SMTP id w3mr8004416edq.153.1625585814739; Tue, 06 Jul 2021 08:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585814; cv=none; d=google.com; s=arc-20160816; b=qB7dFHbY59W6EhuD0AbW43YKb85EPIy6o7yzan9BUqEJUQ3qrd9QjGthRlKFQkIWNm Su7szpMsDMciyx7MEL+v1g0KQ7CwFbGzrOwe7ssh2ZoZMRFRO2owuKtSK3aYQl3/6giO qd0r85QwjdyJCehoBrltasLXdLvMO4fUV31TCAPV3NZ9NNwaA+nsD4v/c3ZzY8pPMzyO RtyYXuatjtmAIhAnvyRmpe22C+mjbdUv25S/8mKHlGCo/T1K7FPJtU3qi/IKYIc6hzpW V6i4bS/R2C6SsdDB2SabqBXtg9DGP39MmPAwqU6aqdVP3Z5ol8y6ANBfOAzIxCjFLRrK bA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ENyXaMzzV2Ct/ffxbfGuryIh/2WlVNyrhj+GTD00beA=; b=geyVQ+N+yCHDIVzHd3eGSumSht+uoYvvEvlrLswk5EARQANMjtdXy7hqqWQgpwXJv1 av1/6pqWkXj373GGs7afdTh9osGRkCFDUCYM+/kCqxfUe1Kq4gOCbLLm3YuV2HCJVSS9 kGEvosaCsph1vMrbNsi6VHqWK2yAVsia394pIhGYfb/fdl64LE55uIaDSIaAwbYR8SVf TywrV/kWyGbdU52NJfTAWXoWj+u3jzcoUneNJ4uPlUS6+9NBSdKVThNyH/JOLx5GccF8 9utd1uMqbj9KzvrWUbznAJO7Po1Aw83iHOaXLSSfG8OQ023R48U1vM1GBkVzfvGRdmo8 kk2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KxJKHU/f"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w10si17130199ejv.170.2021.07.06.08.36.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:36:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KxJKHU/f"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n81-0002TE-P2 for patch@linaro.org; Tue, 06 Jul 2021 11:36:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mox-0002Of-E4 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:13 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:52008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mon-0004qv-Nw for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:07 -0400 Received: by mail-wm1-x329.google.com with SMTP id n33so6339185wms.1 for ; Tue, 06 Jul 2021 08:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ENyXaMzzV2Ct/ffxbfGuryIh/2WlVNyrhj+GTD00beA=; b=KxJKHU/f7yEJwpqEW449SsFDo6m7RjtifVdsVK9VJao7cQqdlB/tDotiUqtYKrIQeR O2VORTWBkmeBh+RIEK7KupT06DSA4qDv2eu7ma4LizEbOIYFtZcAr2VEjOisfPQMkJWj 040KqwNB1gLs1p2oZ9gdGx+gNa6BM8GAn5ZJ+wjBh+zF86/z6iWAERMQde/BbgWUvrRh nR7VO3cYIs+YqPuKZybk0YZy/x+cpCvbcHDZJ6lX4R971twfrBZvH+lithkl61rtRT2B 9Pe2urmdDU1QWDJq968ob8Zk1L0z1EpY0YEk5TScwiJn84iq/pxtS9lCcd+YnHQT2FhS zriQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ENyXaMzzV2Ct/ffxbfGuryIh/2WlVNyrhj+GTD00beA=; b=ApcehMCe+qF1Q7jhg/Hl4UPBhS+wXzhSRxFalMxx7+Lgp9WH/gBfcVU6e/Bus5w0av ImMqat78B6nDy+GuDxqTE6rVbsIennVSvuzyN+aqnIRg31LeI6BbgqdaLjR5bovXwYTE jyN5owU19DMbEZ2dgyWiUPCMIcnwqnDjkafDiSV7o1usHFhT5OhU1RwMxgRFoCuncBUT ZcMvNCiOmLxFhiAdc7jSR3Jzp1AJUApNepmeMU4T78CSPKEMRWkdqEAACku1MYuUmYaK sgjowgk77Nr/HCmZKrCIWTvPLQ8xMNO/ICDrKtzGNZjmSpMGFJ0f4b7mp5Z/AwgpTWQp L2Ng== X-Gm-Message-State: AOAM531U/MjHlw6TdWxSlQJepb6ilooZCdD9fPe46Twan8xuY13vlAl6 vvG3ODyKvAxYwZguni2to1H6kg== X-Received: by 2002:a1c:38c7:: with SMTP id f190mr21476013wma.30.1625584619967; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm3431687wmq.1.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B161FFB4; Tue, 6 Jul 2021 15:58:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build Date: Tue, 6 Jul 2021 15:58:07 +0100 Message-Id: <20210706145817.24109-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/configure b/configure index 650d9c0735..44a487e090 100755 --- a/configure +++ b/configure @@ -1098,6 +1098,7 @@ for opt do --enable-cap-ng) cap_ng="enabled" ;; --disable-tcg) tcg="disabled" + plugins="no" ;; --enable-tcg) tcg="enabled" ;; @@ -1509,7 +1510,11 @@ for opt do ;; --disable-xkbcommon) xkbcommon="disabled" ;; - --enable-plugins) plugins="yes" + --enable-plugins) if test "$tcg" = "enabled"; then + plugins="yes" + else + error_exit "Can't enable plugins on non-TCG builds" + fi ;; --disable-plugins) plugins="no" ;; From patchwork Tue Jul 6 14:58:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470469 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5200026ejx; Tue, 6 Jul 2021 08:18:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNO4pN+xQOjnkD2gtI2foXgZfnXgif/4m+Fsjq4Xq7YQkEkbo44pkPdap7P4aFrFuLzqoF X-Received: by 2002:a05:6402:40c2:: with SMTP id z2mr23396085edb.134.1625584696226; Tue, 06 Jul 2021 08:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584696; cv=none; d=google.com; s=arc-20160816; b=nrKV8rB1hgeKSIHTgyCFRUcOo0LH1FCYQUqKxEGV8oZCxh0w3qajWl0CAS+9U/JF3r SSL4CJjbhbROnasiTaZWvbfdWzRrtLP+YrBOUpIfCAUl+CJFgdBtbM3tHPodUW3KlHgM zvFZSsv/9zASz+cI3A1TzWuObDGw2qeL9ioGii8dxBgXdfjR1k6OwuDzHPrUx3UeFxLE CZz4Ce3tCA8i/oTJdPFuFSnn7SUwzCLOOg7EKHQfa9A53dhU9EAaWu1owpteEphUhC9o 3ks3kwc+SZJ3iljYPL4eoyfCfBslpdn2gGyjudSVzUN+rdd00WH5PEMVPvzhi3MncIxr kxpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8aMzBTIJfLBRFTgmCGKFYY8ArIkOG6uB9avvuOEJOSo=; b=Wfyka1bxNXOHKthE9EA1tYCqxETGpZlIhtGupG79XyJJJNHsgD6w89qw2o66yfwkNw cKuBrx3HeIReDqTIAf6hwhiOM0WKGPNERY4C/OP+xL8ISWaf/5SJmlp7MT4uuH27aknu glaM2QFLRUfF4PKMro1QuRMC7u9g0juEpomUZoNMEAzqvIpgeCOQnsBaUjEqHZQF/QG+ scdjBWHrgP9e7dYEtYNej2d7gkg3b1AdTgUq3/JwEMlnRKjL4qkFfffA0cMIKJlRbrUU fRvhpX+dzn331u8gZdAG26wIj2BINNAjCTfWGmegbdMY8LiBpZ0SQjy6AfliTXI4M5u6 TXmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rQ/Yoxri"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p20si6964124ejn.748.2021.07.06.08.18.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:18:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rQ/Yoxri"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mpz-0002yD-Bw for patch@linaro.org; Tue, 06 Jul 2021 11:18:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfI-0005P7-MR for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfH-0007AS-0P for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:12 -0400 Received: by mail-wr1-x435.google.com with SMTP id a8so14776817wrp.5 for ; Tue, 06 Jul 2021 08:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8aMzBTIJfLBRFTgmCGKFYY8ArIkOG6uB9avvuOEJOSo=; b=rQ/YoxriyBreQNX3veqZwrn2xRkhc/VGvj9D60JLPeuVWhv209UF1zV1gm8LaTYq1V mz8D6kBGlscnIZ6bSMTOq7RoZsgn+Q/XVMx6jaRvCVuYrKESCd8jhLlqgaagNURZF55z 5ocA8X5obtNZTFcXfMK/5mKCo3+VbeHgNCOOoIN7/e9pKuG1ormKoGNcCuNhfH5vv7yo JKg0pvfdbPQbTKYc/cKlDwBSTjbKFK1Fe3JA4wTnepsfFOGQbdIni84sItx4BduhRb+g BgRZ7s9V939bjdj/DbKR3lRt/PsmkpT5sAMcCFZ18rP60U6qFFsRimdJknY+tLGaWmrA nDoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8aMzBTIJfLBRFTgmCGKFYY8ArIkOG6uB9avvuOEJOSo=; b=B+MsWc8qrRuTBDvYiaUs2pGKjTkM36Xnobex6GIWgpu6A66DaAx9aDdHNuUJZIzqsK lloyS9DZ4o+GRsHscFxfbWU4LlvvR21ariTpXHY2zMtTnecDhI6Mwa/jbYBuFYiaAZDO 9KoAJesqpNp4tYz6zslbj8fOVD76j/LfF6jgKR7ZxDnyNVE1O5S7X4iGze/O/sWlS+4/ RRENaHowf/t/exIi1aHhBw/2nx6zu4roAwzasFGMBJKRXbvjUw3PLkrJdiOAFEXjCj32 NnaIjMLPV4t8sMIlqHhjVzFPTqHka6aJXV2q4KRii649v8tNrrikhCAPiF3IbtRsaLKb yu5A== X-Gm-Message-State: AOAM533EwebVe2Mhiq379dm7luzVZFpprIPMl3ykEBJpne4GQXooMtP8 Tzolv9+FWCF8O/wDhve1wroCaQ== X-Received: by 2002:adf:f04a:: with SMTP id t10mr22059527wro.318.1625584029671; Tue, 06 Jul 2021 08:07:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b11sm17255710wrf.43.2021.07.06.08.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A10E1FFB5; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now Date: Tue, 6 Jul 2021 15:58:08 +0100 Message-Id: <20210706145817.24109-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, Yonggang Luo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Cc: Yonggang Luo --- configure | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/configure b/configure index 44a487e090..9d72b31a9f 100755 --- a/configure +++ b/configure @@ -707,6 +707,11 @@ MINGW32*) else audio_drv_list="" fi + if "$plugins" = "yes"; then + error_exit "TCG plugins not currently supported on Windows platforms" + else + plugins="no" + fi supported_os="yes" pie="no" ;; From patchwork Tue Jul 6 14:58:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470479 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5208160ejx; Tue, 6 Jul 2021 08:27:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxY45hwtZl75d/Y3HvaZ/mTH2brx2VDjaWOkDdTWMr9KXAFu4M7lR/MyZQj/2MNWOLCQpJc X-Received: by 2002:a05:6402:1488:: with SMTP id e8mr424688edv.341.1625585276130; Tue, 06 Jul 2021 08:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585276; cv=none; d=google.com; s=arc-20160816; b=Kx1zp+5gcVQJkoDSfjPtUpkdnRzQv/572PNDGoTRXMGMZ/USoZSRuHldMTF0q1pmtK M111u1kGZzbejyIjZ76/zCilYZTDOrMoHJ16C9erCRIIhvzeTpwYcGbD4JBItQcQNrmK kXvFxG4ijQ2jXIfxmwep7ShxJEoOuSNeTDGvWF5pWc9odpzIcMn9yiMs3f1/jMMDsfWv ttNKrtu8SPeRWUnprDm4y0Zz+As4Er+4QC3WQReBj5q2Y9HGTHQ88BDvxg80rySE1JGw oIilmxxftPdzfNZCeM8WILa9FcRwFnV7xe3EaC7+hp8VY8Lu/kKOI2uuQsfetQZHlYnb sxFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sGLYNasVaMqPdnpUXMw96sJwNeDV9lGD9J/c+8i/lvM=; b=0DtU09bblvTpIgKvm1i7NaK/N1+mz7qqQYk6FmivaqsYd1tzGLJcm8AtLnK5yIklQ0 Eo6pcyNrnNUIJnOsvh2PN7K0+gUpy+kOrW/DiIqaWkbfqFJlheGBC5Mzu8zVq2A3p9l1 /jVOvrODvAwmCd11XpdKtCeA6wYU2S3vPLgmSDwzMCKJ9Op+KWe/IUTXI15X7a1Nla1r K9L1Szcvog8gbU0aIeWQYcgS/rGvGmvzgz2cuZ2GNmyFjD1/ly5vt7sZ4GHCQUN7Vs1d AQYXXWR2WGZYTy73lRgFmmk6AMWrrUkWFnpJyx3L832H0R5t2gLzTF9xHqsV+2T6jE/l DT1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aYCs0D+o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dp16si16781333ejc.454.2021.07.06.08.27.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:27:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aYCs0D+o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mzK-0007ai-Ti for patch@linaro.org; Tue, 06 Jul 2021 11:27:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0moz-0002Q2-NM for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mor-0004t6-HG for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:11 -0400 Received: by mail-wm1-x32b.google.com with SMTP id w13so13831220wmc.3 for ; Tue, 06 Jul 2021 08:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sGLYNasVaMqPdnpUXMw96sJwNeDV9lGD9J/c+8i/lvM=; b=aYCs0D+oBBMj0j8/7G0G5qv68fZTdXSU6eS/pNh02BhGHQ/7ggCJzZUa6wX6uvim9S Rs65S2QVVheE34DlzFStrmVMC14D93asM/lurYris1tSjbDsY4BowzJAF++VVrzjd3ix AEU3+s6P3hxvXh2ojEhc6sfTevFHl0aRQvx0u5hdTW4a33RS0no8CCVlGbZylsW4F4ym 1CEaEI3fZ4z6uzuRsJDQd8wsE3JLCkFYSPV6KXhBHhRd+bEpitG2+1SXoJugUM5Q7hKD vZo+MA9z6AJNkX5ybCmqJu7Y5aItOnsDbcSN4bK2aPXknM39dlprhaf/ZJYSSr/H8Uc3 4e+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sGLYNasVaMqPdnpUXMw96sJwNeDV9lGD9J/c+8i/lvM=; b=BEUxGjM08OqHfLmuDKFqnUZTumpk0vgIb8RnaipYGt91xl/XDNBJJoRJwZiGeKEg3+ //4S2cs6GOwcIm2DoiSh9IaiWDCQ5pYAyw3mHc24r4XVSYJ8LVI83CUFSRQleOPv5Mxe 0wtjuvI0KJJMU6USe7gqSjnH/AGk5cqZ3qIz+k5GXFhu7OJHTxv5EOd+86lfFb+8WOw4 CF8YsAKiM1biQzPCIi0ixIhx42+gH1NgpSX/zOr3jq8K5sqH32wvbagNiwt0g1q2OkC1 ez+7yst4X1LE+bBcy0Ac1EGFcwpr7M3NLN5zXHk/3cW0O6Oi4vpuxryHUNnjPoracuF1 rueg== X-Gm-Message-State: AOAM533HyX2s5+JqHaTce12ynFUAWu9CRkmqE9FfDeCm60UuoqNotY4D yXchhoByx+vC09UamR44eyV3xg== X-Received: by 2002:a7b:c206:: with SMTP id x6mr1456430wmi.114.1625584623319; Tue, 06 Jul 2021 08:17:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z4sm15802616wmf.9.2021.07.06.08.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 248791FFB7; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds Date: Tue, 6 Jul 2021 15:58:09 +0100 Message-Id: <20210706145817.24109-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Aside from a minor bloat to file size the ability to have TCG plugins has no real impact on performance unless a plugin is actively loaded. Even then the libempty.so plugin shows only a minor degradation in performance caused by the extra book keeping the TCG has to do to keep track of instructions. As it's a useful feature lets just enable it by default and reduce our testing matrix a little. Cc: Paolo Bonzini Signed-off-by: Alex Bennée --- v2 - properly handle plugins being "" - make the test for linker support handle default case - move linker tests to before the glib-modules test --- docs/devel/tcg-plugins.rst | 3 +- configure | 125 ++++++++++++++++++++----------------- .gitlab-ci.d/buildtest.yml | 23 ------- 3 files changed, 71 insertions(+), 80 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth 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 ===== -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:: configure --enable-plugins diff --git a/configure b/configure index 9d72b31a9f..0ce6c1ff65 100755 --- a/configure +++ b/configure @@ -429,7 +429,7 @@ libxml2="auto" debug_mutex="no" libpmem="auto" default_devices="true" -plugins="no" +plugins="$default_feature" fuzzing="no" rng_none="no" secret_keyring="$default_feature" @@ -3085,6 +3085,73 @@ for drv in $audio_drv_list; do esac done +########################################## +# plugin linker support probe + +if test "$plugins" != "no"; then + + ######################################### + # See if --dynamic-list is supported by the linker + + ld_dynamic_list="no" + if test "$static" = "no" ; then + cat > $TMPTXT < $TMPC < +void foo(void); + +void foo(void) +{ + printf("foo\n"); +} + +int main(void) +{ + foo(); + return 0; +} +EOF + + if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then + ld_dynamic_list="yes" + fi + fi + + ######################################### + # See if -exported_symbols_list is supported by the linker + + ld_exported_symbols_list="no" + if test "$static" = "no" ; then + cat > $TMPTXT < $TMPTXT < $TMPC < -void foo(void); - -void foo(void) -{ - printf("foo\n"); -} - -int main(void) -{ - foo(); - return 0; -} -EOF - - if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then - ld_dynamic_list="yes" - fi -fi - -######################################### -# See if -exported_symbols_list is supported by the linker - -ld_exported_symbols_list="no" -if test "$static" = "no" ; then - cat > $TMPTXT < X-Patchwork-Id: 470464 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5093632jao; Tue, 6 Jul 2021 08:12:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8KU61m4P2PkJymMcPyD/F5jLI5zX1ihxqvY7s14S2mUq/jEK8g1e38DwI+hHLHSyRAsKr X-Received: by 2002:adf:fc50:: with SMTP id e16mr3129879wrs.31.1625584361733; Tue, 06 Jul 2021 08:12:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584361; cv=none; d=google.com; s=arc-20160816; b=iYfB9o0tf5xh4XRQcR0JSLTLxxNxUHq9olv8WsWCccek9+XXdn/gCLfSUXBWHF3qkq e0+vXhdzIX/wS8lg6M9QO4aQ2YQt2YQCaTm2LV9mBh6f/YyBXz252kT197O/rMfAePR4 9f+LvsVBQFDqXDGm/owfX6QP2B02pe0FC7dk03ats0POfFUp3NNSUGt7sCJytqNRxaQ1 s9DjP+sAidADcm4xolaAqs49tnjFktt4XVd8umYaYybG+73QVdp0uQHbmkPS+qmoP+3g i6sTOrO/dyeK9bBBC0rbL631s8+m0Svq4UDm/SFYWVjR4+6J9I7SvKYvugGN0VXK/bg1 UTUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=R6IU1p4TeEKJjoh2orwJx/m6ECV4RVPwTG8bCIFZfuI=; b=hq8Csatx4t99Aka50OQKNDgyJh1Wbvr9JF6VMjdyJKGWyja3pGKq0vs7D2JBBrlrrQ 7ZZ3spNoeqiBiBzUPSnRAb/4nqE0zMtcW9tzcMYNnvZnorjoOXzWp1VbOrCytLTwbU4O FQaoaFuQTyBRklWOwh3BxkTybk2cF+JpvU8fw3y1N/xSE91N5+AN0h38yJI/dfYcGwgG mFQTw5s7IaSWMt+eokS9i3KlywZrNDkj3S+FRdARDRns8EW2o+8HQprsTJSSqNldp2br CQBe7qMJnrc71opChmcBcreQsvU8TqVLcxKfvcVXU5RYoOug32NGdUS/eBtpM0Mc2dva PgPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sXKlS7QM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dh13si11026207edb.560.2021.07.06.08.12.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:12:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sXKlS7QM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mka-0007Fo-N8 for patch@linaro.org; Tue, 06 Jul 2021 11:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf7-000579-6q for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:01 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:36523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf5-00072h-6x for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:00 -0400 Received: by mail-wm1-x32b.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so5372667wmq.1 for ; Tue, 06 Jul 2021 08:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R6IU1p4TeEKJjoh2orwJx/m6ECV4RVPwTG8bCIFZfuI=; b=sXKlS7QMjSJftIpdVRMAQM1orzJ5oKvcGPZFGNBrOmKMfvQRqe9QNT+00dmRx27kks j9jCd+OcwNbW3BaPRYDrThxiXBcjoyLBgo1iK9rUKz6ztNd8uIgsIoyWeF7k+1EM0zlj EEPr8G1For7VGTKNggDPXsOt5kPd4WsugoTMxZE9W1vYlgzhgjRcAh0UZM42P3eSvbw5 mohAH7pjhLZHflfeMeOlmaF69eFjhk9c+rziZ7/hHcE3RlDB6zJmwDDEGLmA4EHQz98s 4c2yj/yLZAe0GY5aLdFxZT8nABbpP7td0H91goIuZMPA3Ib1Pw23uTWCzoOaN4WefvKF Qo4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R6IU1p4TeEKJjoh2orwJx/m6ECV4RVPwTG8bCIFZfuI=; b=d/9vEGXHlKWGgw+YxIAMpiQbC52u4wV5gV21V3J4aK1Tbr7AVNvEoAa42iNNx8Ekqv l/owx9Jlvt/8l1zLWJSwC9R/9aqNWT966Wlvv7IesfY78MwN21hsZA2HDBFzK7hfxYFk LtPluKQ/SJiG3xQnutY/fnwwdP+pyRnbjTVXrU+NlPbAbpOz/P6S4HNT2DB3zOKAxnu5 Ep8aPT+wLUt0gXTtw9C1yYALtBlIo9S0JHRP0KTOEFjzySHATM4XnTxCqaq4b33rSiOW IxUYCf71KdWKYwR70ze5VdROVagNk0AZazpOAbCi4Srvxt4tSX8Qut1yClpgCtAoXlp5 BCXQ== X-Gm-Message-State: AOAM530r3NL+VCpAK6sC/wpPwavYmfgofvbC1Cy6AJ+kCxxohXWw3mh/ Gnad9I43fNbcuwobcMMSSY21oA== X-Received: by 2002:a7b:cb53:: with SMTP id v19mr20605224wmj.127.1625584017818; Tue, 06 Jul 2021 08:06:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h15sm16525030wrq.88.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3A8011FFB8; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 32/39] contrib/plugins: enable -Wall for building plugins Date: Tue, 6 Jul 2021 15:58:10 +0100 Message-Id: <20210706145817.24109-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Lets spot the obvious errors. Signed-off-by: Alex Bennée --- contrib/plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Thomas Huth diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b9d7935e5e..17e6e2ec4f 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -24,7 +24,7 @@ SONAMES := $(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 = $(GLIB_CFLAGS) -CFLAGS += -fPIC +CFLAGS += -fPIC -Wall CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) CFLAGS += -I$(SRC_PATH)/include/qemu From patchwork Tue Jul 6 14:58:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470478 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5207214ejx; Tue, 6 Jul 2021 08:26:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzm72Rz8f/bBILfFoG2jOTTb44BLu+y8F9iZ6d1fF+s7LgDnXDYWUi9wDSvumeEmOxIkHeu X-Received: by 2002:ac2:5f0d:: with SMTP id 13mr12275928lfq.507.1625585203974; Tue, 06 Jul 2021 08:26:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585203; cv=none; d=google.com; s=arc-20160816; b=kmK9DFp6SpHhvORv0AcRYVNEDQAlQlwAPAruF+ed0Uo8J5zGxIO7OVkPyI4A1BSWa8 WS8i2PprVUnqMhmIZvj4bE3z/bKAJOIJ/s8FmyoIY1TBktU740neFKnPbTNYKMCWRzY4 mQHLbI1h8wV/x0liUpThOeQS2B2/5BSxyyAzmsRaEJzK7tA3nMA3JYuPJNjwsV1j8GDh sP71ny+fM13hDN9cup2a7UejlmL2jFiFfCs3/PfHj6oApJh8leTSMZE6VfiziFHuhYY3 CrjybqpTrv5d+7LY/R8OD1r///j0m4g+7gnN480gUPWhxW4Nxfdw9PXCq5cpSrNBRj2u D8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Cuu/+/i+aE9OJCzoepBYKpRGSdrNqPNpgdExXOyA0HU=; b=WXQPxBnaukvdIbb/A2zSBLyzAC28mphv0hhjM5tJI9sr6tECMpktkiY7r93+bBzR2q eqO931JaC+y6ZNGOmKim1hlKhlUy4PisrBp15xRx2dQNXcJOUytwq/PJmGqPZYVqDV67 MpucIqu+rVvBn3yI7Ys2ovhzkpDV89+2zE2CDJEYWYsbxLfmHSY7M3Va9EoC7VqxlE02 BpdL44zXjl2Nu4V/wWo2fPL7BXwpVNW5+GkPV7oVw64slgXhsIhEVPudZp8hx4YcJ+Ua RP38yGEIo4aJhpMooURHqZFmjhk6KqGXuGyAnrulwixZlQQW4anjfQw+D4kBwwV79Rcf EWLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dxI468LD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h22si20508543lfv.274.2021.07.06.08.26.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:26:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dxI468LD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0myA-0006eO-Q2 for patch@linaro.org; Tue, 06 Jul 2021 11:26:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfA-0005Bd-AT for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf8-00074p-3M for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id o22so13829826wms.0 for ; Tue, 06 Jul 2021 08:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cuu/+/i+aE9OJCzoepBYKpRGSdrNqPNpgdExXOyA0HU=; b=dxI468LD9eFnEdL2WauVBfS++cx+JUM9NJqXLrquTiqzq7y7PO3wshPqfnxj/rs7wS S+SNCJdioXp0uVe3qW1EmOLWHy5EjgfD/muc/bLKJtd1H81pVrrNHDjGlWyGnw2SgXY8 mV+kjQ4b4umPmnVYTQbY4M+6AnW1+shsgRJ1yhnfBWt90L60piSvJCflnxKHjuUN80Op 1h9TUvmaGyFmuIDq0jie5QFO6TZLAMAhkIww0Cb70bV0PnYGyr3c1c1J+EjMvxY8A1LN 6IZFwvIBQ8S8LICh/GcuQaCzji1sbUDsp3OWmsv/jcWqDNAa+YtTm1eiwde8PYS+g6ip o0jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cuu/+/i+aE9OJCzoepBYKpRGSdrNqPNpgdExXOyA0HU=; b=F7yeBiqg/e4D2CaLXZKt1h6F1+iyDZAhW5xEn/zu+cbTaRySifsieBAQxhHNbAtrQS oeM6g9CWs8NmFKOscDtbkLQU/NQ8N5iS2yf1phg1qJ9lrhuH1T83h+ShC/98O6ok6OyY 4i7MolroQZIJ5z7Ii8LM2rOgvsLGcX0fr0bp7olbSZdYDd6tikM2cyDOPHsGHjrzeCj/ qefOPrEgqCqtL8QONDJVg4JQi1228DVm9m0Bk+5l0HklRNk78o+6TTpS25Xdkn09Stth fBkfBwnBr3/4Adi0yQ7JrELy7Gk7SEb5dGGIxROX0dtlHIevxJn4T7+MO+ITpdz/Zxeg Zr9w== X-Gm-Message-State: AOAM532TG2pgm6s4k9+7X0HNAjJXyBLdZj34F24i5asxPbJb9Gz/LU8z LK437tFxqGJvp4c4TyN9E83QOg== X-Received: by 2002:a05:600c:b48:: with SMTP id k8mr1339787wmr.180.1625584020590; Tue, 06 Jul 2021 08:07:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a12sm2942694wrh.26.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 56B711FFBA; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 33/39] contrib/plugins: add execlog to log instruction execution and memory access Date: Tue, 6 Jul 2021 15:58:11 +0100 Message-Id: <20210706145817.24109-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alexandre Iooss Log instruction execution and memory access to a file. This plugin can be used for reverse engineering or for side-channel analysis using QEMU. Signed-off-by: Alexandre Iooss Reviewed-by: Alex Bennée Message-Id: <20210702081307.1653644-2-erdnaxe@crans.org> Signed-off-by: Alex Bennée --- contrib/plugins/execlog.c | 153 ++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + contrib/plugins/Makefile | 1 + 3 files changed, 155 insertions(+) create mode 100644 contrib/plugins/execlog.c -- 2.20.1 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 = 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 = 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 = qemu_plugin_get_hwaddr(info, vaddr); + if (hwaddr) { + uint64_t addr = qemu_plugin_hwaddr_phys_addr(hwaddr); + const char *name = 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 >= last_exec->len) { + s = g_string_new(NULL); + g_array_append_val(last_exec, s); + } + s = 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 then 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 = qemu_plugin_tb_n_insns(tb); + for (size_t i = 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 during + * the emulation lifetime. + * We only consider the first 32 bits of the instruction, this may be + * a limitation for CISC architectures. + */ + insn = qemu_plugin_tb_get_insn(tb, i); + insn_vaddr = qemu_plugin_insn_vaddr(insn); + insn_opcode = *((uint32_t *)qemu_plugin_insn_data(insn)); + insn_disas = qemu_plugin_insn_disas(insn); + char *output = 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, output); + } +} + +/** + * 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 = 0; i < last_exec->len; i++) { + s = 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 argc, + char **argv) +{ + /* + * Initialize dynamic array to cache vCPU instruction. In user mode + * we don't know the size before emulation. + */ + last_exec = g_array_new(FALSE, FALSE, sizeof(GString *)); + + /* Register translation block and exit callbacks */ + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + return 0; +} diff --git a/MAINTAINERS b/MAINTAINERS index 684142e12e..ee456e5fb4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2981,6 +2981,7 @@ F: include/tcg/ TCG Plugins M: Alex Bennée +R: Alexandre Iooss S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 17e6e2ec4f..6ac67aacaf 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -13,6 +13,7 @@ include $(BUILD_DIR)/config-host.mak VPATH += $(SRC_PATH)/contrib/plugins NAMES := +NAMES += execlog NAMES += hotblocks NAMES += hotpages NAMES += howvec From patchwork Tue Jul 6 14:58:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470468 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5199889ejx; Tue, 6 Jul 2021 08:18:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy026aNImYsgk6hsykHI2A3eB0Igt2Cq0GX7wgaIpWQPkd9EcOSRhMaTFdW1/azJ2D/U4Ql X-Received: by 2002:a17:906:9bec:: with SMTP id de44mr12723338ejc.512.1625584686151; Tue, 06 Jul 2021 08:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584686; cv=none; d=google.com; s=arc-20160816; b=ZNy5DrxIcVvohDQB7yrLnvsEUhetY/7Ioy4Fvt73kDlE5BbB8BlPYOkgO4pAd/SUu0 NYT8noPe8KpagWD4CA0M4lt3uIaXSENQqvNDabS8sIyNXrXEMV8cyYRhE6K1GU9chgPv PEsyG6oLN1BzLDBYPZdh6rsuPlTRAoXDCyNgE2mzuuWuJ3HjFtDH6SXEEieK1LyfRvZb WVocIlOY8BXbJ8aGb4jmrPhD8ow/qtkhcItosM4XW0RW3y8Mu/bmjnCUWXdxRVPELNp9 wNofMNLLpHQDmYgei0nDNQiML0aXX7HzH9r+mEuqFPloX8v+M0OmA9UEyG7IDaEbIUQw XWwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=M0B41l8DgGSa12niyjKzHwCDTjBJNRfJGB+oGiCv7dg=; b=0zVs6SHmJPtXbmoypDlwsmEEDb17oOsBU2UtOHCBKQpjMnK5JHO4UqCIb+GxORMvrz yKfN6mP+1RHZweOUpIzsZNny7319LDAY7KU1Kr5OfnNFnEVWQ1RJ40IvmWsMSGh/Hn/m 6KU9oQVSb57efYhssZ0RRZyY8WWSD7Tr6WifLDAshBkny2iB5O2DblgjyzHKwrsXdp7S z3mpSlo+RxQCHKHlxGoDNStK6Jfd2hV35A0SH8H0/J8QXxAkCEmPq5XEnK9zRoufGeOZ 67+7vt4fHcOXU4aohnKdMu6byrRHeKOwnZq3bpSIdmPNuCNgQPmR4Yxqe618kqoxucgC TvVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ko0rze6u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b3si13515209ejb.219.2021.07.06.08.18.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ko0rze6u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mpp-0002Lg-61 for patch@linaro.org; Tue, 06 Jul 2021 11:18:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mf6-00056a-Gx for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:01 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mf4-00072Y-OU for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:00 -0400 Received: by mail-wr1-x42d.google.com with SMTP id i8so13583288wrp.12 for ; Tue, 06 Jul 2021 08:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0B41l8DgGSa12niyjKzHwCDTjBJNRfJGB+oGiCv7dg=; b=Ko0rze6urFLr9sEmYdV2433Xyq3fnB2Dz4FescYUFF/v4Hcg/ZIxVCvpQzk0GJNhK1 tqzwVJzlFAS+6lQtUEi4fV/ROD8JMEE9f9+PHjBCKLgJicc64QWjBF7SPynFHsxswBCQ 5Clsr0p+TUied6bkuryVLF8Xi8bDARrrWrKUmUfMGxWo8SD9QaOy3v5XVXIqYH64qNvr 0kdM0eziTacQqtDIfjDLohamo8z9FpmaJnq9svr7+tocSIduaQoKU1QFi+oNw8YwCu6S qMvk+Vn2ZkDRp8OlUfNSKYduXGTsI+RuyIQaMg+54n7yNfChlWHSkFr5lNHasCFl1gMZ W7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M0B41l8DgGSa12niyjKzHwCDTjBJNRfJGB+oGiCv7dg=; b=sbgCSaRlT6pRdRKcr7ieDBCRgOXWR2FwJPC3IYN9u9XBlDccdYBVHyeDEvQ7jNVJN+ iu/WMg7EuufAcZJua5e215T1WQ7w3nlykZ9F6zTqxufFjflkhuycDRdDAmYYmtN5uw4n 2J/iOWGyhvtDGQcuRvbWBlkCN2tyRbqTiLy8MkcHDah7If5ymPgAXKHdB9R3tTgYgBpY ysQvsWuRPOoU59rYhEWxYi49aX057S38vxAG4qpmPj0AH68eoaLaYyAM3ArMS3jnIMzp HGS4ScRuottHe3ZaOGQJCODCI4xVcWYBJfGZMLkh9SzdDWJDGa9MjrKz3CTJW8Pp9Vnx +g9w== X-Gm-Message-State: AOAM530iDVSDLvr3ROiN1/fLEN5LUh7rpquEmxdDqXB5ipDDwwI+4Qmo +Ri2RWuryrDqIVDV8aYUzZVarA== X-Received: by 2002:adf:e690:: with SMTP id r16mr8238954wrm.196.1625584016997; Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm18039244wmq.14.2021.07.06.08.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:06:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D9541FFBB; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 34/39] docs/devel: tcg-plugins: add execlog plugin description Date: Tue, 6 Jul 2021 15:58:12 +0100 Message-Id: <20210706145817.24109-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alexandre Iooss This adds description of the execlog TCG plugin with an example. Signed-off-by: Alexandre Iooss Message-Id: <20210702081307.1653644-3-erdnaxe@crans.org> Signed-off-by: Alex Bennée --- docs/devel/tcg-plugins.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.20.1 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. It 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 be 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, 0x20003ee4, RAM + 0, 0xd32, 0xf9893014, "adds r0, #0x14" + 0, 0xd34, 0xf9c8f000, "bl #0x10c8" + 0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM From patchwork Tue Jul 6 14:58:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470488 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5116672jao; Tue, 6 Jul 2021 08:39:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyejrnegvelb/moS69HWrjifV1OnpEkPfvMnMDKoXbmbzmmEIgy7UGpsz4I4pv9K9fQK5dI X-Received: by 2002:a05:6402:898:: with SMTP id e24mr10849375edy.270.1625585966293; Tue, 06 Jul 2021 08:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585966; cv=none; d=google.com; s=arc-20160816; b=CItLQBHVbS4K2OvKwldkMJHgVSd//94uBuNYSFLqwT+UJLIt55PaT4HABxg362UXEd SDwt/iYnhvdTR86hElwRlekvjxLmZ2OOjP+DqRQJM/AiL1Tv3z51WxTJyB/AhSP8YTju /lodxofLJNQkD3iWJubqaPSF7/7MkPR7hiIQBNH9AxrexkpujzIEf/R7MeFSfEn8con3 0nLSHMTRINm3Cfs1Eyq4leLw2RYWdzQny693VkNeG/8dW25YmAbdh8HYeoFU3mxiiZG/ X3RXZP8HD8nNQ2rezM6JsGvsR3OY2rqJmNIQIIdERokpGPzFn5QAzLR1rBobxKdPnXhu IXDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=/yrF+ayxgdtoFcLg/iX/tWy6wtd8uBatUI5DIaKry1g=; b=qFXSX3j6/edyrlS0pTi4WVSVnDq4QTNeUs8qnNbCSGr4OLENc65znBeKOvP94y45KH 4+57ak3T0H07saEebNBbUfyX6H+D3XO5t1ToE/MT355Zfaiv+XljTp50eqIXy3FGhLNa AXiUbRQM30G/CexxVDKc3+4E2TSfKEkp3XIcuEUfChNyGgGFegwEt0LbBWvzcdSNIdKE mAuFnyizhgzrfd4hLHj8K8xXSjWC5j2jzevLjyUVpGND79TCZP49eS/kLSr7R+4o1ZXG 7AAWCykZG5Mjg65fFsvOBicx4IzRCUojh0I+HmbFcf22oTvpZSbRoq/aUHBMbEXgjAwp DDfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z8G+Urw5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gf1si15470548ejb.318.2021.07.06.08.39.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:39:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z8G+Urw5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0nAT-0000XL-8K for patch@linaro.org; Tue, 06 Jul 2021 11:39:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mpA-0002Rf-Fg for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mot-0004ug-Q1 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:21 -0400 Received: by mail-wm1-x332.google.com with SMTP id o22so13853242wms.0 for ; Tue, 06 Jul 2021 08:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/yrF+ayxgdtoFcLg/iX/tWy6wtd8uBatUI5DIaKry1g=; b=Z8G+Urw5Oy8loHPpxKNmYuiNAuc7Xmmm3JbA2hQUzOJnQm/Xnq+Tk9IDgVwGuSlE47 7LXh+Zxjd/VlolPocPPNp+xjByj+tMajbJWTyjVrzSeYSrf/DHI8HRBUNEv1H1rfGPB1 m1qxzjgseITsOQ9ExNI0QY2u5sBN14CId8C9XaUihluwKpyuj02zMUsYstfrDY5rh/X+ XbUH5Z1wu4z1PMU1Nwfo6OV2UW/iCoN2gd3Q/PFtQ0UOrPDsYyztv77DR3APtHNQ8Hce uUYoVwBTrTxtt/Az/biI9JnhOtdFrSdlcLAQtNCkRXeKh1q40dWQmJw+Q4fHXEN+ikKc iZJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/yrF+ayxgdtoFcLg/iX/tWy6wtd8uBatUI5DIaKry1g=; b=PVpvcpiubsPye47LA49S1OQfEWykp+j7GoN15gimskwTlDRcgUQLfVQtUfH1OB5w5O V4hXEHS7c7Smc+xO9OfLnYimEWX2h6+g1FRN6RePmCfDprcV0xuUarMExJXjjiVzWbGP KusRejDRwSak8P49ChY4P0xZ1ZSBCWlM0EaoK7d3JEodh0AuptZkbAT+nnU8IF1JURNi hBghzowRY0TvsrFVZFJOr+KIiqf44p47dXtmvfd0wFx/SYSAJ+b4yATWQjyeOB3G4yHr rX3ctfrFPefgbauyF4lQCm2J2En4gctPlbuX6SiZvIZ/rHeqXLz/3Y5A9adkLHZSHNgF LqyA== X-Gm-Message-State: AOAM5317xO/mVNg0f2HbZIoXk1gEeL8JV5hsFaVrMVuYw684Wh2d+6sX /dGUv+o7mYEzkUEDbidDnMxX/A== X-Received: by 2002:a05:600c:3794:: with SMTP id o20mr16552503wmr.0.1625584625989; Tue, 06 Jul 2021 08:17:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y66sm16314795wmy.39.2021.07.06.08.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:17:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 889B31FFBC; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 35/39] plugins: Added a new cache modelling plugin Date: Tue, 6 Jul 2021 15:58:13 +0100 Message-Id: <20210706145817.24109-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Message-Id: <20210623125458.450462-2-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 419 +++++++++++++++++++++++++++++++++++++++ contrib/plugins/Makefile | 1 + 2 files changed, 420 insertions(+) create mode 100644 contrib/plugins/cache.c -- 2.20.1 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 = QEMU_PLUGIN_VERSION; + +static enum qemu_plugin_mem_rw rw = 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 not + * 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 tag + * 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)) == 0); + int ret = 0; + while (num /= 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 = g_new(Cache, 1); + cache->assoc = assoc; + cache->cachesize = cachesize; + cache->num_sets = cachesize / (blksize * assoc); + cache->sets = g_new(CacheSet, cache->num_sets); + cache->blksize_shift = pow_of_two(blksize); + + for (i = 0; i < cache->num_sets; i++) { + cache->sets[i].blocks = g_new0(CacheBlock, assoc); + } + + blk_mask = blksize - 1; + cache->set_mask = ((cache->num_sets - 1) << cache->blksize_shift); + cache->tag_mask = ~(cache->set_mask | blk_mask); + return cache; +} + +static int get_invalid_block(Cache *cache, uint64_t set) +{ + int i; + + for (i = 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 = extract_tag(cache, addr); + set = extract_set(cache, addr); + + for (i = 0; i < cache->assoc; i++) { + if (cache->sets[set].blocks[i].tag == 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 missed. + * 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 = extract_tag(cache, addr); + set = extract_set(cache, addr); + + replaced_blk = get_invalid_block(cache, set); + + if (replaced_blk == -1) { + replaced_blk = get_replaced_block(cache); + } + + cache->sets[set].blocks[replaced_blk].tag = tag; + cache->sets[set].blocks[replaced_blk].valid = 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 = qemu_plugin_get_hwaddr(info, vaddr); + if (hwaddr && qemu_plugin_hwaddr_is_io(hwaddr)) { + g_mutex_unlock(&mtx); + return; + } + + effective_addr = hwaddr ? qemu_plugin_hwaddr_phys_addr(hwaddr) : vaddr; + + if (!access_cache(dcache, effective_addr)) { + insn = (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 = ((InsnData *) userdata)->addr; + + if (!access_cache(icache, insn_addr)) { + insn = (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 = qemu_plugin_tb_n_insns(tb); + for (i = 0; i < n_insns; i++) { + struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); + uint64_t effective_addr; + + if (sys) { + effective_addr = (uint64_t) qemu_plugin_insn_haddr(insn); + } else { + effective_addr = (uint64_t) qemu_plugin_insn_vaddr(insn); + } + + /* + * Instructions might get translated multiple times, we do not create + * new entries for those instructions. Instead, we fetch the same + * entry from the hash table and register it for the callback again. + */ + g_mutex_lock(&mtx); + data = g_hash_table_lookup(miss_ht, GUINT_TO_POINTER(effective_addr)); + if (data == NULL) { + data = g_new0(InsnData, 1); + data->disas_str = qemu_plugin_insn_disas(insn); + data->symbol = qemu_plugin_insn_symbol(insn); + data->addr = 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, data); + } +} + +static void insn_free(gpointer data) +{ + InsnData *insn = (InsnData *) data; + g_free(insn->disas_str); + g_free(insn); +} + +static void cache_free(Cache *cache) +{ + for (int i = 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 = (InsnData *) a; + InsnData *insn_b = (InsnData *) b; + + return insn_a->dmisses < insn_b->dmisses ? 1 : -1; +} + +static int icmp(gconstpointer a, gconstpointer b) +{ + InsnData *insn_a = (InsnData *) a; + InsnData *insn_b = (InsnData *) b; + + return insn_a->imisses < insn_b->imisses ? 1 : -1; +} + +static void log_stats() +{ + g_autoptr(GString) rep = 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 = g_hash_table_get_values(miss_ht); + miss_insns = g_list_sort(miss_insns, dcmp); + g_autoptr(GString) rep = g_string_new(""); + g_string_append_printf(rep, "%s", "address, data misses, instruction\n"); + + for (curr = miss_insns, i = 0; curr && i < limit; i++, curr = curr->next) { + insn = (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 = g_list_sort(miss_insns, icmp); + g_string_append_printf(rep, "%s", "\naddress, fetch misses, instruction\n"); + + for (curr = miss_insns, i = 0; curr && i < limit; i++, curr = curr->next) { + insn = (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 = 32; + sys = info->system_emulation; + + dassoc = 8; + dblksize = 64; + dcachesize = dblksize * dassoc * 32; + + iassoc = 8; + iblksize = 64; + icachesize = iblksize * iassoc * 32; + + + for (i = 0; i < argc; i++) { + char *opt = argv[i]; + if (g_str_has_prefix(opt, "limit=")) { + limit = g_ascii_strtoll(opt + 6, NULL, 10); + } else { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + } + + dcache = cache_init(dblksize, dassoc, dcachesize); + icache = cache_init(iblksize, iassoc, icachesize); + + rng = 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 = g_hash_table_new_full(NULL, g_direct_equal, NULL, insn_free); + + return 0; +} diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 6ac67aacaf..2294f889ac 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -19,6 +19,7 @@ NAMES += hotpages NAMES += howvec NAMES += lockstep NAMES += hwprofile +NAMES += cache SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) From patchwork Tue Jul 6 14:58:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470483 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5111638jao; Tue, 6 Jul 2021 08:33:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUry9Y6HAMBDAd0Qis66Bj5p+pYgBtlxzPPRkBAUklPVXSEDkf0JZtLXVk1UbT/XOnaz4g X-Received: by 2002:a05:6402:1a48:: with SMTP id bf8mr7027978edb.201.1625585599997; Tue, 06 Jul 2021 08:33:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625585599; cv=none; d=google.com; s=arc-20160816; b=QLgf7Bm5WbcNb3ftU1Mpd0EgljoJvaVoaCCqH1n8UX1vyoygsTWDL11To2/DXhmET+ yZSqzCRGLBNTYICKps99PQnIfzRhYZUmzkc8biyuJgnZhWotFjWt4rbLeQ4cVlUupzJd XBOjB2PQovg98aha+0PCcD+j+IdtyXFIVaPV8iXwlmwArUyBwMt/KfsULKZy7q5l+MXb E+i7An6nAH9ySzyqvbepzprlMIXJQ7PrxLy5SStWPxOJUSCva/slNk1ocG000YpUsiV2 7nhAYFK05MGMgv00+Yc88wgAGE+F0dH50QK1pr7RVOHB9lePfdqubYJjDpp28q1rRRYL OOVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eT5up0kian05/LgF6zUXsmuwoQua1u5bvZFkNOmLsvE=; b=ghrVoOPVpFyftjjNZ87yQ5ncOsXw4113IDb5EXBho/yW3dsK3UGA36BQCZCzzur/OQ MQruA3J7HzmHCPB9TyPnmy2qsWiUlTvk++4/7rI1lRVG12vN0LyZKxyx4BWqsvCxKSwj IFhHM9QxCYSugcjFKFtNNZKmc/3+Zl4vuzTnsTZMJoJdjMaafblkWGjIl9ad7j7wWP6/ Pr6TB5W4SPKcsQa4Gjcd6Alz/13puXve0OmlxLop7UyKxLi+0zQOC0ecV5hfbgnKOm5q NvtrsAuB95REC7OZOL4BwcMBMMjbkfg0qTaMVigpw73Uq6faClpvu1ir0LJqtcIgrqu2 cmtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=z2ZmcB7I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b1si18758985ejb.152.2021.07.06.08.33.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:33:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=z2ZmcB7I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0n4Y-0004Dk-VH for patch@linaro.org; Tue, 06 Jul 2021 11:33:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfP-0005ZS-8s for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:20 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:50848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfM-0007Ft-8K for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: by mail-wm1-x32a.google.com with SMTP id o22so13830354wms.0 for ; Tue, 06 Jul 2021 08:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eT5up0kian05/LgF6zUXsmuwoQua1u5bvZFkNOmLsvE=; b=z2ZmcB7IOrkvFSNxrJM/15GqzpZkc1FyaEBmUdHnLjEZa/wBZ5ENUvlxM1gQPbKk0T fMGIvScz+av4k60qcWhGhQrI3OM2GJEO9br2/evaIJhgDoB9UQ1BVIE9sbIeW6kgFOWC GdhutuP4PbHSBfHn8i7m0DmCtAehpZjX2+Vdz+W77AHm7DFvv2BkmZN9C/tid+VvB+u8 QPqfDUc5OwYpmMAEBP/ENMKVOVSbiYw4o1TIsnFrs0L1scRtIK38CJxoWjOHltNOmEpA zaUHQXN0V4UcoApF8iBdwGwgpvasBYVSe6ozbcB5REGLnZOzX1FUCZOWRqkOgdJJ40ZA bVcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eT5up0kian05/LgF6zUXsmuwoQua1u5bvZFkNOmLsvE=; b=e4cSBHuOUBzSA21QQAz37y5EzMQ8rfgDwQ4M5Z6A+Qm9EargBqTiKgaA2cmpLopR6S vgkfY+oYx8uviIJ3euuEKqL2twc2MF0lcCiZFu/hOnS2TkWNe8wAMlt0o+KeCA9r13vD KnZEYaCG2Tu83OOWs9ZutWB6hn7P+r44368IURIrY7N3IrOj9kbWYe90527IwvEJQLjT DtC2oTQna7USNVE+j9goAarPZ7+TZyphM+Wp/zf0jUaCYFtnu/02xHVXq+J4gl4dzm2T QvrwtJ7OUlaogMlA/pr9XoPpBi19yCnVUtFoQAfFc9v4qo3lolmKSyrteBwphM38+Kiy 1sww== X-Gm-Message-State: AOAM532J2MdM2eyO7yWcXc6n33yimQp7UQNUclzSg9NVpL02Eb0UliFL OgnxNJh1d501+CwQJAbSvT7NQQ== X-Received: by 2002:a1c:4e0b:: with SMTP id g11mr1273600wmh.167.1625584033697; Tue, 06 Jul 2021 08:07:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm11546551wrx.40.2021.07.06.08.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A03541FFBD; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 36/39] plugins/cache: Enable cache parameterization Date: Tue, 6 Jul 2021 15:58:14 +0100 Message-Id: <20210706145817.24109-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mahmoud Mandour Enabled configuring both icache and dcache parameters using plugin parameters. Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Bennée Message-Id: <20210623125458.450462-3-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 47 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) -- 2.20.1 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; } +static const char *cache_config_error(int blksize, int assoc, int cachesize) +{ + if (cachesize % blksize != 0) { + return "cache size must be divisible by block size"; + } else if (cachesize % (blksize * assoc) != 0) { + return "cache size must be divisible by set size (assoc * block size)"; + } else { + return NULL; + } +} + +static bool bad_cache_params(int blksize, int assoc, int cachesize) +{ + return (cachesize % blksize) != 0 || (cachesize % (blksize * assoc) != 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 qemu_info_t *info, for (i = 0; i < argc; i++) { char *opt = argv[i]; - if (g_str_has_prefix(opt, "limit=")) { + if (g_str_has_prefix(opt, "iblksize=")) { + iblksize = g_ascii_strtoll(opt + 9, NULL, 10); + } else if (g_str_has_prefix(opt, "iassoc=")) { + iassoc = g_ascii_strtoll(opt + 7, NULL, 10); + } else if (g_str_has_prefix(opt, "icachesize=")) { + icachesize = g_ascii_strtoll(opt + 11, NULL, 10); + } else if (g_str_has_prefix(opt, "dblksize=")) { + dblksize = g_ascii_strtoll(opt + 9, NULL, 10); + } else if (g_str_has_prefix(opt, "dassoc=")) { + dassoc = g_ascii_strtoll(opt + 7, NULL, 10); + } else if (g_str_has_prefix(opt, "dcachesize=")) { + dcachesize = g_ascii_strtoll(opt + 11, NULL, 10); + } else if (g_str_has_prefix(opt, "limit=")) { limit = 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 qemu_info_t *info, } dcache = cache_init(dblksize, dassoc, dcachesize); + if (!dcache) { + const char *err = cache_config_error(dblksize, dassoc, dcachesize); + fprintf(stderr, "dcache cannot be constructed from given parameters\n"); + fprintf(stderr, "%s\n", err); + return -1; + } + icache = cache_init(iblksize, iassoc, icachesize); + if (!icache) { + const char *err = cache_config_error(iblksize, iassoc, icachesize); + fprintf(stderr, "icache cannot be constructed from given parameters\n"); + fprintf(stderr, "%s\n", err); + return -1; + } rng = g_rand_new(); From patchwork Tue Jul 6 14:58:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470461 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5089075jao; Tue, 6 Jul 2021 08:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwACiJvhf8Br1LBR7gB+vdTo113b3a3TO+0vJQ4Sp9PyaN1pHBT5MJepejx82PobrfT69E6 X-Received: by 2002:a17:907:968e:: with SMTP id hd14mr8244146ejc.328.1625584091496; Tue, 06 Jul 2021 08:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584091; cv=none; d=google.com; s=arc-20160816; b=hpeFj3L7pKkbEZmOfXz4y3aiCei/1+bdiUisQmbTKyhLW4Wk4nd/QophvAI7y7Y5Zp CQelnF1nEIVVHonawDEYH6gdJ8T2+UlgB4uhwFMMuP+c+Qh4ww0GqrVC1zVEsNFMg/NZ WNG5gZx0Qz+Iiy/yWAGPIIdHZ/1QMVcuTyiRg2nQiL/YiHXL4F+PFO0BvijDc7nlt90j O39Cy3LHFO5h0WyNO1WM0XkEvFkYio1WuQgHpCnMebxUAk5IVTn8bd1BnW+ybVHtrIB/ MGCAbWCA0f5IMdH96hT88f3cCLln6XAgYGgc7LNywgGLu38/UEwp8RLjSl6Km7xFtfNH 5gVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=TJnUq5leMqbwD2QuxM89xznp65cGqyJGYud6oYFuaiblt+MiQsBxNwzPKN+Xe0PMY/ YS+gIXOnqv59NLNn47S3wn6uK304v10/0Sjjx1CxZxriIaLTQJeNX7QnsBLl4T/hi7sr mkUd/rvpVdUnnwr+TmoeNDfOB24SbshoCJG5oZSnanvK79u95GxSjYNw3NzvPtkLoiXS hQgNwGH5dLn5gekonEafWOTLfORCaWks8XriapeCI4D8i/Tmtb7uumT5zx6GyLl3Vodn TJJCoyPu7Sh0aIkupgQy00JV8hIzNSN8DLjXO8BTeXVpoMOJvG50iB0KFIPDcM2WG7Y/ EKHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OVJ7M9ex; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gt43si10770146ejc.91.2021.07.06.08.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:08:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OVJ7M9ex; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mgE-0005gD-BU for patch@linaro.org; Tue, 06 Jul 2021 11:08:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mXB-0004z5-US for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mX5-00026C-53 for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:49 -0400 Received: by mail-wm1-x333.google.com with SMTP id n33so6294864wms.1 for ; Tue, 06 Jul 2021 07:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=OVJ7M9exKqvDYUNcA4vrWpaO99Xl+zQQxin5pBBf1TbzEIdZ9icYqn3+kVlEu/IXiW dC333Y2+nSH+v+zVyCY653wi4VIyKwm54ReQEXyEU1EP8FnDtEUIG+k2oQ8nJA2fGS2e 1TbnhDNc849PdDK7Z9LtNC78eT3pGtzuQSrUBqi8b/JgGsOqWKlkttsaD3UO/wTl6mUh yuhBZb5VLA3TTMPW+gCVBpKfCzStctlKw+tkKxAqnGC1koy5As34Rh6pb8z+wtxl8iqv sWJjxeqhv8LzyOa/X/+akNxI3nck4xZxOhVmF/3M6oyoh+jZxeeeAxhg8B+NZylLAk+M Ke9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=Y3eBCA6VQbLDGfFTNzQmaojDenNFeSjtFGZ+pnHk2v0hB7X04a0pAR/uNaHngX7tFx ejFEpgDbvaFYvH81IslKamb7lWLxaG7xHuhyrMbB1mrtEB363u/tkmDGy0bQEnhlnCx3 /W33Uo8CrH11wX7M6KIrg0dUWnxyuupRrZXWzK+DjavIO3fMyc+edWbAJjBw+hejJgzv WYXDbCCaWclGSfD1a41e/QVQsbL5mb2lWnSwJ1H3XGA11fM0uFDqeXguW7TKoXpvfcTo 6Cgqr8OJOcyoGumJLpg0w8dmmveNGC6UqbfRRULsgu5aNKRTp6Bc+a0UWk/8fgyPy2j1 k6+Q== X-Gm-Message-State: AOAM533Z6az4HU+5Ho4GAiL8d+CvThj7EzBPgOub/5J+SR6r90sHvpIk 7MuQSDTQeTzhHwGGRxT9p4UjvQ== X-Received: by 2002:a05:600c:1c19:: with SMTP id j25mr1295989wms.166.1625583517660; Tue, 06 Jul 2021 07:58:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o11sm15336535wmq.1.2021.07.06.07.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B63611FF8C; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 37/39] plugins/cache: Added FIFO and LRU eviction policies Date: Tue, 6 Jul 2021 15:58:15 +0100 Message-Id: <20210706145817.24109-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Message-Id: <20210623125458.450462-4-ma.mandourr@gmail.com> --- contrib/plugins/cache.c | 203 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 190 insertions(+), 13 deletions(-) -- 2.20.1 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; +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 details. */ typedef struct { @@ -57,6 +67,9 @@ typedef struct { typedef struct { CacheBlock *blocks; + uint64_t *lru_priorities; + uint64_t lru_gen_counter; + GQueue *fifo_queue; } CacheSet; typedef struct { @@ -77,6 +90,12 @@ typedef struct { uint64_t imisses; } InsnData; +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; static int pow_of_two(int num) @@ -89,6 +108,103 @@ static int pow_of_two(int num) return ret; } +/* + * 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 counter, + * indicating that it is the most recently used block. + * + * On a cache miss: The block with the least priority is searched and replaced + * 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 = 0; i < cache->num_sets; i++) { + cache->sets[i].lru_priorities = g_new0(uint64_t, cache->assoc); + cache->sets[i].lru_gen_counter = 0; + } +} + +static void lru_update_blk(Cache *cache, int set_idx, int blk_idx) +{ + CacheSet *set = &cache->sets[set_idx]; + set->lru_priorities[blk_idx] = 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 = cache->sets[set_idx].lru_priorities[0]; + min_idx = 0; + + for (i = 1; i < cache->assoc; i++) { + if (cache->sets[set_idx].lru_priorities[i] < min_priority) { + min_priority = cache->sets[set_idx].lru_priorities[i]; + min_idx = i; + } + } + return min_idx; +} + +static void lru_priorities_destroy(Cache *cache) +{ + int i; + + for (i = 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 the new + * block is put in its place and enqueued to the FIFO queue. + */ + +static void fifo_init(Cache *cache) +{ + int i; + + for (i = 0; i < cache->num_sets; i++) { + cache->sets[i].fifo_queue = g_queue_new(); + } +} + +static int fifo_get_first_block(Cache *cache, int set) +{ + GQueue *q = 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 = 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 = 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 cachesize) blk_mask = blksize - 1; cache->set_mask = ((cache->num_sets - 1) << cache->blksize_shift); cache->tag_mask = ~(cache->set_mask | blk_mask); + + if (metadata_init) { + metadata_init(cache); + } + return cache; } @@ -155,12 +276,21 @@ static int get_invalid_block(Cache *cache, uint64_t set) return -1; } -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(); + } } -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 = 0; i < cache->assoc; i++) { if (cache->sets[set].blocks[i].tag == tag && cache->sets[set].blocks[i].valid) { - return true; + return i; } } - return false; + return -1; } /** @@ -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; - } tag = extract_tag(cache, addr); set = extract_set(cache, addr); + hit_blk = in_cache(cache, addr); + if (hit_blk != -1) { + if (update_hit) { + update_hit(cache, set, hit_blk); + } + return true; + } + replaced_blk = get_invalid_block(cache, set); if (replaced_blk == -1) { - replaced_blk = get_replaced_block(cache); + replaced_blk = get_replaced_block(cache, set); + } + + if (update_miss) { + update_miss(cache, set, replaced_blk); } cache->sets[set].blocks[replaced_blk].tag = tag; @@ -308,6 +446,10 @@ static void cache_free(Cache *cache) g_free(cache->sets[i].blocks); } + 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); } +static void policy_init() +{ + switch (policy) { + case LRU: + update_hit = lru_update_blk; + update_miss = lru_update_blk; + metadata_init = lru_priorities_init; + metadata_destroy = lru_priorities_destroy; + break; + case FIFO: + update_miss = fifo_update_on_miss; + metadata_init = fifo_init; + metadata_destroy = fifo_destroy; + break; + case RAND: + rng = 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 = 64; icachesize = iblksize * iassoc * 32; + policy = LRU; for (i = 0; i < argc; i++) { char *opt = argv[i]; @@ -431,12 +596,26 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, dcachesize = g_ascii_strtoll(opt + 11, NULL, 10); } else if (g_str_has_prefix(opt, "limit=")) { limit = g_ascii_strtoll(opt + 6, NULL, 10); + } else if (g_str_has_prefix(opt, "evict=")) { + gchar *p = opt + 6; + if (g_strcmp0(p, "rand") == 0) { + policy = RAND; + } else if (g_strcmp0(p, "lru") == 0) { + policy = LRU; + } else if (g_strcmp0(p, "fifo") == 0) { + policy = FIFO; + } else { + fprintf(stderr, "invalid eviction policy: %s\n", opt); + return -1; + } } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; } } + policy_init(); + dcache = cache_init(dblksize, dassoc, dcachesize); if (!dcache) { const char *err = cache_config_error(dblksize, dassoc, dcachesize); @@ -453,8 +632,6 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, return -1; } - rng = g_rand_new(); - qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); From patchwork Tue Jul 6 14:58:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470474 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5204184ejx; Tue, 6 Jul 2021 08:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTHcGqFmQjgzKHf+Z58lFQmqGxd9Dhypd7HUPdciOQYwKVaPjWPix9D9pUjT6sp3Jy5z2+ X-Received: by 2002:a17:906:4d41:: with SMTP id b1mr18693749ejv.239.1625584986386; Tue, 06 Jul 2021 08:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584986; cv=none; d=google.com; s=arc-20160816; b=FV32SZcxqxYD79W8xYnUyASOh8pysYc6Vmx5iNBKgfFzzYeinLVf5t4FP0ogXsInfg XNmWWeK7a2e3ndjkzK3d3Z9oWR9fRxuNYeW9mL9I38MTbAQjJPIt9rP5zIksFPFSgrDS aZASml2XoYA7ZuqZ7n1KXT+sbCJKsmnjNB/EOXNNiESTjbLuZWDVz0rU0/zxZxJk0WdN S0x0OhGLAzeCoWWbAeY32LjI+II0jUfAUVZY6I30JiVm/KsNYKtCIE6+HT4ae8/HDJoA gidaLt0lVkPUB48uJ7L5Xox+XyAm046dM8DoeMtytfuW+H83adv+Gj1vBJ8GZo5B31qh LY1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=cMVwh6QFPhcW20oytqkL/ZaRLLYb/mCB+qE4FLLNhgM=; b=M8KMdC52obktgO7QzbT2TlqdSpmMfALLakz7LVjd8KiX2lGRRcijr20I3UBRJVeqfD voWJihSOvkBBLun5oG3KOa7EybcBr/PRsKCQh3rESgPzL09Rbhm3dT7O7QN0giR18sSR cBoYD9y8zYNej3UryAzjeCSWZqCDo8nQ4KL03R4+r1bXtujsGoD02CLEwDPmvNME/fM5 j+lSAyovXpsKLc7z+0cRdjJC5iuIJO0qI/oxuIiflviyvkGzq4RMehGuuzDmH67rT8uB 4GYZdk3DNgESSWqQPQKEyXMX/wgTFZ4CyAAz9938RxnAwyOkInLjFUGUUoahMbhU+Ia5 EpMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wPrzNDWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id eb9si14671468ejc.720.2021.07.06.08.23.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:23:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wPrzNDWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0muf-0005Fv-EK for patch@linaro.org; Tue, 06 Jul 2021 11:23:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mor-0002N7-RO for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:06 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mom-0004qS-Iw for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:17:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id p8so26529507wrr.1 for ; Tue, 06 Jul 2021 08:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cMVwh6QFPhcW20oytqkL/ZaRLLYb/mCB+qE4FLLNhgM=; b=wPrzNDWcK/rPQraUuYadVoljxxWxyY0PWxcJzumMP1ks9c3wSw39GE+s+S1Ye0RwYl KKoPDhwPZS2yLaJCHVSKekd6jVWGjUmFecymjWFWEOt+AJx8PNnvq1WkG9w6Vc/p3Hxn aDect8po3EST6NrnvQPNT96Qj53MqZxNmzzvW6EYlJDmPz17ozXOHCHvbI0Yyg2bll1K +Vex/F2HdT+wzrz67bjE6Byc74Safb48iRYDY+dcv3q5eGvIMvE3e2M79UJZ2rzOnFub zY8lV+JeACqYH4lG5WUe9YeqmI57Ddbb3jVFQo4wlKOjRVLv3aErKapVdTkVUQQfEuCZ WMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cMVwh6QFPhcW20oytqkL/ZaRLLYb/mCB+qE4FLLNhgM=; b=GKM40KounDji4/hvaZ+TL/xNifrlXUgn2GdT48uypdMaa3ZcrH4SPbn2tWanVfRGtm BDwsfDZ8reVkXEgxIq2Jzq98A2ieqGSFtN2zzVltO4G/phvagLvbacJx2UTCYiTv3G3s 0EXaplZU8YXDadnWUxqDNpoqeTpDqGxWjW0tRyUHjCOyvepbI5N9n4t61vmAb1Mdl7MT KKRSuhWqM2Xwuwarr5pmZl+eveJSHKs93KrKUJfdtW4Ma1bWnfnbSsTuF1Rk+qGcCsUm hkyhCDA8dE8X99fWTeqXOjCS5MddRTPM7TtqtRRskobKl9AyoICTFU05IxTvJHjOzQws AEXw== X-Gm-Message-State: AOAM531uV4M5x+9wu1V09tHop5NWoUfvVjshNOWvHuDyXhl9IEIzMNwu +BVzyh06eqk/V8FGnBhG8I/ffw== X-Received: by 2002:a05:6000:1379:: with SMTP id q25mr21970030wrz.188.1625584619231; Tue, 06 Jul 2021 08:16:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j12sm16956881wro.82.2021.07.06.08.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:16:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CBF401FFBE; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs Date: Tue, 6 Jul 2021 15:58:16 +0100 Message-Id: <20210706145817.24109-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Message-Id: <20210628053808.17422-1-ma.mandourr@gmail.com> Signed-off-by: Alex Bennée --- docs/devel/tcg-plugins.rst | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) -- 2.20.1 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 structure:: 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="limit=N" + + Print top N icache and dcache thrashing instructions along with their + address, number of misses, and its disassembly. (default: 32) + + * arg="icachesize=N" + * arg="iblksize=B" + * arg="iassoc=A" + + Instruction cache configuration arguments. They specify the cache size, block + size, and associativity of the instruction cache, respectively. + (default: N = 16384, B = 64, A = 8) + + * arg="dcachesize=N" + * arg="dblksize=B" + * arg="dassoc=A" + + Data cache configuration arguments. They specify the cache size, block size, + and associativity of the data cache, respectively. + (default: N = 16384, B = 64, A = 8) + + * arg="evict=POLICY" + + 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 = :code:`lru`) From patchwork Tue Jul 6 14:58:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 470472 Delivered-To: patch@linaro.org Received: by 2002:a17:906:971a:0:0:0:0 with SMTP id k26csp5202605ejx; Tue, 6 Jul 2021 08:21:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaDns0Xhjc5GyLvDBnkO3Pvapi2k3Mo9J8krC8tslSM5RCxUQjQJlpLHd9pxb1B8yhM+nm X-Received: by 2002:a17:906:4fd6:: with SMTP id i22mr5552843ejw.92.1625584869347; Tue, 06 Jul 2021 08:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625584869; cv=none; d=google.com; s=arc-20160816; b=ifIP6vrQxl2xB6AWlpy/5sxTsHVQFkuBzIAnNmAAkXxELLAH9ZoorkXnqSaKNSsXaA w5vA3rUuIW2obtFTMoQn6m1wLFZFF67cIYMZ433wRqqp1FSDf8SWQA4VMUNQBvgOmYwt QR2ZnQMqeBs4ZVkSVi9ya3CSsKiJrVZ7OL43yGyTYz/mM8y1T3FK0ijenvQtSBHkGWM+ xF2+EZ9eNL7tXPbrKT4DqwW8Ka0tV6xg4vPmJd93mDas3G25cwuaUVw0h4CDsfxJXuKF 2LOkEFMQGLQRlX6jyzNtuaccWbBYXw5O7hVMnrOlQV0F81jOvBecI3NsKKJ6I11fTj1c 1rHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oS1S2allDRCwTqJLfgxd4YbJAktd2ptss87hkbFVJp0=; b=LWvo1TuvDabxsX97et6IYPaReKpGA9Y8pI2+BfO0mWVAp+qXr6Hv3jcmn2uHQbTTby /5NfUN0fBR960n4MAdqbomkOZV330ZEJKJr3QBSV3qjQuWzcBYvpcfFnVzPmcrbTlhLE +7anEDvU0UGXkM8Kqv0ARs0s93mCeaoZsVPcLpl8gZkPn8sZrjb5Pv+WYrdBqLiR3KEL 1lE9tOQHoeZuO70Ugj22wg/EWt9rqb3ucimnHlDTsCywUdTkL5wa1/tCsNOaAlk5RZAm 5dsCXUxa09QDh33T+zMinea9q+TT4TsKkbOoQoq4L3/v/Ahd7cG0cV0uMIzMKjNz6dYU FA5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vd28U50a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m16si14216639edq.496.2021.07.06.08.21.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:21:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vd28U50a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0msm-00084I-Fl for patch@linaro.org; Tue, 06 Jul 2021 11:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mfQ-0005ZU-7r for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:20 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mfN-0007GA-KM for qemu-devel@nongnu.org; Tue, 06 Jul 2021 11:07:19 -0400 Received: by mail-wm1-x335.google.com with SMTP id r9-20020a7bc0890000b02901f347b31d55so2009957wmh.2 for ; Tue, 06 Jul 2021 08:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oS1S2allDRCwTqJLfgxd4YbJAktd2ptss87hkbFVJp0=; b=vd28U50abaB0K+EHlla1Z4ey6uf78Usr8ds32f7Ge058vfisF55SWoSk1jIg2YRtcC IywZyCY/cbk99+SqFKgKpGKboEtsdtN8Zjo8QrMjqxWytXpQqpJiHH/bXUjPsEYreyN/ djSvlXGaS/J7IgUZS62DtdvLC8MxPf7585ZvHRO2eDElOgV/ITqxjMiRWvb0lblt5T5I 6m+A+J/s9ZLPtK1o4vFjLAMxjvhGRoPxJ9LAD7dAOy0zNW9Hljh6KjMi9wlOPRHnlZhr CSOb2silf0/bqfyGiZkntSI3gP6VMY+CJvjUh0x87Ej2SpswDTBwu4Rf5j+DYDQwzus6 6P6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oS1S2allDRCwTqJLfgxd4YbJAktd2ptss87hkbFVJp0=; b=l2bNscW1c3CeMyWdSmYmLVrJ4kTFqs/sBgbKN+mqtB7B9PMYzHeQVGbQDaSewH2kyM QC4VOFFBOPWj6OkVb3ErLTI12Sl6a9Ryd+As7E0o4PQOqhKJWX1L083uY0ealZ/Y2Lio Yy4aEmIP9n0Gxzd5Kd+u4WV4vO84MeOD7ONUp/RWF42jPD734BUglrHS+glnFALAqZdf FyXTVX+vZUQ5QNMJFplqj3NF+OkjlO0e+v60GLSPvst6AlKVFwNdqQPVuijBsZitgPdu IotUy25hiiWqHbevPeSRrmMgJJLvSxlpM3yPtIObrzXThSV9oV98EsN3JfHIO3pxhWZP TJEw== X-Gm-Message-State: AOAM532R3QkPn/SMOs5pxDoArZ+CPNbhnaZibRdHZsFPaAbSA4Z2f2Q1 RqW45ThnACRk/wckN0VAjV06RQ== X-Received: by 2002:a05:600c:1992:: with SMTP id t18mr1316164wmq.165.1625584036134; Tue, 06 Jul 2021 08:07:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b12sm4783230wrt.78.2021.07.06.08.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 08:07:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E07F61FFBF; Tue, 6 Jul 2021 15:58:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins Date: Tue, 6 Jul 2021 15:58:17 +0100 Message-Id: <20210706145817.24109-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mahmoud Mandour Signed-off-by: Mahmoud Mandour Signed-off-by: Alex Bennée Message-Id: <20210623125458.450462-6-ma.mandourr@gmail.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index ee456e5fb4..77b304afac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2982,6 +2982,7 @@ F: include/tcg/ TCG Plugins M: Alex Bennée R: Alexandre Iooss +R: Mahmoud Mandour S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/