From patchwork Thu Jul 8 19:09: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: 471306 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp583486jao; Thu, 8 Jul 2021 12:26:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyntsY5nrs8F10BumOWxg7PzVI/0CKn3a48Wef1dMnCz3SL3NE7dAuS4bNfaraYS/ijfSnt X-Received: by 2002:ab0:7443:: with SMTP id p3mr12422780uaq.138.1625772410462; Thu, 08 Jul 2021 12:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772410; cv=none; d=google.com; s=arc-20160816; b=ktwt6DwjGFicBjCAfkMP+zchCJ1Ukg0ug6Y82rQ6OsWolmQ0B0CFV7CnmzE0TStsKi rEuvmc2DS3MgJg2bAxGhFkToUu/IK2nNKLvVXsGM788Fd7E4ngH3KpEIGGATPeE14Rye +lYPR+eWeTRjWxt6eRXPToO+uy40XH3ofDVpp2Z8WlQAg79ouqt+qyCWrefg653/z1Wh L3LhCRT5IWz9NX04sW01jYo73tyRkpZhvWeOZ5FfyeIxo4yW0cmUB1D+tVbuHc1WweqZ XnbAdxdUCez8WA0oEJU4tdn8JNN/0Ehwjl+Htg7Y8R+f0vrsohK8LSVnGyF2MMkKQIIL y31A== 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=MLdV7D9OlqSTuFzcbPT+JIp5QUZWwzoPSwdLEIDdGs/39jSP7GMP4otyOau0Vy43ZJ mxgKNOtO72xdQ2QNqIZ885eD0jd8SaEgG+GFh5IUYosKgS2lRCXA90EStjQ/8hhU8Xzn zLLIS33L9gRyfgVPXfYLYGyyxEgOfF2KXZPAuHNJBFuj7shHgMpOPo3PLuq0Etj+xxOb PsAT4XZnPKH0wbvUleiKCRtcO8M7Ej84N27it4pxn7CokmdlAbdt43Gw0qHnavGer/kD CANlqnYXx9TIT/Aq5n8XQpm9t62nNH8J+EY5ReQ/liiU24KamlPWTs9D5hghZj40vxyS FdZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="C/nviRfe"; 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 b29si2364505vsj.184.2021.07.08.12.26.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:26:50 -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="C/nviRfe"; 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]:45066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zfd-000407-OT for patch@linaro.org; Thu, 08 Jul 2021 15:26:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPC-0003Iw-7h for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:50 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:36370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZP8-0004jt-Ho for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:49 -0400 Received: by mail-wm1-x329.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so21202970wmq.1 for ; Thu, 08 Jul 2021 12:09:44 -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=C/nviRfeDcgJeeurH3kL+2ILw8h62g0beVxDdngI7VyUnANssEXKcMRBmU+jsq25hG Hr0hSVbV6F2EHLG/lGUCzOKkIBd3jGV2Lp0lzSAH2qO97lsDIAON863Xo1j+oj2/4NMV lfVeHLsINJUA7GG8W98j81J1wGmZujqeo3+vEs5QjOLSZ3tlOyE2eUoRd5Fl5xqxsemF HBAd+mGMJqCetmt/tneaUfQsP9eBC+VcpBPFvqG+U/Apgy/hrX9AkLEdZmzwj9lTkMD7 LBtiX25jvjw8LDSOLPp5qaMJhtQXVAEuYslgj81Q3WjRIE8lEYna4DHSj5RBIICLYu5i Hmlg== 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=rW0BlP3YpGAi6Kai/RxMjJaJVvfn1rkrKD1wc57zDiQpRKAwnToc5pH/Zz1h3yOB3T ACq+kq3GbVL3QfQMFRhszuhVopJAgKtAelOdzzbW194Liw+XLNfwj1HMllCq+nc9giUx JFcVruDdp+gh0nCSDoGv2emEB9RNGrtuvnctkwr5tSeGs6ly0dqqTAJWikUrjgzD486w vyFb0/KB//jOvDwGPfdOEMQzcYjrH9Rpp78oYJTX9rdLWI0OJn639u6SvzXlaDTGZqq3 0JjwWf7eaWtgaHBRXM+6T/aD4+qhK7XT0muhiKFTKFB62MB12JNQmW+LmIb6zRHQLMk0 KF9A== X-Gm-Message-State: AOAM533envM7oueEqHU/gHmDpIYRidDVXGBjMjJxxWNlc2qaOVTNMKUP 1FVaGuuM7lleriWBBT1D7xgZfg== X-Received: by 2002:a1c:cc17:: with SMTP id h23mr34250831wmb.129.1625771383239; Thu, 08 Jul 2021 12:09:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h21sm2733904wmq.38.2021.07.08.12.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F0F241FF87; Thu, 8 Jul 2021 20:09:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/39] Jobs based on custom runners: documentation and configuration placeholder Date: Thu, 8 Jul 2021 20:09:03 +0100 Message-Id: <20210708190941.16980-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471298 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp574738jao; Thu, 8 Jul 2021 12:14:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuKdef8sdVeQt8emQZhW2NRTiMdknuhmYhAfSNrOmdatPK462lcyNP/I41XSaxcbC1m8Kd X-Received: by 2002:a05:6402:2023:: with SMTP id ay3mr824183edb.383.1625771650546; Thu, 08 Jul 2021 12:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771650; cv=none; d=google.com; s=arc-20160816; b=VgW5ywnZdtPsinvg3KG9aSrnZvB/2JUhmKGtcBuw4jvoeNwpR4LI/zZXmPM9vnYArH KI5BD1+2fj+6dl1eWpLzEW7OO++1uz3+MkSwYfye2gWVq60Vbkp0TAlCBhDxeCHtPB3S N+gB4i2iTy2oC+nJhwafEUFD4cq8eS69tTxhlbtiAMVw0qlFefZ2OWezJxfllllHhYTB 0OJa/vWXYggGPHSgh11ZweiF8UWKMkKIr85aF6y8Zm2cspmtaKGQ7BfE2JcnswvZygjU ndwh/d+lJxvaxACCWyfwNcA4wxIg0bLiDnZKpfYZG5A2C1pHYxhfkfHSC9P/igKRXjg8 PIjw== 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=UVw5FXV5bRNaO0ftruM3SXAze5E6Vq5dcYFjk6iiUEVRNzrIzQO4ZhevF2a0xJlEaG 2olsFmNSQxvEAvnxYFueR/b6n0hd4YlEcBrnfZcN21NMWSnBFp+XqQ99kCM9uG2JoomD eqRUV8t9RvjSWUXolk6n6RSuVZ8AggnmUJFwAQpnmL82651vMx8lTT4g+aj1gJa0vzIq Kk0mMFDpZr8RSbdxK5ByL42KPNEtGMzOmd8yInqJEGUXOWj5zc7QycK174akjTz8MdV6 3iLAnF895eGaaPfcF7ul2H/EfjP+UYEq4UnASatVynxIfPLMq1Xi0wJYE2Sh89GLK0Pz S8cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tFxdptWL; 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 9si4025545ejg.681.2021.07.08.12.14.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:14: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=tFxdptWL; 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]:35536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZTN-0003Cm-EF for patch@linaro.org; Thu, 08 Jul 2021 15:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPE-0003Ma-E0 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:53 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:53022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZP9-0004kS-V8 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:52 -0400 Received: by mail-wm1-x32c.google.com with SMTP id g10so4777736wmh.2 for ; Thu, 08 Jul 2021 12:09:46 -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=tFxdptWLzcO6m8Gts5o2DtHlyRTHEpMqSeKAfywSTyhQQYzlbj7uCol+EwMhkS4Ubv VqLLZ42RgD0wUfV3ygvvEsy1JLeaHNgKv8kz5bk8EpB6IzG6OXQ/R2DMgVHtjDHoQHJQ PiuC+HLDAv27vD9BmCWpdy0NtCRAyae6ivasyBi9ywlCkvOHjUmZ8MuV4ME+Ay3JyZKz AiiHEvPqXn/4b/ODQsSVItmOtd46lRlP0HIljMT5IWL7/5bIr8O7E/8dvirR2l+w4NHY Ic5CZTAlcrkgbGNNBZSXxiPK+o81KR301ySGp86Mn35cSItIywWB7rDcVI+YuvY3IJlY E1fQ== 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=kO1tscAqLIsOUy9hDbc7dT2YP6IcSYiVJBOSDRWLQ3+Og7SJTxr9BytIIwZIvJjoGE 8D7hFvjmHokrT9Nuiadotg49h9tmBAQYzcEb2IX8k5JCNetTsnr/X4iiyM9l5P2ER7+O LVHiKz/agyMiMgnURi9xsARUUtoeKLZXVR1MPJmHc/aAc9cgXGSZMztKFqpqhzIHHoc8 dlAbsNC/UIS8terL446n4XCJTuWmDzkbLyCPGE94Byp51AP+LB3W/2H+BVg70K2ZTaH/ EazbaFGszBmuoRN6Q9gTYLnCFbPlAxw/ALzpkqN+Bn1HHvqC5wfm0ojzwnbJU25W+U7R 76NA== X-Gm-Message-State: AOAM532Gzc4JRYRIo9gbN1HRk+PNZJdXL3z2KLwXYe7xFE/JFNO+KGyh nlqYnv13Ixsd6qgO0fCdGNA1pA== X-Received: by 2002:a05:600c:358d:: with SMTP id p13mr7244424wmq.12.1625771385701; Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f5sm2962867wrg.67.2021.07.08.12.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1B7DD1FF8C; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/39] Jobs based on custom runners: build environment docs and playbook Date: Thu, 8 Jul 2021 20:09:04 +0100 Message-Id: <20210708190941.16980-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471296 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp572763jao; Thu, 8 Jul 2021 12:11:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFKmbFOxnzr3rjBDP/CwSrf70thfrZDIEa7PagVqe9K6JvAe3T7VNBaj/BlgD/xZJYoKkw X-Received: by 2002:a17:907:3e0a:: with SMTP id hp10mr32763275ejc.110.1625771482529; Thu, 08 Jul 2021 12:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771482; cv=none; d=google.com; s=arc-20160816; b=ajPugdhZNY/F1b0gWz1OYH75EbXx5MXZk8UhlA4H3JxLoXzxipWe4qdDwCQwvLKYHu Ti897Y4jxUtqgDpkKUrvIolCvy8Fq2L9Eg7sDIvi5SDObbXui+IXUomNWnWvcbg05PX2 wRotCMTZOn135ewDmyfgMf9WW4s+0z/GhVfusnT1C0z0TfMdlGY8YDXxB0fJaGkbaAba 6OjoEmy96LHfdpLDxbQbYErLZwRJV1CoSGfjq8gtyuP9i87ayCWlbxHNBAwEeDrc9tKZ KO7N17dVKSa8E6OWDyhrn9NMzwWctA0yj3sebeNw/2PzwbGlxfELcn870sI0H2dnOzEi pOZA== 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=mvwm90yCgNkKVJcTg7FVc6MPczerB64BRXbt6KT3H3Kzjehz9VlHObirwUxKqcSyyL 9jwwFffUmpp+38FbKJXWZbsumg2XRuIO7kJjFBPHVXuphdnVFEaP7O3M7BMcHv0XLmX9 KHFjdaQfxuYZLNmKBkpcov6r3uMYkEVwfU1GpyV0ld9Phaxt5Xy7q48q7L/hUZ2q2TUR 9Jl3TJM5C45lUD6U2tJhFIt8XsA3PxWXyfmnpcRl+MCbgILi9J2TODvNSD9PAJsH1flq CIlqP43t/aOdGTcU7cSfQcEWBhheqTCVdBmnF8Db02Wl6r6NrLn1EDtsnOe+uiUHpl4Z lRqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KLoYWHxu; 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 w18si4098606edd.302.2021.07.08.12.11.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:11:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KLoYWHxu; 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]:51540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZQf-0003SF-FK for patch@linaro.org; Thu, 08 Jul 2021 15:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPH-0003PJ-B7 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:55 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:37886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPA-0004ld-0c for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:55 -0400 Received: by mail-wm1-x32f.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so4297512wmi.2 for ; Thu, 08 Jul 2021 12:09:47 -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=KLoYWHxugFZl1M+bps1v+BcrySfgim4ZvP2dNSKd/+cYxzJuVWLEqc8vRuktadWwiB mkj9rZ1K9yMZ1S4BQTJQt+nsDHoSvIFBvHe0XIk+GXYm/3qCSVDOSs0gIXXcQYuCkt0B 15UVJw3rSEU0PC05KLV1STH4jNLQdAlDuL0UDnsVwaFsd7suSTSSTPgMOnPnMO52/aCj Z2YwZSmYmNdHTPFfZA2jicLSxUmRk1aFvDzyKPDIWDKWJht5U/1FxkLvV1kbGUEhpAqs h9jSOeAUjHdwEr6ALlzEtqc1bLdDT8vO9DjIuWVc8cuBR55qXOhs7fciGfV/PYSqhRwi KQvw== 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=FNUvkctE7OVYRlrJzmGxTUJZev0Lj6MTdL4AV92b6ZJ1mq84bVQR8MJ1tgAbZCyTJg PsU38TnmjCzv0dOefbU4S+oCx4bHf9hjWNdx4lkbXQRxCUWJYKDMan7cYkJ3eWygotTz Elx1g/H5AJj/bMeqSTV7GYJ3Nt94uSrPEbmettEkDvxcsHn1heOa/ySTpK9Djyx2Ctpz jNYsfxJnLmJ2LPTlgJ+aV/iUolkcNWjj2zVOlxIs+mzVgZEhjOY7kfgM21jytH0c4la9 QpBZ3jaOAjjewXi6Kx1vwaYdBLBWp2WMW/XDwoj4LwkvmlJoua/wBZHDlB0xZEgX8+Nf ztjw== X-Gm-Message-State: AOAM530NmD8pi8Jq+AIXP3KH9LrXC9DlhC6yFs1CeX03uXtm7E3QCW5b CQa7JiPzShpqpXxguBXXcr+d3A== X-Received: by 2002:a1c:ac87:: with SMTP id v129mr7263223wme.45.1625771386693; Thu, 08 Jul 2021 12:09:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h13sm3097122wrs.68.2021.07.08.12.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3A4231FF8F; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Thu, 8 Jul 2021 20:09:05 +0100 Message-Id: <20210708190941.16980-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471300 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp576574jao; Thu, 8 Jul 2021 12:16:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3OyvjrB3GV8BEX4+yLiSh+BdrwYk8iMiN5hEClB0tWmKd4W1gCTQPOYmBCYTWEii5Y9xk X-Received: by 2002:a17:906:b18d:: with SMTP id w13mr32691480ejy.341.1625771816995; Thu, 08 Jul 2021 12:16:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771816; cv=none; d=google.com; s=arc-20160816; b=Z2Im8UQpUD/qlwWZ8CeZwGQK7ffThQz+nb1ksus7/p3rB797OzrILaRFneZryj2qfz ZqJl+IZGP9C/DrEeoZiCDxIZxCnIxRLSOs5aoieDyDrBJSlptlTunfm4trzAOJ9b5W51 xKxPm78gPElM1UzE9hQn3QWvoSKKvpuvlMafmUm9Hi9SMZelmhFA3oyhIvhBTRLMFPF+ 9HC0ZmUsqbp8T0U8Pnry5xEvfT6Mpl0i77H4kL7FwW+qa7bDNXszlNrQFsKeHFnwYS+U TzsX006EQ5387x79C68X8sL4ZLYRfqs53/iqI7UCDTOVL5awOPKcHV9UN51RM+0FmKD8 3+AQ== 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=KXTnm7SiTPshTzrn5DG8eZ9KTdpcISXoAgd22eWtbbTWwZB2ZbBZK6t4DtQLPIfll/ 1PSF5J0M8OAbvT97hRx3gAlfwFmbULJjHt4IF/+O5SyOFEH6BTlGynyIVQDLycTl0csa GiPopBci77NNNLQLrAJJiCJSlNgqWg5XWACWqCSktDoJANTpgLvv6ptevUJV+jVhmhKY QvDRUev4A42kUje+ALg+WpRR55TV2pPr6X0ZM9hDagmpv3AzU6ecdat7q3O/8COjqUuT iGoYhSMgubIwecHnUvKPBhyUbGpNlCD7zd4luAajX/QczKZO2YaWbT3lRunXPTbJtEEM FyyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TypCUMPz; 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 j3si3787293ejj.516.2021.07.08.12.16.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:16: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=TypCUMPz; 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]:44112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZW3-0000UW-Ma for patch@linaro.org; Thu, 08 Jul 2021 15:16:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPF-0003Nn-M3 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:53 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPC-0004mb-4G for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:53 -0400 Received: by mail-wr1-x430.google.com with SMTP id v5so8869978wrt.3 for ; Thu, 08 Jul 2021 12:09:49 -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=TypCUMPzEwJ3C1lw1GlZJs8x+AjG8qQKXexnBpvurQLT+Bzut8BMrMVN2t6Om5Xbsq W1EnRw2rW0EF2wkhm33iwq2aAOna9/Phd0FOjpxqnDNlYImivt3uvFaoujT3oYnkTW8I caiPCRYpMPpIWvsoJ/LGX1/VYbya+hZa4mLDJ/7qn0vjTuvafHgHZdyFJLm6bElQ/ivJ BgHSDWlzCc1AL2Abc54kkRRtbeJ/e/hrkwdutyG4CgSs84FPHw0gJc5ZdpxfJrs3kcVq GgsLAQF5mF4FWaUyqwETf6dqxyn66eRh62nyFWnJXyXx11h7B016n+WwYmEzOxzpGXBA C36w== 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=ualOW+U13rRMkvogqaonjuaHhlhMm9tesz33X0qr1jHoy3m3d7gCyJjXaZSYgM1Xse 6G5Qvr2PJDg3WyA1BieAS+tfn4nH9FIfqLcmN5QWfhoToM5iZqtDytmP89of7F1fC0ee LqkvqUvnFcx4H6nJNqcl+JpjmJoFo3Eezjn00tYEub3SQ9zCE/8zFSXuL1UEqCfGxedw hU0EAMRzjRA798Iikv+rfdexHFMAm6HkqfkSF2pXOBdHeS0Mp9kz11R0FSlbjUVY5DFc xF7IZBZGSvKED8wxAYOVFQKo47tfcKG1jK0L4CYw4RYM2UmBNWDLoIFqk4uzqNXbdbUv LsaA== X-Gm-Message-State: AOAM530ute5rva5W9ixDTm8OTdtVdG27U5tDjenzyJsub7rvyEUuR9pl iJmhcdz4Ty6hyJ0FjaHxlXptwA== X-Received: by 2002:a5d:4f01:: with SMTP id c1mr37489057wru.266.1625771388735; Thu, 08 Jul 2021 12:09:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f2sm3013440wrq.69.2021.07.08.12.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5300F1FF90; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Date: Thu, 8 Jul 2021 20:09:06 +0100 Message-Id: <20210708190941.16980-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471309 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp587666jao; Thu, 8 Jul 2021 12:32:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpqFikBUyomygjMb7sDBBdtZq98lHth10GRznOZC4OVM8pZ1KXy5jO7SFW7DJF5/AzlBEC X-Received: by 2002:aa7:d157:: with SMTP id r23mr9778057edo.127.1625772727432; Thu, 08 Jul 2021 12:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772727; cv=none; d=google.com; s=arc-20160816; b=MNfm+LUoc85qKvTfqeKF2TpQkaU0Jyxtp8BGIT4rM82RxacZ3ubJy5UZA9tquTdq5a jh+MjdsOnJ6Z4TEQmGJkgRuwcLs6C6EivQchKGelqIcVzyzuBsR7I8VhQnUmuO8eaeJX BNgIjPkx5R02Ku/KfLAogq+Dc9+A3b7gtuWKsJHP2rdtLMTwp5oSr5gnRS1WcWrY5bn7 Y2AWX21c86c0bL1Vp/tqYOe+uO/w6a2Uvxj5/X0zlnzQlws8P0V1FryoMUcoGeV716DH twrxlyWdXu4V3E4Tgz5PHeP1DJAaX3RitzuxWH5A/U5TYRe3m1sjmOWBAeUzhFx4Tx4q Lekw== 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=+XD6CUR2a54j4OIpwStnjx10263sXMuG0XSNJjuriUo=; b=wAwqVJd9/mGFVu1KKnLPXkE1orlaVDyKP6uzMbiK5kN/Xs6/4/fwXtZDGM5vvy11Sa qOdNdAHuSbNuzfwMwwWFh+HRpxtiAuIdRGSnwtxAtBms55Bx3WFj3IF4FylDJwWIYCSj nkEoCrA0BrO70bFP6iTnv2Ntp1E+UxLAhIQFY6TCwApvpzTF/ZghPTeoOGIwD+sUX0gS s0F4sTkBqXLj5Ida+qU/yMUIGMUN2bhuL5FxvpA8BtfqQbub5xt9BN3IAYsCgAE+H6RH HK5GemDqlKbWmyam9pm7wOn5Rf58aw7yJ/jgbpmA2wAuk7Ng3RnEek3I8qNTPieokKas VUQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yeuAdAeZ; 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 p4si4697334edj.420.2021.07.08.12.32.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:32:07 -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=yeuAdAeZ; 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]:53850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zkk-0002EC-Eb for patch@linaro.org; Thu, 08 Jul 2021 15:32:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPI-0003Ra-Ih for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:56 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPF-0004nB-DK for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id i8so8804230wrp.12 for ; Thu, 08 Jul 2021 12:09:52 -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=+XD6CUR2a54j4OIpwStnjx10263sXMuG0XSNJjuriUo=; b=yeuAdAeZadIxxWLxr+KqbD8+LNyF5PoQ6GTr1B7/Fq6s9QLnsdXzM+wgVvHjJQIHlA jmPpBsSFcrUVhwHm2YkjW8wVGl9CVqJgaZDyOWUtW/3FexpicFbVRePTmXVgQpBFb9W2 U3A/oZpYvS/NoLWkhplQSEBUlNjnQDsSJHOUiV+qq1TU1f2SC77YZZ8yjAJlDtPViTkD j+lWkyPbdlUbalO4kzbf2u3Nn7jAbWQDyj1Mjr+hLyNFE6TIsjk6guiv7K7FXodZK5Oe UirYa4A3AatMbRQnkVpNUgtgFSZK2I7jKw60Fsl+mAAdEQ+sWM1AdMZK5+gh/FHATjaS qy9w== 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=+XD6CUR2a54j4OIpwStnjx10263sXMuG0XSNJjuriUo=; b=k1I5sbHnJj6K/qOsFS9PiXFoVz5ChNkLeA/N0SPSOwszoIgwSGU/DwBaOkoNYY5lQd ZN4PNcrxrffY+8V+jN0WkWoJ83bk83FrUhMWv8eE3emeOuNz+46GTA0KcuGE1jPD1Hg8 8djl5WcsVp2oOWMjl3QYUplOHud46PVKP45VU0uWyPHUtNd11fXCi7PrcnoC9sgh/sii EY1f3Gh+grFdRLX00L0DJhk8pLS3PPELoH2n47x3Cq61XU1GS1v5da6yH998qsn1mAhf L7Ab89WgOHA55KtYwQcXRLhqf7y8mARuR5PzXLrRA6hO47iCtGMCVHim3khqNx6ZogDt wM+g== X-Gm-Message-State: AOAM5311pD8CEGPpTmwrJnOOyFxur8kB7ObDYRad0e4iM28tTPrKNvts lnN0zxxRJo1p+JD/R0wzKuSDvg== X-Received: by 2002:a05:6000:2a8:: with SMTP id l8mr28076887wry.417.1625771391798; Thu, 08 Jul 2021 12:09:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z3sm3554832wrv.45.2021.07.08.12.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6ADA81FF91; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/39] tests/tcg: also disable the signals test for plugins Date: Thu, 8 Jul 2021 20:09:07 +0100 Message-Id: <20210708190941.16980-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will be more important when plugins is enabled by default. Fixes: eba61056e4 ("tests/tcg: generalise the disabling of the signals test") Signed-off-by: Alex Bennée --- tests/tcg/multiarch/Makefile.target | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index d57a115873..85a6fb7a2e 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -37,6 +37,8 @@ signals: LDFLAGS+=-lrt -lpthread run-signals: signals $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso support") +run-plugin-signals-with-%: + $(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 From patchwork Thu Jul 8 19:09: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: 471302 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp579170jao; Thu, 8 Jul 2021 12:21:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvQgLNG3W15u82Ll6G8Uet7hbUU+5sbIdwGtlCmLrtHoOd6b6usDPeU/yALqU+gw2BRgBw X-Received: by 2002:a17:907:1c1b:: with SMTP id nc27mr22605569ejc.294.1625772064224; Thu, 08 Jul 2021 12:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772064; cv=none; d=google.com; s=arc-20160816; b=UU4w0lBYx0teCg0cetvFYn5qgXR3SV104sz8mLQoI970v0oP6W8EvYUXGSm6ONGagE 8qKkW4A1XahPWBbutoOcZIifK5CHt2gx9IAIjxJWbNMR39VLUwXDylIpsDRVZzqVnnkV oLJH6YTpmUSTL+n5oij9NhZlEx7jlkaDQyPqvdU1xXbLrplSQS3HR9XOvnJvDVvb8/As 3A7aFUNlsEQRIZUJ5+xF/7ln/os5ZhwdNirQmRIOhBplVadmmT9vyMUlglmERW7DdIyY +hkA1Bm43dsqJs5JY/GNV+7YNseGayf8RP8uq7p1CltiofHhsJCbDaWR+LRMrku+2C5G aHEA== 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=mT3mcqLOAnApKtAKtETbhg88KZBSfVR94gAjCWER5/RoHgBA8Hs8B+q9P7dV/BNjik XcKVqMNujcuXt9dysNqhMRsJQ+EZ8aEFnGxsdhtU983T9lbuCJy/sL0xci+MfdUI1sMQ fkt+97QIkDjhpit8A3qVurlDfOLmP1hZXqt3xirtvf5JXk2XrbJEjTQ0VnYq++GsXy0m 1D+XbjX4dSzywBC1WjGBEun0nAh4GnfEaGPLf2u8t5JzEZ6RhIgATOIYEoyzVoftUsKc DJpZmG8LFFTqeXLpkfIo+eo0QJAwdjR8XnIfHgwenL44HmJS7Lj6RK0zizSd3XBMBBUY 8ZlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AukL+zxr; 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 cx24si3905756edb.114.2021.07.08.12.21.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:21:04 -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=AukL+zxr; 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]:55834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Za3-0008Ga-3t for patch@linaro.org; Thu, 08 Jul 2021 15:21:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPJ-0003SX-9h for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:57 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:46948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPF-0004n9-CT for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:57 -0400 Received: by mail-wm1-x32e.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so4709267wms.5 for ; Thu, 08 Jul 2021 12:09:52 -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=AukL+zxr98vjE78dHRflnNM72T2N4ziy1hDnwtQHmq4X8CJFJHZDR2E6vVIjTzx6Wn 2ynoAEIttMwJl+NsV6zJ09I0KenrLf9iSfSWDB+s2VFKlMZS4c5cQ2/o6W/6uFF4GqqG 1L/uTw43L1r90H6hmYEaEeU/d/+L64aCDaFzaWpZslruPAAFy42XQ2d1jmf0p74RZ5E6 QhDiHUbmGRZG23SnKkGsqeKsgd98dsbvmq8LIaNTUN0mKjmo9IVyH2ZePe13FxVI8Nzy R+Qhd71UOTnAjEberw0usUP//zf3y4soMTRLixrallFPm9mSo99uA52aQYdntzaspXgT ax8Q== 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=BMy9xbdhHD0RBT3ssYO+mrKCKKmN4esK0o/GVngqu0jGIFNwcPt1aQ+T7JSI5LlZtT rlMIMMIClecYxlUP08HCO5oY+hwFKiHBNovNGayIqTI+3yqeH3TSyFy/YTvyV88OlULy 3UOo9/yjkW4p3AzjjMGb55YnpHuq619Pp780lRU+OI7b+UKhhkR1v4SwvK9SkiVIgsWT LSDgrQBHrQTC3p+idqgsoJ3/qG576qg2rsHKpydNxlwKxOqNRts8vjLGM7it5eABIQdR s7aRNH2HmiBMCAGFnl2FCBlSrG4+SFQUADmwTqBBo9StDUx4UdYCHP4Ui1DBnthCdlZv wpnw== X-Gm-Message-State: AOAM530RDNw2vKvicnJ15d6Jss3ouSX9KHfqN3cQbVUkDWBohhNsum9D gPfnmaMOESFVrNjFG1w4QQuVGQ== X-Received: by 2002:a05:600c:b48:: with SMTP id k8mr7089444wmr.180.1625771391276; Thu, 08 Jul 2021 12:09:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b12sm3026194wrx.60.2021.07.08.12.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 828741FF92; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/39] build: validate that system capstone works before using it Date: Thu, 8 Jul 2021 20:09:08 +0100 Message-Id: <20210708190941.16980-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , 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 Reviewed-by: Richard Henderson 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 Thu Jul 8 19:09: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: 471311 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp589794jao; Thu, 8 Jul 2021 12:34:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx41FySIlpdWjCcI03I+oWBKF/R8Wd9TcGzZ7c28bnZVw/PdxrloeUEst6gPXMJAJw0RdWZ X-Received: by 2002:a0c:ecc5:: with SMTP id o5mr3136062qvq.40.1625772899397; Thu, 08 Jul 2021 12:34:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772899; cv=none; d=google.com; s=arc-20160816; b=pw21yckifXAxEAkchP4PXBEelSOJSSSxZ8sU+pfceFmIPSJ9ICSkPTftPR0iSvc1S4 FNH4XOUUthwJth9AIoPURhOe0Eqgk329tVlLtq0oCGjkI2O6HhHnnS2acGRE/TfAlh2y DsHlomZLzz1zKIZ3dFOK5mOEE1EhCJCRpFnMHpSbW+cpCt9LohY1NqE85bi7FjEfMq8X /tgrhxd5g7ROFT8cbHoH4bjU+gEzzmlKEbSbq3Ml35EFsAfqIEcQD1uipVi2UIeDIl/H 4hHIy+yGtpHnzt6usFJpnnWpeDjBL6WQeKS7uI/0r1RbxsEnZTJpnINXUBqbGK8rHywJ RgEw== 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=mCQohR+2FsTqeIzdPIK6pnNCI4Q+VeNJlOhT/Xwxisyql61H9KJVVyv99qxEk9sEcq HJjaomsZOaebqCB3c4gt5l7fFdMHxWGa9Bp61lzDxfv5T5XI+nrwoikUjnwu6XKie+TN ZpOgJKcadDdm5Iowv4ZP+NNduY95MmUM12PKKJvDNo9eX7rHZpzRBWuuzxLOg7MhtzrB ZTmAeGQczrwAeWZys0Q8lt+pbhOAovBNwLkjdtnWVdAr082HPUWHIrXkoC06NFdg5ToP V7F0abAhT00q//gL1pazCdcta4f+wiQcvlhsorc33vIbKfr3Aoz57/knilGDrKNh5L5G roEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cqA3fOHn; 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 d11si2506845qkj.298.2021.07.08.12.34.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:34:59 -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=cqA3fOHn; 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]:34306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZnW-0008V7-LG for patch@linaro.org; Thu, 08 Jul 2021 15:34:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPK-0003Tn-1A for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:36543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPH-0004ns-3J for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:57 -0400 Received: by mail-wr1-x42f.google.com with SMTP id v5so8870273wrt.3 for ; Thu, 08 Jul 2021 12:09:54 -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=cqA3fOHnxTL/ZjZEdyiImXYYHs2raQA6Cy5rDj7uJZqJi7Dl/CksuxaRLxV9uk3zvj jGbkq6Q7msUnVnzTcNWWnVreYbvUo7V7G/O25kQkCEWUl5RpHOA2Aii4e+na9/yCjVSB bfeU+0IMkammI3PtBxeImsFp4WIafKD+dPG9Ub8IHazH7hwTXZLG1kcghuS8KUCsItKO vhr7MKgpZjx84W1qpBE6FPaXS0ITDroI+uxpRYh8EDneySCtv43sU+YED40EhuJLTA2j 6ZOSayqUPbtdFxxCXSo0MMxF0966WJA9x4dOu9n3VjCHxqRW4aCrPrhzVjc6RQuWsNf6 qBkw== 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=t2NOgYAiLoAwatcGnPoiSU64Ex0aD3qlDmQWexaiw8RZ6HpI8p75BFrlCycRUD/QCh mQjwPsvi6jnKKQgW5ehtdnjpA0vsKPWAWfTcOmFa+372mjSBRnwlijCfpdYYMLfWHuTf SKNzEi3dWvWgIgGLkoiICTAk2p7sqgv2xuQcpNrFhkXXjPgJPQAYYCC2ep/tG688zpvY 3WZ78LGeHjTJQpphRO2g+kHJ0b03ONn4Gk19dgPOfzY/Ltwg13JHabn7Lmm4yye5BLM4 VrhP68EZ8Egd17I8nCDfMMa8CbQMApGPwdvjbQ1egnt5ffInb8Xr01j/cT+JO4/X84EE 9nBQ== X-Gm-Message-State: AOAM530u15fPPL662cUVB5/e8tFLmIMAH3fQ96CACMGFF0eV/dnRFSW9 teUBXMFokzwFMFpeYEqmp8BZSeDzeZeQlg== X-Received: by 2002:a5d:4e05:: with SMTP id p5mr8976917wrt.322.1625771393675; Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm3109031wmq.14.2021.07.08.12.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B06461FF93; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Thu, 8 Jul 2021 20:09:09 +0100 Message-Id: <20210708190941.16980-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09:10 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: 471297 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp574545jao; Thu, 8 Jul 2021 12:13:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+Mr42vY0NyM58Z2tKTMwtsO5+KjkxB4RJK3JZYdqAbxY+u1d7AQ3I3gvQvbikW/Q/dyKB X-Received: by 2002:adf:b307:: with SMTP id j7mr12790537wrd.243.1625771636929; Thu, 08 Jul 2021 12:13:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771636; cv=none; d=google.com; s=arc-20160816; b=oXHKokHmquOrRoYU9jCKxnu9iHK253mA6ZGxaz00YAn/dyYiPGMSlvbeF/XnciunT+ AqPkexy8P2gGTrzRi8xJcI3GYBnlwoy4EboAcONNQPY+9rruqDcxiVQxpLX7iGoo+F6j X1j2xKT85pPG2Kqqvi1i39/d8kPMTOVFjvb/nLX5IY6yRi2dsRzucSGae0dmHxK67Ox4 3XADzm+fO7MqinWwWYWlH/u5Q16itVTrtO0klKcrpN0QtEuRPrzJDxU3d39BJKz8JIuc yizqQYzDAcxbTLHNIbtkg1s2B1oI0lDbebSe5XEXP5L2IW62jhn8RGVIh4pqOA0rtyel wfCg== 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=OVBt7+1XoBauLCOAGu5t1sSz9NGQLazDf2e1dRwLr8TpNcgMl1R1Q2EbVX32hXDAiv a4O5mIlSKnaVazBquKJPkjkujdTVwjSTHWLB+yEmf1uo9qLorDAVYKx87kcm4y29Hcxq uYLosSssCGDMTKOmbp0aOCEHkADnoXjxNnMAyeVDUehHkPOHlOtqnFnZXxeYUF6KagQU dKBhFHf/KcHmrIvaakdIFCwLzmEiwd39znr1PKa/zOsczizecLOgLuUZEvl+FeXadEcw ZY+XXhM4/tdSq2aU/K4uqK2EdbuOsXIjd7FeNjxGp0AG7VufwJaRoMmjUF6d0muul/Ul 6Kmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lZC3WKeu; 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 d15si4550977wrr.316.2021.07.08.12.13.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:13: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=lZC3WKeu; 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]:60408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZT9-0000yl-WD for patch@linaro.org; Thu, 08 Jul 2021 15:13:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPH-0003Q7-Pj for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:55 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37834) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPE-0004mj-4z for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i94so8843211wri.4 for ; Thu, 08 Jul 2021 12:09:50 -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=lZC3WKeuVUh9oqyvFyl2h2nSMoipfcWUFZO//z587J60hi+MXF8o2PcQL9SgfPA4bv xtQrOhu2RLUyz6y0aRXA78dUjRyja2CTrSFjnI7GvhZ52zy89Bk7X/MN4eyt4s0XZ5/o 9/hRHy9bIpXkM0m2ayaamH5eRdDYbHpLT/MRRdonLi5zp4o+m44pHgTYCHAf50gIo2CZ adCTKLn+RqQR1u+yAtYbiDd+KaJOoOcx29/xWW8V3BVRDUA3XSqOm9IL4oCQRVgHBLDk GBH/V3Bq6GYFzTpT1P32nv6sq3PNCKXj6h8lGalNZll8rUQbgwyX8P/wgyGJ7rIww8jP qO9g== 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=AGzSei+mcduaKcwlT8JJPd1RuA3B2juUGj1FoDlOCvM22ef8p1nupFJdyIh3uVLbw/ 5U1pOKE1PmMdFcQ3ABOnk5QzpYMAw4ecWpXc/k7iwhiie/aNpQSFJHo5v70fYT/0FfyV 0AZgR8JI1PXoD5mKyEvTxxLyDDBaOGQdYEx/jVkC6UZr4CLYRJO7zEv9xSnhsM6if4R0 qCXNTBEVXYT3rRwqeRnbFL8KMxKyQ8vjAO0kPUVPOFjGtVtrA3LjBYxt2fHDUOt50VgY HBac5LH7PdphrudW8lSmKa5tQ4SqIIuG2hZI7P60hjG8LOaa5xZkfqHKoBpyTdiesYM1 5lnw== X-Gm-Message-State: AOAM532AxL+3Hp3nSpFB5wPuaeoqUxRxDZGs3rmv5oHplqegcKrcLH+l cmDnx1JlLOCRg6Q6nlO0bJXV/w== X-Received: by 2002:a05:6000:50f:: with SMTP id a15mr30277578wrf.108.1625771389656; Thu, 08 Jul 2021 12:09:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o7sm3570695wrv.72.2021.07.08.12.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C76611FF96; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/39] cirrus: delete FreeBSD and macOS jobs Date: Thu, 8 Jul 2021 20:09:10 +0100 Message-Id: <20210708190941.16980-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Ed Maste , Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Li-Wen Hsu , aurelien@aurel32.net, Yonggang Luo 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 Thu Jul 8 19:09: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: 471314 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp590982jao; Thu, 8 Jul 2021 12:36:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEeg6D9KCZLApldbYrkXsjozV71mLCJR9NZTheCbr/d9bcIiH3vZk/g63iEmf2k/423pmf X-Received: by 2002:a67:ee87:: with SMTP id n7mr30605632vsp.29.1625773004317; Thu, 08 Jul 2021 12:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773004; cv=none; d=google.com; s=arc-20160816; b=uJ1n/JSaUoIlh/4X8QH/iyVBJeGZDXYxJfP3MbMvmpvWIKzskMUbAJ1lVyLkN0kocO QK5aOlizOYifwookegbEOHznqnGKbPYBg/H0g8MgWmvirZ5QS3wOt8fQa2NG1ax9GyVD ANKBEBV5Dp3rd9AInb3VjIZbPNScsFxLZig2vGL+MzR1GIffbhrs5CmuixcbVE2hXaX+ 1VhoP/WhkLWsMIIPZj8+qsaDLXD6BWIvAA4vALgGcVfx97KBnVYQhW6CvbbdiUnq5ZHS HKzDwOFyDlRkR3tUcP394nGwI5tH2BxHxiMw8ZFcXYjPEKuAmRpTejVquPaOGsAC/tGD Lokg== 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=KR17SJUQxJWmVC3pvxL7LoyywCTIRriliMRehs+dcizQC7e9Y5E5L9sDi8v2adzxnd UlptTFK3KWUTdcVbfsTmBotZv/75eHS619TuseCbbLGfZCohJheQGIA4zBwtSE5eJsqd q9tbPatXJP2o/g+9MhcDsvUCF6pgcWu0A3mH3B0lANlqm43nPwGavcYdUlyQKS4BlGVt 3JWd6q/hkXbIjH55/fVYgK3ziLjIK7v34IOH+C5PjbNlvoYXVvFdYSwD1zfUWYtlJEGV Rbatt2u5Xrqut1sWajW628YAPeIlwRm9wiy0sV5zm2l/M6VJf+5tLJUkhlbaRwsbyVS7 hSmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pwbir1ge; 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 u10si3895120uan.81.2021.07.08.12.36.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:36: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=pwbir1ge; 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]:42986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZpD-0005sk-KG for patch@linaro.org; Thu, 08 Jul 2021 15:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPU-0003bk-DZ for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:09 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:35686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPL-0004pu-VH for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:05 -0400 Received: by mail-wm1-x32d.google.com with SMTP id k31-20020a05600c1c9fb029021727d66d33so3210312wms.0 for ; Thu, 08 Jul 2021 12:09: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=oMFk17+lkx7R0jpd2CoasVTpsd/qUIiJBETPT7RG2V8=; b=pwbir1geun52fy35K9G3IsSMbOlwsjzSHW1ITfKuT8F7N5exY8W6KxuthP3/KNIgCR iOZ3ADECSmq1wZ9T1zqtFkErKQxCZotp5IigjTZKRuuOygjkkTEJmI5FHMNQmxlCdtM0 UM7cCbRNWHdFLx5flupUYN8SwXJ9Lga1OzOKzOfxuCc0t3zVMDF556kt6xnVefFVrwsU 4N4QfUVS3V7yWXmQVuF1h89/hvfQ3gEyoKHm979kXAOpEPpFiNjeDsytZfX/DDuqL0Qm KxY/0CEGsMpn0KUaITp/WlN/s7yOu0FT2kW2S9JSijBvqtXpBy9xG167qbVBnO5et4fW lFMQ== 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=WSLvo7CaG0X2rvE9AeDlAm4K7u3Laq7ipTqZXRbVUrQbxggUEwW8o+M1RYuqudHhEE Rxqw+gE8/IDoFOWBV+tHbZI/TquiBBmje5FAJA5L1w26JKDoT6pLyMQ/rfywCTrrdF0J Lw1ztHs+EWjIrfyYFo4MnVaKSCD7ZLH1KgrN+LtMypfmbLqASJRo0pzM1inl9BumF9UA JSgl50v1HoTv8JKTHDhKWPJb0+4U2ehPBTq0fe4/AmsN4F6tBNkSXAjlJvW3Tf1OE35q HwlFMH0WPaggmky5q/M2uVXjN4mCjUsq8UX3TPkVhrQRqJvyF/0guYQEs6XErPGPzKqC XVtg== X-Gm-Message-State: AOAM531FfgW4rLnoMVuDrcxTaSz4/QA+knJiFpJ8pomtwiXDJRVyMnHn qCbP7eEuDOwYVJKufJvkolhCqg== X-Received: by 2002:a05:600c:224a:: with SMTP id a10mr7100902wmm.7.1625771398621; Thu, 08 Jul 2021 12:09:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s1sm10002949wmj.8.2021.07.08.12.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB6D51FF98; Thu, 8 Jul 2021 20:09:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/39] hw/usb/ccid: remove references to NSS Date: Thu, 8 Jul 2021 20:09:11 +0100 Message-Id: <20210708190941.16980-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Peter Maydell , Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09: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: 471307 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp583749jao; Thu, 8 Jul 2021 12:27:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5pG3jqvTgNNoAMFMaZgFJ8yxMmshJEJg3zXAaW8HXRejVelPVPrm9KFpQIiP/55j3Ro5C X-Received: by 2002:a17:906:36d5:: with SMTP id b21mr32393602ejc.258.1625772431480; Thu, 08 Jul 2021 12:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772431; cv=none; d=google.com; s=arc-20160816; b=jJq3ja87rDat2VSJfWgaFKIfh8t1DuV144Mbl6soztL0e6TQWIiLBOXynKkl+g09BG HEclLBLe7x5RgU1T11YIj6Y8QqyBiK+eZj6l0per0LqXlYt0Z2A5bp5uTn45VlkO8Rxl 7wQkJzY5uXGx7/ym59tHnS0+ne2NFc3nvflz97l9vV7lUJ3w3w6v2OYh1KrucL/Zd4b1 411g8y5KinY6TeeEy7iH+CM9Wm+hTIlNBbSLfIQpq0FN3rQO0ch/bO2URKWgvA3hy8eg O//oPC/Whj5NonCiVqhXfWITfYGx/iqdLLwq1Kynet+1hEOmndRU38imvl/J6lvD/wN1 AEbw== 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=NKHWP+n0UcREfTUicfG1do0eTEG14YKYNlVGoXw/gDKY5x6rCMkGXaUhSLuHLGhQvW av9AHmLM06r6GaupYsKfvp33itFBq2Tvs9IW5x1Vw8hdiwq3z5IQEK7Q+YrZImU0p0n3 0dn15TdvS+RBGbKBIJsKImUM0CPZ2hAR41vl6vVpPo9yBFxdreISosEhhVp+xu4MG6jI Uu3nfj0OcHRjaVF2G/HzUE4kBgegwiWbrj40h85/bQm85QJhTsmc711r3yUzbCqpJARJ sCLbkg7jC2PPQAyulV23frTe5xa1AI2n6dBFGZ1V+ymTOc4hyljWbQtNg0FtJG/3kueG 05QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PwGYhN15; 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 v8si3948065edt.425.2021.07.08.12.27.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:27: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=PwGYhN15; 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]:42942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zfy-0002dE-GX for patch@linaro.org; Thu, 08 Jul 2021 15:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPK-0003We-SZ for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:59 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPJ-0004oa-1V for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:58 -0400 Received: by mail-wm1-x32d.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso7514843wmh.4 for ; Thu, 08 Jul 2021 12:09:56 -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=PwGYhN15viulcOdxF8wDYTya6NvR5mshUlQ93NPXg8AoRnHoiCk0bx+vqk9e1dU2XW msDHPl+0jXEAppHPz5C+VxHuGXys7j1wMBMfMWyVkKG6GeZrpcgtN3PRIWUKHSsP2OOz EAegSJs8o6G6GKlqc/KbnucajWWYdLmzNQNtyhgFigg1WXT1ms8yPlB1wOTXCZVEDXBG rq3XfvWAUEKf1dSxaEOHsY8EjDKB9WujhVkoZFgi2p/tryEO2tn+PvP0XLE+tvNApYVb pfsWNPG1k5HRQt0skKvivLPrfZXn9nDQ1xsDUjAI0X4ocvbe0I1Mb74zoPYYleLgAgy7 7jNg== 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=hrMDwq5ZToKffxdXc4u5dfmVIOY1N/oijIirhBdA/MmuKE+R3J9ZbToKjUiBSerTjy TYCoJIKMSsFlM55FhF+V0Gi5DMJluCm8O5HFErz8ZfoXJfR/eOa9TwA+nEdvGvL8KOxq Kd6CE1IkF4HkShS8JdmMgUZ3v7P7d8j9u9fPBYhhqerzhTdekubx8H/iyAyeKvvH4HBl pZcbGFKJNzzTDjl+H00KzJoOrp0Zq1fPEuK+jM/I9EQ61fvBRGeeR/KYvxiOiSw3Q4eN AmA+YiqyhudbZ0nW/JmO54ew4LAIZPKxY/RbbEorGNu/xavLNULtHlc/gk8DJ94p7e3j OhYQ== X-Gm-Message-State: AOAM532aqDwGdziJ1qeS0mipg7QxdNR1+w54l3/Y1njoJL+ctHauC9mF ZmGvc0oVpGy2ND3atNkbSGXqYg== X-Received: by 2002:a05:600c:2301:: with SMTP id 1mr6985955wmo.132.1625771395479; Thu, 08 Jul 2021 12:09:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3sm1943875wrh.16.2021.07.08.12.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0EB401FF99; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/39] tests/docker: don't use BUILDKIT in GitLab either Date: Thu, 8 Jul 2021 20:09:12 +0100 Message-Id: <20210708190941.16980-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471301 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp577711jao; Thu, 8 Jul 2021 12:18:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN4o4YxRqDh0VVadiF9r6CyCz8NG5Ckq+bbfrcTdgioGATdBi6u5MmMk0eimqOh2m95fzS X-Received: by 2002:aa7:de90:: with SMTP id j16mr41004376edv.385.1625771922975; Thu, 08 Jul 2021 12:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771922; cv=none; d=google.com; s=arc-20160816; b=V7/HhO/0D23+32X77QP1zteP4FBx7/aQyL/XaytnF3KtsFczz2RhPLIPN58GHOGrr9 D2NhLnHZ7sGpzcuJ7SmRYobgYnmW/Xiv8flmjv0q6Aue8wruRoEUTELfNdhj1x7EL8j6 Fz0A7I1VSAQ7PXuNmwVoIf50w2aWoVngTVh6BOTr0opBKpNPQNZrx2P/ksx3Uc25hJhe njza6n2Vd9OmgcgjH/kMvwFyxqUCZ+uMaLSA+sYJqfUMMU4qKSaTRAn8SsN3T92PsofA NcC0F0F7+zeuoL2//OB3x9up9c0vaWluoj+c2yrVkYNqzHXg60CcRAO4gQte1DhiIQkG vYwA== 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=Scgljcqy1TmMkaZ+OCb8gA19CYidiMTVoHLWCU6FxfWCotFd4QSn7he47wyueEqUkj e/L8MZEnzMUIwBkQoARpiEapQCAJloB4yW4ebaUusluIk7LKYS+kvUonx3FPv2BOQmHO PkseMbaEfskxc016tFL8HxtkSV/PInTdoNt9jFUMp50/DC10me7KDqENdoP5+xFDz5ee tDu2KCW+/G7I7/vd3xjkAW8jrKNyoTcdN7Sc4lqIYd8kZyDuDBQKEeszN6cU0+Tx0h74 LPQKMgMkVQbhhiyr8iH6xGun5sLuxclDvtw251kTuUE/jw4Pvv9Y+nzwTEuxpwZkZzKJ 1A5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JiClnD0I; 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 d26si3922497ejc.620.2021.07.08.12.18.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:18:42 -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=JiClnD0I; 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]:49612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZXl-0004As-P2 for patch@linaro.org; Thu, 08 Jul 2021 15:18:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPP-0003Zo-VD for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:03 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40453) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPO-0004qF-0L for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:03 -0400 Received: by mail-wm1-x32b.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so7522206wmq.5 for ; Thu, 08 Jul 2021 12:10: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=E7/mVr7Wht5ohFpSzGRlkrOJNv9dh0GtVvv3G35jqG0=; b=JiClnD0IQTNSwArgnjFE0oF1mE7LutYzFltZvbciCnt5nEPtOAtN+XYRd0bXqfYrNE T6AbCkz7hm5zJjZcMUVo1AsqdR0CoBNdKsDLYldBDsYEhuLA6jBZUiqPf0JqbpjQeTKE pyNaiGFhI2/9/02DyLu9yMpZ4BOo2RlOraTAl8/y0pXOYsTKRggABGoElTnRaTshaQ4e +v61eeU8hv9wWBnSNV7oRsD6qwMGOmSa2mTsOBRlo6BBTcF3YXOKiJHVnmHGSC7bDks9 Q4rsDYSmPAlKUwDBTRsv1zpFjDP+a3hBr9H4pZgPeFfpjJVSXnxc6Xeh77MqCOwNH9gD t65A== 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=tg3wI0jJxIlUhsXXr2V+gzMN9oPLrTn+1FTNCnYh6HcUcHQivSptBEgzjR/auTQvEW WIriLoZn+518rhLFKuPQ3oy61Xj2ewzYpGNm1kWVwP44VulVPDMM9D+rnG2yZUSWIQdK qkx0qw6DIlfyi3UILDC++JAPFGP1yZz5w5qgPQfr7m6+c64hXAd2ru6Lcp1V3rswQOJM gaFgBB1m3Upd+rZNGL+8WvC3a27hDKyqptcHiryDh6MMIUvkrjRloZtf8ax3iNxwbCDR v0udJQrtadXObVODd13whaMozKWofXw1pNvEdSCgqnGvWO/DzsrFsTVmYkiXET4GSf5k 6vGw== X-Gm-Message-State: AOAM533DqKse0U2Z0Gk6LzLvYBn1XB+nCOGPbU8sh1UUUUba8ZXmR9AF q2n+MZRKLLNCxHGH9Vbrx7tb6Q== X-Received: by 2002:a1c:2cc6:: with SMTP id s189mr35431570wms.64.1625771400666; Thu, 08 Jul 2021 12:10:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k20sm1374842wrd.70.2021.07.08.12.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 314491FF9A; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/39] tests/docker: use project specific container registries Date: Thu, 8 Jul 2021 20:09:13 +0100 Message-Id: <20210708190941.16980-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09: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: 471308 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp586551jao; Thu, 8 Jul 2021 12:30:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpA/psPXRaNpuxQ/CFSZVU8EiHGBR1rN9Ac5539rXQ/jNZiiewtO0eyS5KBzlNYjxmey4+ X-Received: by 2002:a05:6102:5d6:: with SMTP id v22mr23002928vsf.35.1625772655914; Thu, 08 Jul 2021 12:30:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772655; cv=none; d=google.com; s=arc-20160816; b=W2swqrlMKJrzJULJ1ASfP79kSWfcBHcXs0S4fmY41mygulOcalUY61RSXhAI5i6uvn E4XlfOnkO5+uRUOgT5fBkIJkUZKgtLz+4AmnW4t4AxQspls1zqn2bmG3Y1s1Jnn+pqNv YSTZLbagV67PIP/S+/oBdV0PjYJ1aLw6K+oo2cbgVlVu2qYTEfBE3mvEhEvupHvYarj4 8M92Ai347L4iMMmRFzfoUtKXXAL4V/ifW3UyeI5X6Km91+BCkSz0GkEkFm6NKkmpLlgw MhsdmkxDj0PsYFtillZLi3NsPDf/YhMeN1aiuY4UsPY27TmsHxu4cwyZo0nGiKuzbFVu T+1A== 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=YipsEWolpFm7+r7iBis/xjxpPWilQVhOLIl6dGsBocpOdiewWW+NeWyw4oGGMXh2h2 hiRZ0b4MS2qOECZ+JKaLrjnnJFumMa+VE613EE3xmGE1UlgVMc03RaeBj7iqEOYaSyGB zYisKV6b9osExJWP28pHOaLbsdipaJ4Zgxg3XFK3NjfqJrd0jB3KvbagN6s0HPMtEQ4E I64KcadAyEQ5OutKEP2Vvn7R6FFEoLLSup+H+fQ9gGDoZVY4E746Tkus+zeDwA80nKT3 CkG0v65gjMdyv3dJA/u7E08GeZwac5nIHPy8FjavTfb3Q/BiVf0dlRDyt8Hpmv06IODR LK+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DVhPmJDb; 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 az17si2662060vsb.323.2021.07.08.12.30.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DVhPmJDb; 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]:51616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zjb-0000Nt-53 for patch@linaro.org; Thu, 08 Jul 2021 15:30:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPV-0003c1-TI for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:11 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:54131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPL-0004pE-Bo for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:09 -0400 Received: by mail-wm1-x332.google.com with SMTP id w13so4771754wmc.3 for ; Thu, 08 Jul 2021 12:09: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=SXT7sol+1pk4kO/P5DB1EVTnMN8KnY6InxmVm1gqicQ=; b=DVhPmJDb0yo7R3plJywQ22DFk9Lt8ftcebrkHKAXRSDYD7fnMpnsQZqMYSRk0fV7DT mruIrIvTVulUXGT6cWO+GtcSStCWRfIB8M9/Sv2tlZrvwayTKgK9+7GxWJJiVTh+64RK 5MmhtypkNUlUVkpuUZvVHYzarxTIoabU3/AXMHrfqWHH1yu3gOh9LM3knv5fyx3ARW50 A7AyioFOkpnR21wzNueKXWwEV+7fHPY4wX0hPWjXQHWO4q3XGg8U/ZKrI426C1BOZJIG PqBpRiidDwZKOiBrrkOpCp3Qo40xbdbBCT3tx8xiYW1pgaAt7xMOrOU4jhNOPjd1mqvB +y3A== 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=GTe6lIOMGOBmO54fsEcUb62qgJbw7U6+T2RMpZSp+ULUN6vuy5TeKBkHvhyHzVqiil bEIIU0R6fk43CNQk3DGyOa02GLCRuYsAJ1lI65CMEbiU+eiXrPzlzI0P4D/oufuTi6t3 xbMjm0PcKttz8JXBqElDDz5S5vU95fqQFZXr+fSy6wU6WzuElWdh7Eh15P/5ZJdvS11E PC797m+odfR6Pi9+OApVClcwtKGDM2gA5oTl1aUCeQqoJOoxuOc5TjDuPeiR3h1IQR+i EK6i+6EGyuNo2Z4RhTXbnvYborOGIV1ZzTa/EmrhNu+aTHpsOcPYRr1jXT6svBPMAmMe ZTAw== X-Gm-Message-State: AOAM533wIhkKDhcxzMZC4Xmql6U+M/GIOJjSXq49+7P22hcPbLTmdSgS 6NtkBe1JAiTR+IFB0+zcgos8nw== X-Received: by 2002:a1c:e485:: with SMTP id b127mr6956656wmh.91.1625771397889; Thu, 08 Jul 2021 12:09:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x1sm10031947wmc.0.2021.07.08.12.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 56A3A1FF87; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/39] tests/docker: use explicit docker.io registry Date: Thu, 8 Jul 2021 20:09:14 +0100 Message-Id: <20210708190941.16980-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09: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: 471299 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp576281jao; Thu, 8 Jul 2021 12:16:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpzr223j1NkwopIdElp2VY5u6RtCRIDrC6dcaAVfHTkkc0URjQH9FEBOtar2LedTL87Q2C X-Received: by 2002:a05:6402:1014:: with SMTP id c20mr40631407edu.380.1625771789248; Thu, 08 Jul 2021 12:16:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625771789; cv=none; d=google.com; s=arc-20160816; b=V+DuSaRNRtUrevQQXDLI2A9YqSCQuV/yBw4dtxWUhqYXwIKHnyGcp1TUCO7tZ3+UYd XU6V5/8nqUhCGKh/pePp7glFHC56YDuC2jF5SlfLdIpKVWsryhmeFzeyvItEPbM2PvVQ Sn86rxK22dZmm6/K0dp8OP2FNEN2Gzr+sCZjV0HRgrmrJWcOg6fN97o3Rqt3n9PTdFFz wWSNGxL6ki2LwHzqhUoLsnCgPRhwa6FyomJB+JigcSdTvmSbdY2GRmsnQmiWymUa57Tw s63po9Seh2JKV/5dPqcO6Cnw0wbz7nnIiQGKOLjNdnWmKNJTsdGrzfy18z9aqC8m8U0f BusA== 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=KbxK7vnu3fvwC/11S+pVetjabAD/6kfedKxHdkJdESVdFIBqBr44RZPabq1PdEJYpZ c3wFhUASqoXbEyLP/EaKJRgwIBvXz/PPUZGal/vZxMTKP9EYQifli0u+LLY4nECp6MvT 4pW2FoN2pqfU4Tal8Fhzar7oYu5rDglz0BnnInaUMGVwS7MtXwO0VCNeF0sD5WGlgfsV LKJyZN/+x1pmgA0ZAiQpRgBNuJDX8qGVT6G5va+NMDeFZkr0X+8AjnLOqIYkoG1xY4yv 9yUVkEsivDm9gpULlHn3NHYgdaFQ7LoXt5RvQ+lURKq4GLXdPVGDERvEHGGOyAbuZ/uV OTiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PtgD+aS6; 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 p8si3849064edx.277.2021.07.08.12.16.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:16: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=PtgD+aS6; 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]:40870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZVc-0006hc-51 for patch@linaro.org; Thu, 08 Jul 2021 15:16:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPM-0003Xx-1Y for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPJ-0004ok-N1 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:09:59 -0400 Received: by mail-wr1-x433.google.com with SMTP id r11so3588379wro.9 for ; Thu, 08 Jul 2021 12:09: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=uQM582CR+pF+8YGG08VBpf08mKJ/9zGDEh5ELcyeUXY=; b=PtgD+aS6kopSaa5aYs2KwQVNj5hOjZtQcRnsisyxBKLHTd3E3DeGzgqAA3xw6M77uu zcexw3bpmsRox0SnIrKlZ1NXYh2E73pbShAy7kdV0WVkEaGevy6DnyuWrKP8kDjIep1z RJBWR/zUgMq2w5fYu+oyKScOC74GirvxbBs/r6G7SKUGZ/gY2OF41brl+mP0iVNt/j+i Hvr7raXutlfBiWbimvC5G9bOW0fhxcZRUv3i3Dukv+NRacf1+Z3dkgSruWlogjgoxufn WNsI7Nd7gYpUFJRYB31O9fZrbN3nMmEywEiaxt8paHtwk7lWT6tzrRnLWhW0llQFjbmy 7rNA== 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=Dp6Loi1q4Xr7aE8cZArmkiTZ9FWFxWmE+ugBuBNfg8WummUawVhGoTdZOmScIyC55c 0/AdP29VQFk2e2fCXUeprRFbX6SeqsGgHgv+fNj4womAgp5twRuBJHvCDY3aLb69ggQZ WDqAlQTXZSJRPQi4pvfI96oWypmrtmKVUbOTi/dpC7owH4aVG6G2/cmQg3gk36lqi4Nf F312rtUGRYjTh9TJQg0WwIxOvW5DoLcW1hDyJobffuqj6ls8iUkuTNFwTcMa5Mu83KUl htj8Z50Q5Y8im09KTyVBE/KXH9wLhyd9nmM/4lGDv8Nk+O0ocjyJOdxXTXP9RHrW+mGJ kdnQ== X-Gm-Message-State: AOAM5304cymCBiKmkg2k7dE4TqmxXKr61rH+BnPNeVICaJyXYJK/VEly BnIMT08u6//fucuLgTyjBFajzg== X-Received: by 2002:a5d:4912:: with SMTP id x18mr4674855wrq.310.1625771396167; Thu, 08 Jul 2021 12:09:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i12sm3263476wrp.57.2021.07.08.12.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:09:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88DDE1FF9B; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 13/39] tests/docker: remove FEATURES env var from templates Date: Thu, 8 Jul 2021 20:09:15 +0100 Message-Id: <20210708190941.16980-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09: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: 471334 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp606008jao; Thu, 8 Jul 2021 12:59:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybXeMV30I+rThlc50V0B0O2jolflTmegTnkMofq65+RD3W1ej2RaUATcMSWxHI7xayIPnn X-Received: by 2002:a05:6638:3382:: with SMTP id h2mr2400817jav.131.1625774387128; Thu, 08 Jul 2021 12:59:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774387; cv=none; d=google.com; s=arc-20160816; b=OjzrOiPT/db4kxcgprf4UsSu6hKDHcDzvwbumfdcM1Z8POHVqVK8IniWa5EJLrYkk2 t/OtZdA8nCfaCt8Up/r6qmzPGNvIGY8lATja9Etg/ED11f/QcLMDOhSARcX309svAZKU m+k3qrpXdippgd1vFkqW5p/VjrHkpQI5wprvqMgD/JL2XfRjtRW3+/NlCqz3XcKO6w3o uoQ/fiuhTk6VsWbros3+vsvVLHWim0zuQbBQtLTaqROpzEfWK0UM91dGEHAdWRd+RvCh Wdwm2CF//qYAeJeAQ0vqzP2YVMPzKS7zy6cm6yK2VDyKEWaYD5mUZZhGtDsZf1iIkWs2 +f2g== 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=aOCe/9lIHgUg+EAEkmTaTKY4cZKp9mYEbPyVSBJ+DOXp2cxvs5+P2wfI6yznA1FX+h T97QjQ66nfcS/4k2W2DRryhsW57aCTKoDrbCM4OTRdeQwKTfOzuPOUkPFNX/eZWErA0x iuDwxzRICr//uzzX79M9hLoa8jV3+ZYvMazwwYJfMIJZlCW4arg3AwPpGUr7GVQoRMFR +qcckc8ieZ3IBt3TmCaU4F96ywvPKwMoB8SkQAPOrmfm6Lmb0SL+JhO1qSLY0QtXuaNX DHFQHWsMRuNkb6R94Ek/5TRqeRfKuNn2B6Mxtad73imUr8QsXjPVIfN9esR/VNjMC0Jt +uqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WGKwUuWc; 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 s11si3735776jat.44.2021.07.08.12.59.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:59:46 -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=WGKwUuWc; 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]:39882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1aBV-00089A-Ez for patch@linaro.org; Thu, 08 Jul 2021 15:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWb-0002ce-O2 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:29 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:56189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWZ-0007Xk-LY for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:29 -0400 Received: by mail-wm1-x32d.google.com with SMTP id j34so4761401wms.5 for ; Thu, 08 Jul 2021 12:17: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=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=WGKwUuWcXTrLehDA0jKDg9EtLzNufgHuQ0U+GBAw9MdtxaYgOO4FXWvYseSLF+xc9T MxK2dy3fpEg6AvkSbibA69tE6wTw5xhdc58DDFnp0HBBXwuGCEPdq/S+iYEjkr0TM8Zf WiTr6jCu+9Tk9x8a3OI9H7681c6tYdOM8scrmNiloJMpeairhMKQQxtM7u8ThUplIWhJ VdTiN/lmKQq/v3nz3+YVYuTi7II1CbSxz9zDH1DjaoOf0B0DFngwgYHllvE/pmgspW/T b4BHjW1gNi1MkAbjP4Cp/9A0G38WvLmZBb1DlqjjLpM1xw8vBJK88GDJAgcSy0dEPd7C iv8A== 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=Y6/WS2ietKGznE6QQaS3Hp7Oq34MiQIiketuSZgcdKWHkE6Z6cZOfzARhzpM8ApC32 8NU0iehAToLwZqNF5XQd5mrYE8BFhuVr8PjZ6FupHxs8m69nN3dbZn3k/dR4VIcQnHzM zdnJ5mDNnInQCtlC6KcYL/5iS6TkGIOWaIsE+3/JoJpjX8yqt7iYVuCUrYdSIHJDFGNy r4tvE96EO2GKH3BbhCuhJYkdlBtiWMwnAHC0kzKbNl7dX50ejr+5kQBqUWl1EBPT3dYc C9mNqTEORRnV56H3iHnDa4FuWBwubBfQnMLQl6myTyH/upEgqhHJsY71eWjur0iD47rc PZAA== X-Gm-Message-State: AOAM532zUec6ylkh0Jr+OsHyl8/2hckDkKF4C1L2WGXs3cZMFmhL9feI fkiEgP4NHJN6vCbSTXJQDW3nQg== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr35059439wmh.151.1625771846429; Thu, 08 Jul 2021 12:17:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l13sm3119996wrz.34.2021.07.08.12.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A8F7F1FF9C; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/39] tests/docker: fix sorting in package lists Date: Thu, 8 Jul 2021 20:09:16 +0100 Message-Id: <20210708190941.16980-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09: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: 471320 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp595024jao; Thu, 8 Jul 2021 12:42:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwaDJlzPA1Gyxqh9sktAhl4cqN+04hrQCZZGYSd1/gbSqn7SCHVGxLlCaqjSOddRckXPWC X-Received: by 2002:a67:c39d:: with SMTP id s29mr30103516vsj.26.1625773359630; Thu, 08 Jul 2021 12:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773359; cv=none; d=google.com; s=arc-20160816; b=VX2AcYRc5z1oxwZe5zL6Vgb4lB2Rt6jhnN4f7hG+j12S4ihinMN62NBVMX4X6VIx5Z hXAxGFUMUeL6fZjM5xXq90Zxk7T4RaM/ImtJyJYp7IvA4n4vOsQEJQcuZ6x7DhjcaUxT YVtKBXFdIJ6lVoHIo4OpMdJOG7NguCQHBEufxjn55/xatf0IoG0OZWMLITHTVe4NMU4r 5cbjLntAFSiiBiWhQzPfEJ4zm91zVtRN3z10kyfGlqem3wlzS7lkAkc6+3WFlhCCdzdl 0n0/vDHaia0aJWmWdPdwf1y9l6AWCrv/TsMOYK07HVthp7YKagFKxB7+qADcnwKwTf9i 7TqQ== 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=sG2pJVX9RtIxCbcQMozupgG4utkVeoNwz1EB4OTSPwr/XfzYtrowhiKF7hrTu0ITa9 U6RC/jFJSqsx4/GAzAOmWAbfUTnabsC1aGqsq6gPQcWQFXzkxYAV7pscamRPoinVpKyC Y+9LIzMjB9bf+Qr27nI0NAULgpfkoRCd3uERBUTz9irtFbmhQr0CAy2xKRASAfOE/qC1 mSjcNNf8SdvFkUGW7rigtHpXdbyG1db4maHvN8QT1LgzRoDIZHe9+k1UnV0RaxMiOpTm r9qX7lQa8eb6oao2OqbxKIMtDQ4nKMuTQSviUvV0LaJ+xCFbzsgavec8MivmeC+CpDuO btEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YN4d8jth; 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 o34si3433579uae.54.2021.07.08.12.42.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:42:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YN4d8jth; 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]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zux-0005xi-0W for patch@linaro.org; Thu, 08 Jul 2021 15:42:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWd-0002h9-0X for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWb-0007Xz-0T for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:30 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g10so4791560wmh.2 for ; Thu, 08 Jul 2021 12:17: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=YfoGHez+gPo5YY5+v/6dp1kX+Q31nwpzr/cnxR7G/zc=; b=YN4d8jthGm3QpD70BX5V/fH4BY/bZuScUVbNSol7aRXtU1aSw0esNfAtfoGj9YZqMU alUWPPwcmG9kRmBH15eAibuB397hbi0yRRLr3snkR8XPAv6t2vKOBQomYHq/NBUH5L93 CcELHSmMoItlnlophiW2Bd6jYzKpoUlZXBE/wXxwJs5XpysE/Qz3o74/kmjmZBZYM1TW i4y0fdBgZw+TH/69Rm5oEVgTN3qBhW7AKtxuTb3Uxw/zaFqqt6h/bORgfzhOQH+xrq93 9xve06R/uzVMnZ4PyN4omylluappG4hcFcE9h1J3XsME2x8LBGzR+Um1J4dOdO1sT23C YGHQ== 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=jkQD4wd8JBih8aKFtQ1EtQCs9Nq4a9gVd+eALmRNpCeRhwFqo9tUAdiVAFueaHx9bn ZJwrCNntdW39CwTnn1JuFDLmn/GBYvCchuj1DbFIfhe8xgh9T1070gi/kBco7uZaCsbX n5U/QtbdhEY5C4vKdNcRRleEIfarhcqJiJLHTN7hGWC9nLS5XqHSzobECW+A6IjpAesA SZmiqk3YuF1NPa5NtMZeKAZVlPCv1Gsne4jHSoIwsfUVhYCSIp0bTCUfBpEUsSoghy8S jy7Zku4C6BWQJV7Z3edCPwlh5fGuAVgzJd3ZfhWo/qdTBRMHvIqOSx1QrTHCXuvNt6es Xg2w== X-Gm-Message-State: AOAM533N2Ci88HBhjvStrMNzDjULsFqhFjawyudKwiBkbDuJU2ShuQW9 moVD4trKPrb5WFsrmMrlbCXmbQ== X-Received: by 2002:a05:600c:3793:: with SMTP id o19mr4560544wmr.31.1625771847309; Thu, 08 Jul 2021 12:17:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p11sm2131037wro.78.2021.07.08.12.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C0ABD1FF9D; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/39] tests/docker: fix mistakes in centos package lists Date: Thu, 8 Jul 2021 20:09:17 +0100 Message-Id: <20210708190941.16980-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09:18 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: 471318 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp593780jao; Thu, 8 Jul 2021 12:40:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDfAbpRMiXGMqdiqT1lgD0LwHQLHRGEwxgaqYKGc8a7srj7+PnS66oANDV8tt4H+arvweE X-Received: by 2002:a9f:35e9:: with SMTP id u38mr31583915uad.131.1625773241770; Thu, 08 Jul 2021 12:40:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773241; cv=none; d=google.com; s=arc-20160816; b=NsVL0QigQRFipDL1snr3gzNoavx5BPiOqSxh4N9CCEwQosZ7bJHRp+7zX1VAeP034e Bb9uL+gmBPX2U3ZQX5kTxNnFrtDawY1v9wO1Gw7g+hYf+9x4kjmxsrdfNKtIWbJcBDtD In/64z9rAOdAmJagVrV73EYBK488byaKPuudpmsudm1UdRTQbhcoBIGfyYde+b+oiNlt Gq0xcIo0ppa5jPg+351qLx6jHQimoVrSou0N+BRS5YmycfG69HKQcymIACY4Rr16FfJT AGliMCN3NRCXPuumCFYrFoq+Zwua7be5vY2JKaXMmpmZXfNvahDbm6UR8FTp2W5acU12 llmg== 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=Uxn12Q+izK57E/zzUYzoE0U3dIVo76QfMOPjrpA89p32wXj3do87uYNaXDeMudEziF 1e7oHCI0OagT4CtnJS3cYInllPtLS2ayhXicU+T8bJRUi5lKodJWoWorqh2q/jRVQtBv YJHr3YgaNr9UCVJHIKPws6SvBa5UEwuT445QOf4GmdeSvwWO5XvNh5cq88AfQvcw34IF Wh+5EtBPlLLyeUqp7R0m+nlhOI8L/0jwTid8lFoxt6dSlBWNl+KlVFLbWOIXeql95YvF RMqnaSKVFV6LyHfi/s6ZP23Vd+E3NY7rbuvrbJHyUBdU/ooc/nGrSz+/LuwP+zd+ZMii G5dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AKB++8ZX; 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 y17si3624561vsm.321.2021.07.08.12.40.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:40: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=AKB++8ZX; 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]:54112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zt3-0004pm-4G for patch@linaro.org; Thu, 08 Jul 2021 15:40:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWT-0002GZ-Ga for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWR-0007VE-Jk for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:21 -0400 Received: by mail-wr1-x42c.google.com with SMTP id d12so8259204wre.13 for ; Thu, 08 Jul 2021 12:17:18 -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=AKB++8ZXWiApJ/Fe57boKxsx9OdnLHPakEeXsRrycOLLJTKFnLR/ZJFcTFr7SpfUpD WyNJlyVgIspkLQeZ5Go4JnuMUH3Wglw5/Jjmnwee5EJQAf8VbLQkpWOfbAsfTZ8CX9U6 UzLPZ2eZZ2wBJ9fwaYBlz/1X4Zl/vldUZ6EKnRkzb3fFW/fOVDwqncrStSczTtmZSheO 0k0iqBdzfjVLdA8A7Zp4C2/JuKZ22zxHhTcnzL5hQVoGWL0QHqFY0hCLwkBanEt0s8Op ArJ7Z5R3l0UfN3gZZAQW3qYElwPVbIowgGgdtUktzP0cFm36HlxJ0fWiS4DRM0BQMlMj uW6g== 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=dON4jdxT6W8apUYtE6iVK2qOjmaA8C0v2n02fe0xrrNvwzmTv/PblwBtUbuOJ5mIHE 2/O+NRD2wO1R0iLe/xbScigGr+bI1vmNUaBeK5k3rguJIxZXSB23lBxoHFv+4TD6oIXY d7FFMpHF1IiZmfFQ5dbmZBesoZ8VAkJ+1/evvNRo3YS8LNCcCu4Ll5aenEv7kaDPOUXx HFVO131dHBnAt+GM1TBtDymFhOs+31sdWfxQoe3RRI1Anme5ZEQg0Ct1iXL++99kcJr6 7wARDWpHw9GtVwo2ePeFVdLDZgGVhmra65nWK99GncDY/2GKanSeVIRzh7u33Slrv+xv EAoQ== X-Gm-Message-State: AOAM531Waa3yoqqXS8oDus77a6T13g/ipbDw1YSKYb1FADDPEOX3W/5K Fv/muAQY+AHRoA+q0SvvLk/OmA== X-Received: by 2002:adf:ec44:: with SMTP id w4mr37556214wrn.200.1625771838202; Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y23sm2891856wmi.28.2021.07.08.12.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D6D991FF9E; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/39] tests/docker: fix mistakes in fedora package list Date: Thu, 8 Jul 2021 20:09:18 +0100 Message-Id: <20210708190941.16980-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:19 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: 471321 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp596778jao; Thu, 8 Jul 2021 12:45:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLI/pgRh261fXvsDY9CY3krO7Yu2uzbhi8UwI23UWS/zjafc+y3PPpBAD5TrKdhDTB/0uP X-Received: by 2002:ab0:492f:: with SMTP id z44mr17403995uac.32.1625773520848; Thu, 08 Jul 2021 12:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773520; cv=none; d=google.com; s=arc-20160816; b=tWRj3g1zA1pAhT0SleIh0LBk9/51rdooLIG3zuiaLgJOcpZ2Ez0qsY6G7x1UYQ7cxF fu7qo426jpCl9FsxI/XNAZjVUHQuQDAwMB9Cgz7WZ4ReFWWaclrOz+jZi0mKTibzbMzz ZKson1CM7O7WM7IYKTFGIri4nnj7inXb6WTZxwrYvkvb2zDH2l2ZdQlsQ60XrDjwHDq2 tY4wiTL045be2kSXuqf/a5BGIpPaPZroCk6ehu7crAUbv0/VOiqBpoPJLPNcyavMFiaX BtO1jEIWHgy8wdNpY3gqWPht/8UiludUTKXXpSXro1CeDoHoQCbOHd9nPVhQslQTWMq6 mDcA== 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=GUmVIad5eZoBfi1EE3qqM1Ya4I7DiFQmnHs6DQmKXL+gG0esRmSFCZ7lkyHRSes++i DPQAVEHacGCGcIaLi42irv44/KUAW3zyCc2jjOqgTN6legCOiO7aqkUU4F6mlpgMjMOR 0LfZI870zTQAg/+EAUeuwTOKqtA27ZoCZ3pAxy0UT7kdn30EL2MhVu2s8Uo17tVf6CmX 9aug+/h+MpVNQFtKp9Z9XzQwOiE0K5ySS4YnyR/9TAj5gxxItHxBD3B4deDYBYPMyI39 U9ZNw2Ip9RBsCkGmhf7M7u6gRzBoWBzlVFcqyrVUWt6ijH/zOTfsaxmHrrWvLnel39hd 5u8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amPTAAcE; 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 v24si4345276vsk.422.2021.07.08.12.45.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:45: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=amPTAAcE; 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]:36142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZxY-0003Ho-5u for patch@linaro.org; Thu, 08 Jul 2021 15:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWh-0002qG-Sn for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:35 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:46980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWc-0007Yw-EL for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:35 -0400 Received: by mail-wm1-x333.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so4722697wms.5 for ; Thu, 08 Jul 2021 12:17:30 -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=amPTAAcE8iOPKn5uR+iVtJ984YV7Bi7aQrON8Iiff47CFaL7RCBIsOyN3BifatzXSc 7/uknD36efl+XQArTS0XXdhUPff9VGLfgMI7Mkdp5jfxxCHTFZeB7lazAzU4lXJZGKb9 Zrgi4wY2ilwoDTBrRJs+YPwgv69fb/wh6TJmz9tH8v/dbmGvQlZgVD1J23Gz8ruqfjqG Pnrfs114ona5ujqFpVk1jvuG8rbv3WvPRWkUOXVmoR/ptSANw3FiY9ilBzXFR32LXIgg 2tLfjTcHEsFgbE8LXWhTFl+rCg4Y9qm/gHHOqAmsdFbKUmOC7CkPY3gREGn4URO4Zc6B HdzQ== 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=DODD+P+IYxH0PbkQa6DN5jTkp6SwFgnzPd9eEY7PRneIkGh3kLEEn4elhVtxXwKua3 agWVKXLg7u9SUh0AUUEiZs7cQp5SNia1UWjcgfaZIlTsF5s99zPmnTMIldGGVv5hMQno HkdnI5zXVWuL4a5Hlg4+/alNxOxRyCWMQIUWUdFSQVYblpeDlhxCvrP/MvQD59a0u9LM 1rw7dXDio4wnytF7CiiBhtxmElqoAtnuJqAFcUxpmdHHwV4bvwL4o6o+a3kZP6SS+w0+ q+vXsZeeg9RSymL1EG9JK8EjQ5D5kbVEXkNq/jZwZWFCkUSBa/SO3Jmp6OFWote2DAYg NFeQ== X-Gm-Message-State: AOAM530GhJ4EfJ2OtPQ74jeFfzORBF4RIFMBp6jpTI292Y4Ur78aJwqu UcuX2tAPItULouuDVoyhOSMZSQ== X-Received: by 2002:a05:600c:290c:: with SMTP id i12mr33513901wmd.85.1625771849007; Thu, 08 Jul 2021 12:17:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e8sm3137138wrq.10.2021.07.08.12.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEB991FF7E; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/39] tests/docker: fix mistakes in ubuntu package lists Date: Thu, 8 Jul 2021 20:09:19 +0100 Message-Id: <20210708190941.16980-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09:20 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: 471312 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp589856jao; Thu, 8 Jul 2021 12:35:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxU5aLevx5YTbhpSSKcBkv32/5sWsCKc7b2HaidpmpEmWj7Eel6bHFm0PNC16sU5TdgKDoU X-Received: by 2002:a1f:1701:: with SMTP id 1mr26951475vkx.22.1625772904734; Thu, 08 Jul 2021 12:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772904; cv=none; d=google.com; s=arc-20160816; b=XuG5ijg86ahwKtKcEYEiIIGLRcGMPTqX8j3BEMgfaXPxw6nrF+YlPYNjx3bGGX2uzf P7+rUHn7D2HfVj4infqB/7GDBNadwfWCbRthOLde3dQJT9M7QyhEBYvD2A/rX5sb7oyt jbY3V4C+sJSLYVynDAb2MYwwJD1LiO5PTmk1JFy8sGtMhLcB8Ty71G6uY45ZfAnHE3ya W7jELt+YDpWIeQSzYnqUosftvAe8VaIVAq8tkdrme/8zTSWJSsqLU0QnDPx4lCj8gqRQ D0IXNq9YaeA/XA87aHrJeLSFK70DhZVeKvCKx/Yj2AuiDjlX2wUHsoOfb+s4N4bNzzYW W88Q== 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=FuUQ+7mBOe//YTEYLEgO6/oH6VDqnoe+XN/jxy6OBRx/AoyDbnddNbi39ZgSS12Td4 bPyX6WoJ1ZM5hrQ6T/Eve/XGi1BiqiOYWG0wSI9TZMDWl/bf5ivmQ1ObRd53vgaIqsTC 7/KUg5KD08NhMAH82olLAOium+gTD6S2EY6CNND9Q/vrrbLlQNbjLuBkLx4nq5sobT1W FVcYzLEs7fRC4Cp0Gb1PHDEpf4QhdaC6E/KFd7ZCFwCCAqhi6yXwpnrnH5H1A/LVDo/9 YTNJZAkMgvdC5Cgkj0KEXSqCj+2EgUq2FQg780+LU0JZ6xAIJpi0HTicjqQ1vM1nb3nV u7CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ZI7/neLn"; 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 z13si3654124uap.95.2021.07.08.12.35.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:35:04 -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="ZI7/neLn"; 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]:34716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Znc-0000Le-1Z for patch@linaro.org; Thu, 08 Jul 2021 15:35:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWR-0002F0-Tz for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:19 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWP-0007UJ-KS for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:19 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f9so3205687wrq.11 for ; Thu, 08 Jul 2021 12:17:16 -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=ZI7/neLn1UJ5Z8OJ/iY5p9eTzccIi/mfG5ZMx53UZiQUmZqbRP+uexrR1R+uBDHxHm azuLyktkh31vDFXANl3TqxaQ99KoeWXnJx9XJXcHEULr9ambSMjgFUwHqS96D0cUtr9e vWT5MdcA16O4afhLgK7E3DX2XuDGjQOF7jKox2DPNbFYEIv2zTW/jwoqRL61GBUHu6YF dFmJfK9b8IsSxfzUrvQpQunNgK0efiUhBsBN71+isIqmD9HOYvLSfiK+GAyLZbzgYxzo vC/hdQRwtXLfseaweJxZzdxtE1gIak4sW1H4liF2Og7IupxoQy1JgBYHNQdBcRsWLrXE 8kSQ== 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=bEwx8LMidQbzaljFfedNbvkVijtWPF3P0leSSogzS/fW+O5E1wZkEvMGvdZsE8M4xP afw/5e9G2lChIGZS9rKiXM+n9xz/cj3QG/XCi0zE5Zn6zvDQgA5ORPPM9aZNiWh/NC/L rUHL+Sbnq2i4yemqby66snBa3IsO/u+4tY1MFgz02+Hdn867mDLdOCi0zkTxvQa83yA4 z2N/Y7gJjZ9hrIbFdn71ka9XypznM5f96VTKM88mOP9WdUZNC0XAKwaI6fQMNrrpUtOz wqHJi5RoHn9nSxIUeM3akQ47a/zIduuN9fgzuwj9PZw8yOG6kXpgoU+cGHRKODc4Qga2 jmUg== X-Gm-Message-State: AOAM531nqthhF7yl92SKYm7kvJMJ7jOUDK8ixwK597WXziz6iUsDF7yq 0L0ThT3W0o9IsI5OWK6NRTccsw== X-Received: by 2002:a5d:64ee:: with SMTP id g14mr38180281wri.66.1625771835958; Thu, 08 Jul 2021 12:17:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f7sm510425wml.35.2021.07.08.12.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 13A0E1FF9F; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/39] tests/docker: remove mingw packages from Fedora Date: Thu, 8 Jul 2021 20:09:20 +0100 Message-Id: <20210708190941.16980-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Thu Jul 8 19:09:21 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: 471332 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp604179jao; Thu, 8 Jul 2021 12:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+vt6xFq02o0+fzEpn1VOA++SnNyuL6LHRCAK5vEixIic1VXyl4qsEMbACE8MaXL93nlEN X-Received: by 2002:a1f:2a95:: with SMTP id q143mr27370470vkq.2.1625774209656; Thu, 08 Jul 2021 12:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774209; cv=none; d=google.com; s=arc-20160816; b=0pI9KAuvci7ux3m6lEdGvKunjnYFs1xXea5elnmPY/VUDuLx6yQDWYNQXxtcSHgyAh yvXBmsRKsi7MFqXDyndggxC0AaSEdpsjtSCZtz60WZ5ULB2xQfPAxwzMT/XOe59iV+yt hQTh4M7a+UW7oP8+WNYvfX0W4z2uAzDFwYlp7ckIXlFsZn4uEvoqlZkZGL0Y/AOoDg6N e9uH8P6w+KS0VGvEgRDqMhHRBg6Mtg1KzDtLJzpydkDQF10dLWeOI9TAl9IEhahgc79W XGklYA7XBFLaAwlfjVuRbPis1jNSWHlWfBuY+/sfh3Yydjgh2q3pDuGsMIYJ8dmXVKX3 cMGA== 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=HLX8dA59k79hCouIEOoSaIM97WkdqYNYIbQlfimS7R68jqM/ZlZnbUTD8Z5YXIth6y X4sFl5Zp1c3hn/3Ylt5CH8YC40AINqzyaItVCGg8Sf4mYbbvSd968Krb0BPEI3nNbd9n 6ajZQ//osthSlzl4FeID/lA1Owe6ZCo9ofekzwx02s16gPNXyvGadwzK2VqlgqvSzSIh gZSu+TvE6ZvjIUMBKY9UwlRlXg/mZMxS5dbbCEuVYuDALRN45rDFCgFVaPUsIbPrp3VS /1Wzb7A/KckHtVIG3A+Lfj1lNGrhsQmqzE5dnIzFwRxMFAEwwVfTTjLZMCGtrz1mlbbE 0qSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XF55MZGA; 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 y129si3664109vka.17.2021.07.08.12.56.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XF55MZGA; 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]:59834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a8f-0002PY-01 for patch@linaro.org; Thu, 08 Jul 2021 15:56:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgH-0005bP-Di for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:34 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZgB-0001zg-4t for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:29 -0400 Received: by mail-wr1-x430.google.com with SMTP id a8so8906060wrp.5 for ; Thu, 08 Jul 2021 12:27: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=KVqTslJtY4FYTYh9yN/AgrJpuhlasOrPI7zLw6S0HIc=; b=XF55MZGAp8+N0P0sW+8f6Re3ymbiYxzFuHSGid/pkY1UrWf5m6HYOJg4Bd5Ww8PXd0 wbOZ7kRRWU97jcZ8HL9DDU9So3HxWkh54VJccFvHu6B0gA8rvweD8/52Wv5oseL/pWnc pgsrh/vs4mRAdAVFhtMC7hwPUsfF3pOcDIEtHfa+QdUZNjmQNpEksRGDcroCye8eGckl wU1CNBKtmQ0T+kK86K+W1deQOKIoJz4+MOrFFkfo2e0Dth9MFeakShozDnpoFHHWsXbH m0/sPLvw4jVEBNb7/y0r0FfdnRexN6e+mxMF5syUBM3qBUeevhPM6YPkpHCSZXtL1jvk a+0A== 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=dpxTo9qsYjGkgY9ldaAD6t8hX6YQPw6Y6vTpWf6CRIZHPRKHeYvTG035VNd2mhEmHo SG3UwyAPgepDpSGZdFm/gAc4QQocdBcZa4bN86YQKxcE3v34iB7wZZkazr+RLd1xBwT8 Axj36Vr9rXuo1iNkk8n8HNfE7ZZZWZukXQHpx3gCpRQe9aNvDZpq4t7wB00CNKm2K4f+ 537RwSQxWPxPgHBwahjm4QWH6BdPcSnsKBG9L5nukVCRSLfwv7M/srXt0XQSZ1GRfX/y YjIG9B99heeO6C/RjpT2VIpU26b/6Nqg1fn19c+vJSKGMF6EFKm8fYJwn476Wscqq2kI povQ== X-Gm-Message-State: AOAM533bN6GmDs3hE6R376XhzGTqRQ3ZkV5F6U5jQfPnf/YmDtczubuz DLZpwDeKYfof+YhnoiaSdWXmWA== X-Received: by 2002:a5d:4c4f:: with SMTP id n15mr36417242wrt.174.1625772441620; Thu, 08 Jul 2021 12:27:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h9sm2722864wmb.35.2021.07.08.12.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2CF331FFA5; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/39] tests/docker: expand centos8 package list Date: Thu, 8 Jul 2021 20:09:21 +0100 Message-Id: <20210708190941.16980-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:22 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: 471324 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp599680jao; Thu, 8 Jul 2021 12:49:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztm8qaLVRomJrl8xjHOUODBtWofQPazbMBoDafv3qaGZev6ndd3qpLiPrcIuTVTmjunWst X-Received: by 2002:a1f:a655:: with SMTP id p82mr19483733vke.20.1625773794566; Thu, 08 Jul 2021 12:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773794; cv=none; d=google.com; s=arc-20160816; b=S1kOGkk6obmB0hSvwBwLRKh8zffPYpbPNpm/YqNg68MA06ewcTP0YRKv/pLK0rZ3xP VnmrcDoS8LEfeOA75VwxjgGaONf81dkVnWz3g7Ww56JcpYY6iV5AO3bmgNBvO1+AN6dw PopZGeuJ0VwKff5QozhCv5REW0Xy3njqj3ZO7Gq3+ZHRBzEdyyb4spBj3ABZtYOB26bt 0obpoiBGvVKCSXkSaoTXUIFmhHVQTPxhiz6NrQLE3fNP/dz7FwW+1nN/QpjvJFm3PHuf vEHLWqFcVggxKjIa8E9v3v8GmwibHu7XZnX5UkUdTR7kZ9Nj2tcABCZ9IAVM/nhciJqB tpMw== 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=AqiTZgkFl9/ozqQjc1vg63G4Xp+ZIedLCV6JHbsrbmLun9DjhwmEdJhuILZkZPVsCw OQWaevLmdxUjTnBSQ/6Qojn+SZ8RxgTtU8YfREJke73aECcHTZ5BJR3avGWtpSFWENzv x/rIYtgSAtZNHqh5npytZIhG8Y8lW2iN2zuUsmCdYyrKfvKdgaU29n02bWgMBNzeH6UZ 3bcb50JF11jEqxiXwEc3jZAIHT3mMFZAt+1JGgJ+sqjsekqgqLCV84oyKq0GWWzulKja W3OiqBTtGVaz0JJGgOULneGJSlpGtVriq6wHBu3B66t2jNRP60EU/RwJeFv01N6cTBf5 RuXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zm8062Jg; 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 u76si1725446vsc.12.2021.07.08.12.49.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:49: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=Zm8062Jg; 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]:42368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a1x-0007WI-Rx for patch@linaro.org; Thu, 08 Jul 2021 15:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1Zg9-0005WE-NE for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:23 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:47016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg3-0001xz-Ko for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:18 -0400 Received: by mail-wm1-x32f.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so4738677wms.5 for ; Thu, 08 Jul 2021 12:27: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=j6rn2rW0jesZ7fjWeIQQTMy5p25VbdIDcQJRFypEibA=; b=Zm8062JgL9g+dJUbOFNS/04LTf/XWOa+qVnaWMnbW5daR6LyrMSXzRGF3sa8ek5iY3 9myG8gP/JHy1V5ggssPm7R4LIb7S3kDZslF4/3TkOabwezOBCRf3LI+J0zuFO/k7VSDH XJSE14PV/p9uJJPtYCoM3XrFy1ZFA3Dk4fk7qedIt/s04fCzaZ8oxtTl7dv4UycndFKY gSvxBcmU/UmB2uixTT6duO9d5AwfT8ZS3b1cVjF2a4qwWl2bxijn+hLIEwMcK0PHeZWv HXKqOsiRnLAm5RRyBe1kMiW5iuS0fOoa0XSpuus7/Y/Rpi7D6N5GarYnbb4xbG8ywDxg o62Q== 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=NqgB6c+7XJVRyiNNioDwHc+ZwkdYNcjb4Jp5di3BQCv5aN0Lo6tb+L7A/dQwFq4WDc szzsI3kIkwiYO0wwIQxcLGEJeT1JLx9iu+vngi/NoAxcz08wUGPbfcRj9aD2hh5oGxFP QtzApBj3K06O0sVwqUEKhsIe4K5cxcqLOVUXZnvDIDURP+k/26tO08tTzYF6j0cA0DW2 tOLpfACn2Q1CeriUQtLBnfEp2zTomunyIOCHQ9d7/1du+/gqShW8g5h26ucjbx0gAV94 gWpaXo52qpmk/HVBh+LwZod0nKopZpJxdnik7FkKGL/z1Q75Yjn5tKEKxfTv97h5FlyT aYww== X-Gm-Message-State: AOAM531aEdHgCxRn1xu4svoe1syf6BMSQBSUcQ2YTkvgre23IrEhKdo2 mjHyPhqCeHGzjf8MaweiRsIatA== X-Received: by 2002:a05:600c:2289:: with SMTP id 9mr5983302wmf.86.1625772434216; Thu, 08 Jul 2021 12:27:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l4sm2737938wme.26.2021.07.08.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 43D9E1FFA6; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 20/39] tests/docker: expand fedora package list Date: Thu, 8 Jul 2021 20:09:22 +0100 Message-Id: <20210708190941.16980-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:23 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: 471304 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp581509jao; Thu, 8 Jul 2021 12:24:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWH9jgb4jGFw16PvpSHnXZXdJHCFBcn7TxdavOBQ8HCSK9PpjUoRv4kY4Dx6gPzTQpLSu5 X-Received: by 2002:a17:906:dc95:: with SMTP id cs21mr28491376ejc.465.1625772271492; Thu, 08 Jul 2021 12:24:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772271; cv=none; d=google.com; s=arc-20160816; b=c4CMf7xBRrWFyT3+u/vZGRofQzCyjACap1yZEf5jsUR8d8Iogq6jxXTVekQ2NPmhHK ftIe1w3VIDfpAeHa+l9FX9d8VxVxcO+iUB8HVMn29iOMp2jCjCq8mKGCHJmrTr8j1wpn oGF+k4saPzW9A8R6nKc+mM8dFxDzo2NPQA9fE/HaiaErmoozcs2VWxT044NjM2gNn9ip 07AtUpPoyvR3EJpYKizBMMcBpqSw6OObeqSUebHkglOsREhy57WOGu/y5GAjX8Pug+63 ddjLIvmQVgLsq9xOOsUvU8Cf/Kdpeis0tVtPoP7oXInYNpGzSaga1yGCIu6SgUqMxLwI gC0w== 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=IaiNfcOW6LUfA7y2LwNItC06/2+0kngp6rQeVbrvsi97gkZzGH1/pVJSngyzUhBSuF 4Lk/4TcEoO/BDrXDfoqWf58JA/7rGI0uDUiCXVA9eqJTtOcJC1qI7cBNuwV2g4ABpEHP 4LtjVvISxJFARnstQ0xb7aqUOGbRH/KLFDDAEZleUZ0xD+waiJDhFrMTCcwJ55zJ/UqK x+mok2X2PeK3FIB2h3h9X8fSR3Qi/8mfLwmZwG9+MjOSCp1CjmNi4oUvFoQl2YW8j4me BLKMHkJaV6OOqRHeOrauQ9RKqWRove5Fr/FIbd2voCCsjwZhqtksaqMhbchTrAGWUCTb MLcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uDz52B58; 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 24si4159158ejw.232.2021.07.08.12.24.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:24:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uDz52B58; 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]:36286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZdO-0005np-DU for patch@linaro.org; Thu, 08 Jul 2021 15:24:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPZ-0003cg-0e for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:13 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPP-0004qX-Ra for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:12 -0400 Received: by mail-wr1-x432.google.com with SMTP id i8so8804774wrp.12 for ; Thu, 08 Jul 2021 12:10: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=vkh+QsJsZ9gD8kp+cvBC59Qmlqe+1EP3ZHDMKhG7zhs=; b=uDz52B58tEF8NIP99iZKMY9NqXTSIyRvaAb64HymawYEZW/J6RmnDcWSlSAc8mXt2d 0ORYdxSqXBbJv3x2h6cza1lcnxqfV0vunifPHGlkSPy5iMdREslPQpGmttwS+uTCBAPv 3tYz3pBV54MzkN8nzjamJaSFVGwgBfbeZTq6pzuFWAv3wSvu87sUKCxxcpSescIdJBwo 1rJUGfMv8vA8dOypi4G87U9v0VtwupfdoQY0bO11yzbflqM3wiEi5ikNZAbplllyBSu5 K+pLdJZqXso53tDv3KVa3FLR6O/Toy4zbKiHo/fi+KHrqkLTFRyDapefQIxH1+KuHAyg zRWg== 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=Bbwqhf3g1CaJWfj9PwRtjx+pzTJBbs5w3euDzZ/ejA/rO9I6c18KW5/uufVhT+V2+2 jy+0eGEVUlyufp2DsbJc/SS2OvVXY6bq1VXiGR2EP+RFyyFZ9ofMa7HXLDMF1UXOOrnr vyy9et+yn3My/LcrzwQrJkl7dtgkiYMBk+GrDNIyxsh0/rAYRhWJeIgw2wyWgIvXmdbM iNnJpoNZ1JSzttr49WH7CHly7FWQhW8dCl1EywfKhPTMfdJk2nGyWLmGXSFV/sNlXzeu M8lhvalQgAJeipR2PukPO+KFay2MXE2yv1gGJ5Zxi3YweoVtHjL1AsNqOSZUfEx2M92M mrsw== X-Gm-Message-State: AOAM533RyN6Aixnu+mPL/Azag3a2Iozy349lfiviRxcUqRrIJE7nK2br ELs6sPGXxw81CBfm6CD8uqbGMQ== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr30032624wrz.111.1625771402501; Thu, 08 Jul 2021 12:10:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f82sm8936523wmf.25.2021.07.08.12.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:10:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5BCBA1FFA9; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 21/39] tests/docker: expand ubuntu1804 package list Date: Thu, 8 Jul 2021 20:09:23 +0100 Message-Id: <20210708190941.16980-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:24 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: 471329 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp602295jao; Thu, 8 Jul 2021 12:53:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+A0MYUgWSOtGu5RoXClcOW6nKvyvK4fhmLd8IJFY/T0O0bDXcG3yS/vkx9SxfzuE9qBDU X-Received: by 2002:a1f:1cc6:: with SMTP id c189mr27169476vkc.21.1625774037266; Thu, 08 Jul 2021 12:53:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774037; cv=none; d=google.com; s=arc-20160816; b=viFi6dZPZ/BhqhNwZFb7pOz/d1GjeWbyPWZHARkW5s3ukLd1M1J8qbJ1tDU9uWzC/t FM4mhneiBlGGwyTBPUKzxTpytwLKgORNFOvac3Snnvy5ysvy3evzsYxOcovxEdRrp5uU uS4Ooq6dK/WuoO8PZChlq2c8EG7xxP6srcRwuMYbLa5Z+mn5mMjxg2l5TYzu5LKRM3mz OYza/XLwbtGK9raNAoQFpu4rVVCblYZnLDstHLg7qzXUtJbXabrmWFZFJ3k4wS8f1U4b JQ1fpxsbEA85XNgbhN4IcY6Lhfrdv68CFSz2Bu3LfqWGHI/bwExmmuwHPdpx+d6fl4yi OfpA== 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=Ez3WZMqJfF2wZKjtj79IGW19vOdYkXOb1Vub0zMENzJtysNoR4JnxAf2H4CiX5btrM tsjjVzs57b48Zvb6cNtx6SsjYAlYtn3ZzL63cxdCKvkeMms73/jtHCHM5aBNQgjj9r7X YxQgkjUC+0WYHXfPwMj6jfGk1tfEN7ytAXmNl9+TArlxQvRMhvzyWv2NuQhOAiHA3ebm ThJ0SKdrV8C2uhrS9JzF3PUC7tW5tgJ6J2pG8glA0QrZwP5/TWEtHgKhzR+/L8BVnw6f 7J3RQboNU9WSQaZ2zJBvRXUpk3vFTO5EdPMNIAJM37fqN4OE2/WJpoimyaSACVkSvyJ2 yiYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PGOiXV0y; 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 v14si3640557vsf.265.2021.07.08.12.53.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:53:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PGOiXV0y; 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]:55874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a5s-000883-K5 for patch@linaro.org; Thu, 08 Jul 2021 15:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1Zg9-0005WH-Qd for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:23 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:34689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg4-0001yI-Ep for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:21 -0400 Received: by mail-wm1-x32f.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso5396541wmc.1 for ; Thu, 08 Jul 2021 12:27:16 -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=PGOiXV0yg0rNK+LskLaQ9l+f60M6ZNixaQpNvd2N9jA6uwq5u3znEvAj4xUGiZ4EX1 5+TiCPm1QF0bSM9Jkwo6qKOfNCRtab8tCzRloG37u0iFBUHc1KlNRNFqynyAiDA7kjBa HzJvuGQCSd3BIZtmmmksiQ3gWRrbqPXwTHN+xUlT5oeW6on7jIOVSuZXFlrBQDLgeyaT WgJBu/zZaF3zZjQ2/3a5KsaIswx7o4yo3l8IzL66HRbtH3eiDhwyE9MlXQmukKSaneRw RK+Y3395HAZJIZzlsM+5XgTEHndzj1CEHo6u1+nCaDcQB0wy9zzQImJAGijJJ6L5PH8O kqlA== 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=aOZZvQs5Xhz5wIA2B7Jzxuqu31C3pTzRQ/34F4q5/dvhs81X7RM0gCTHjjDxeVLY/r Cvh7OqOejO6uFdsPEOGHMzS+NUC1x8j34peZBADbd3xbL9jXk80+x+qInTMIN9hgGPI9 wePDi9SlhdZ8C0c9tv0gFKDFRAru9ReKbgCj88Aqb1kCW8UKntf7lAhJHa4pM263qo2D ALaKieAaNolpMaV15Jn0g1CI/ufaqcEQrjDQbl1RD1h2J7iDSFeX5AB5UFyTmzlCW/iP mbVBs0CRtL5EZESBj9JW5aABrYwH6FLkk9NyXnARIDy6RLuMEz20qbiPfYP60SkHIuQO 8umw== X-Gm-Message-State: AOAM5330BkWVJsHOokRxwoZ0ERnNxey5Yt1jGKZ1T7wSJan/FEjHeAPd Zuy5ad2Z1hBM+SMGLjBCx0MAPQ== X-Received: by 2002:a7b:c247:: with SMTP id b7mr34637154wmj.44.1625772434844; Thu, 08 Jul 2021 12:27:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c16sm2967832wru.24.2021.07.08.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 744891FFAA; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 22/39] tests/docker: expand ubuntu2004 package list Date: Thu, 8 Jul 2021 20:09:24 +0100 Message-Id: <20210708190941.16980-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:25 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: 471333 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp605609jao; Thu, 8 Jul 2021 12:59:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypGx9inNbYv1g0qXpo9IZUU8rRgK4F2q/dbMSZ9YQ7djBbg5lS4aGN2HIQzv9wbMpwWyGF X-Received: by 2002:a92:cda5:: with SMTP id g5mr23384021ild.117.1625774348606; Thu, 08 Jul 2021 12:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774348; cv=none; d=google.com; s=arc-20160816; b=XdybSAEtPH4RHQGIY28LxIA6sbtSXXmEPbjJKykrXz1WI8LgtgObMeOJ/lYybf2OVo 69GUs0KBnJrt9K4rrUHy4PQ2hOjOJpcWPZNgL2fjM4aYLAlLdkAPzONAJHI5pbV66P4B yb988ljmI6ytfqm0tPJwCPZj/SDO6jo6j5As7gHWXYrG3IaPKKhlGAQz93T/feu+y8If P8MnLMYpUMlrPUJp/JOzG4+ksPtquGSj/fr1431OGQq6H6+5tgdI/K5MCofqpNbzqTBc /XwSSYY7NS3ZZEq5bONjaQTjyqbOBnD8ksDRgdDvzH5jx3ysckJMXVqVSUbDWaiU9rhH RxQw== 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=iNL1+VVs7uBqX1VUDbqndVx6FyTeuv6NUtoI8TZFoqseB7WWtaO++bkvK8WfRhOS9y boUc5KqIZMAQ0KN2lo6Hd9ul9TAQQNomncUgwEAiTkGqnFwQskBMgHGlXQQt1/msEL55 zTMzAEnnmY+AY5yLI/veULmdiS0eiiOj4qIOGAe94ZiKCxe66oLofsJy2PqGG11bv3gI jwFcR56NR+9XORNBmmZlDRANzwwmEWy/xeloC38Q/6IToUSNVdZxTIb9f10KnMPDn8GS CbFHy3nma2Zek0vo33fSHbwOdrbQVyVxsNRMQhHoKGD1L5zfSmKIlqmibTCPpBvfvFJ2 V0ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QdPsJl88; 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 k11si3497781jav.18.2021.07.08.12.59.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:59: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=QdPsJl88; 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]:36370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1aAt-0005hc-Uc for patch@linaro.org; Thu, 08 Jul 2021 15:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgE-0005ZS-MK for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:27 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg9-0001zN-Vg for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:26 -0400 Received: by mail-wr1-x433.google.com with SMTP id i94so8903294wri.4 for ; Thu, 08 Jul 2021 12:27: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=QRopgnAuRpqjJ5MAitTX29dKnbdmWON3ciEwighPhUk=; b=QdPsJl88nB9i85jhd7eGM1N8Fx+e4Alz8KENwk/NVrRY/lmprlJAN9vrC9E7h83rpV RBnnpWtlHxFDO56jpALE+LRaLm3n0t8F0zIJ258d6R7on9j63Rb//omOUmCHrUBEjwwq lRBcmD/pjNqFqKOceFBnomzTayNx8a3ksGRGjczlPxPruwuW7pAZUvcZhoXt3q60Ef4D 3Qedadc4Xtqo429Jeoo2t0O4+n2f6ggZv2K2qb59BgILs86EDS0SfcIoCpsOUGvQdI+9 a+Hdm7E0wIC7rio9ybW9prTomOm9EWpZQz3GhjbUyWumWJJ2FJRHP1kquMXiBs9N+jsX HArQ== 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=HoxT1Gs3EjSRpBebXbGm4z7fliXm2CDwPO36CcpXQbGCDSw291F83gCLPVK6hrdWaf GPQTBTaI44kx+YhmlQCuGvm95bT2CCAL2g3VOT57myauEUkhk08fDbc9RGjAjbg824AY /V2I6pZvZmb9WlYs7Q83p/8HeDBzY2TRzIJAKYzembvVaQR+/R/OROzrlq/MQt6mXll3 mXdXhqofhgzFN3qTYWYo4pOgkdIHrkU14PvtfnyHvgoCGOLDth7CYOgA/V54d2njUVyv yqb0rAxmWYaoNGJd+bL0K0bkcsXpRmQPDUNENCfJyabUvA64SwLXn9Q02mOQuwVSDK0r ERcw== X-Gm-Message-State: AOAM533L7rn9iP2iVHW8C+fPrfpjJQbRG6MylCP0ICPH+kNsEnDpR/uo Q/n8OSGPZKZXnwF3+k1mYd+Opf55RvOilQ== X-Received: by 2002:a05:6000:2c6:: with SMTP id o6mr36158991wry.299.1625772440659; Thu, 08 Jul 2021 12:27:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k5sm3061141wmk.11.2021.07.08.12.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8AB3C1FFAB; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 23/39] tests/docker: expand opensuse-leap package list Date: Thu, 8 Jul 2021 20:09:25 +0100 Message-Id: <20210708190941.16980-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 Thu Jul 8 19:09:26 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: 471317 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp592582jao; Thu, 8 Jul 2021 12:38:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnfPWC4HrFkiwIQqyGz7u9tZG3j69jXI/OJ4INChiSJPc5UeY5qm5Z2e3aRqp4taAUIn+N X-Received: by 2002:a67:ed81:: with SMTP id d1mr29511195vsp.31.1625773133295; Thu, 08 Jul 2021 12:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773133; cv=none; d=google.com; s=arc-20160816; b=o2QBVENRMmRUlCIf/PQgsOGwxrE1p1jEOgwY4Dh2ummV2pKzyHLY9SU5n9UaveVOLt pD4TLJXh5r/U9COIOOyjcsVhXWvYCBmDWRFPufOmvdw5R5OVD19dmdZmt0IRwixikUtX qIAvo48Y/6988iNvGb1PkIAd1RjCIwm8m54LRDw7PG9LwKqhDuI+jzf0x54Y17oZ1A1v 5t/H2bKYMzMyhF/erFimMi/a73vtiRmR1ysWO5WfqtszmOtbHnoAvwa/7qoLFSQIsFFW kIcgv91RQmBNasPIQrn2ioDlbMdSCa/tyV/c1A/AS8FLMEUPlW/k++U8mbfWrfQE98Ls 8rDQ== 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=QZqKEBphhi/TjgNSE8qDyjjqYpoEgxPp3Vpsek4qBCQuxF2lka/qPL5oI7GNNzNNRt TMU+5FayDXuy7dnxPgzsyzmj7oH+9SV3Cd17UXhWGzqM0cx+j76cONXbiScX6ezI61yo 9Z+nV9fQDKTOh/FG3mJCfUBS7M5FrJ1O0FgZWj3Z52hgirZlEphZJE0DKK2PSuaay6IK L7x5oz1Zrlt5hqQZGscn9bsOjIAEfxGDg+agEmOeNgHjGDU8f/v5Z+/fIFgJmXSF57i+ ClnIEPOKr7Kh/vn1FqqtnQTu2mbwNNtFpWQndwipYPvh7prFhAC7hC5voi1oasNRo+iN o/1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pCz4A9NJ; 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 h97si692221uad.180.2021.07.08.12.38.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:38: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=pCz4A9NJ; 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]:47250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZrI-0000E6-Er for patch@linaro.org; Thu, 08 Jul 2021 15:38:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWX-0002UP-Ag for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:44557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWV-0007WR-Av for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:24 -0400 Received: by mail-wm1-x32c.google.com with SMTP id i2-20020a05600c3542b02902058529ea07so4718319wmq.3 for ; Thu, 08 Jul 2021 12:17: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=OsQYMRRF2LqfhugUabYWk+fOdkK5koC/O99HVRocaM4=; b=pCz4A9NJWowAynxUSrtpUYDoeS28bf/Ieu6JbCDk4I0/0sMj/N136MH5M1l76egiRi aOgDD7QXGeRTqponQS/jUYzc5wSpbdD9IFO0iy77yHI6z4gcCST2Er6T/iCP4OuXB4ov uMQZ8Nl3yq+kAe6I1SFNoYAT19x232UaWk7MRHEcpOSEgSPfRpG0yc7n4FIkC+k2RkzS XBCO9RdrreY3MphR2WBf55X8BlADYsxa9veT7VoW1g/web8NDgfs+O/FOO+6W4UoLv1m nn1cevFKaDWPx8TtIsm4rENf2cgur29SxnGr/uCM74KSR52h6OvubSF9aQF9hPivX0Di hXNQ== 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=fsfsfEMISqvgaRLVxBSbxdE18UdLoJMVxLOrPZPvTdNdqk9+V7JJNVaNIZWzEkgIbC l87Zg7cUSl3m88dll8TLcvF0tZhBJ7sL9kYsXXR1zCItCLYei7//NtuDaw6njhVS4cix hOk8xt51T/GGOyN1UuNUJ3IlP1TmXGYiljd57AtGAahGsxrN4IFYia1JFPj98Qiog42W j4nO3Au6NVUdTwiqak5b5PCuutzc5ZyHvtGSyuo9tUGSMpt4/gSiJm8ieZAp1eJsuryE iVJG+1MLtK184deWe1vLt5emS7gj/Oydb48+D6Spq6E9XfEeWROkVyDTlP9ccdmFavQT bIJQ== X-Gm-Message-State: AOAM533adOeR9OYrHZkbLNMNGjEoxBD2lKdGW380Pq0IwCWl9vEOYeft dF6WmKqbzlBK68T9IzXyTQvOYA== X-Received: by 2002:a05:600c:3b90:: with SMTP id n16mr6904678wms.70.1625771842018; Thu, 08 Jul 2021 12:17:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p9sm2961276wrx.59.2021.07.08.12.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A36D71FFAC; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 24/39] tests/vm: update NetBSD to 9.2 Date: Thu, 8 Jul 2021 20:09:26 +0100 Message-Id: <20210708190941.16980-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, Gerd Hoffmann , Kamil Rytarowski , Wainer dos Santos Moschetta , Willian Rampazzo , minyihh@uci.edu, cota@braap.org, Reinoud Zandijk , Brad Smith , Thomas Huth , stefanha@redhat.com, crosa@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , berrange@redhat.com, f4bug@amsat.org, robhenry@microsoft.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Ryo ONODERA , aurelien@aurel32.net Errors-To: qemu-devel-bounces+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 Thu Jul 8 19:09:27 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: 471330 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp603342jao; Thu, 8 Jul 2021 12:55:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJAQriPe/NDVZ+ZdWMHi16xnMehURG9f7rGP1gFRufuhUkn42XwUt9P3qnrmoPYuNry3u5 X-Received: by 2002:a1f:a655:: with SMTP id p82mr19502992vke.20.1625774130294; Thu, 08 Jul 2021 12:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774130; cv=none; d=google.com; s=arc-20160816; b=e/dM2ADERSKTmueipuD/AGm/mloT0daHyCHcywARjCVh2IOH2YlicV+5sk3E6CgsW8 NuKuJJzzizafg09lPI2Oy8RIub8wxEdxyPMn/QiWag+K+LXollFcB5GMMDihhgWkN7uU OwZF0C1hgGj266w+U9S9FTxkoYrx/K4KImYXLfNWBOPq7jWojyHuv99frGAk9p83KvLC eaBzjJag73d98UdUtxRpCzq0euPX8cecq5o7hJHSldkVuULq7SrIUu42QOiu0woF9miq B8TNlayFkad2x8BPJWG6UBk5zunA9SeESIPK0ou1Fg4N7YA3ujx8zRkvU95lKnLDrVJH TB1A== 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=omP26UA+NdLa158ylfMWwSHU6GsHjp12qTnjQrDRgDPwJ1pkRV3LAZfGHFe+LdaQNv 0g3VtppdK1keZefJOXoc+wwK33AM3VKTfvYrnfdHoGJ0ihQzn/8fspLBEXlefs9muJti vhBg/p1rkprXmFdyIZKtKsaCGloHLZivq0S7gIqSYy+pQiueTS3Q7FHe9YKX6AmBKL++ yxieuARsQsN07MF/VXZouefa9/xtYbWdLenDUPkwbWFN35fBQJgB2FdRJc2QFZd+otZI ATf+EdDotNvbDvI78RrGPhylI43sCllGgsU8UmSCf6TVoejmqHiA6bRqT6yFrFTOraLw WlnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xljAbs8f; 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 t6si3437792vsp.64.2021.07.08.12.55.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:55: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=xljAbs8f; 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]:56096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a7N-0008GW-N5 for patch@linaro.org; Thu, 08 Jul 2021 15:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgM-0005cE-Cg for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:34 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg9-0001zC-DT for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:34 -0400 Received: by mail-wr1-x42b.google.com with SMTP id l7so7968068wrv.7 for ; Thu, 08 Jul 2021 12:27:20 -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=xljAbs8f3yDh0PD0Bf9afYZGIjAsbWfngyhXrPMObYodZ/sWeX8Kim1uZoPbVTOD8h 9qWi2OVx84KN9vsLewukOHm71gXiCv/9OW3laWtgZzRUNarHw1cT9O5VQwEDnjHApN8S dl5Awq97AvcGXjqf+FerkPW00awPTcFdo3SPP+H9yqob7cGuUrAFqBuW9Cykg7s7ZVC7 yBNpBFID1IyqYSVD3JMxmQhOL8mUOTGQN557mOVqmi0x1TC2JGm5TnFX2HCd1QuXI7xm ASqUe3ND3XcQ+2sQRywYgfAABCFiUbzOdEObtBigINnhMHXxht3Onrt0vneto+Gdmt2+ e1DA== 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=sZ825HirnUamnWojLypzPaikkiuh+DjZP5g7mSg5bIaZyg/A2o1AuXPrrEa4jsslMp lFgnVR5C6/L0tqggpY/VkPcG73P6fvrBUaZL/7pw5CDxd4tiQQ3Ipf/FptA4p1sSDB6V FIdzClxfOhrLVEkZfhjGyuPc/8vsODts+L6AVW03KkRirMCnVyTQoFvPPBwUayyIKY1P 7fGzEDF5fTZVkuKCUC3CdR6Pfb9YAJlhIFv+HzrIQMSyVNSH2HtpgA9sHu8ooKkIttHZ 0RBLCGvkrwmLrVGsEKvdZcRasOimh4uRD7Aiy0q78RpZMX2tHn/u8ubCiUKIFfMOIp8T HnZw== X-Gm-Message-State: AOAM532wFIC+OgHKnp/eufTxdad0t2QqegHTWC78LbMix+sCfTATYHIX YgpRMpqdD25BiMkWlv8cKgTlYQ== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr36671045wrn.408.1625772439264; Thu, 08 Jul 2021 12:27:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r16sm1932480wmg.11.2021.07.08.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B9E261FFAE; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 25/39] tests/vm: update openbsd to release 6.9 Date: Thu, 8 Jul 2021 20:09:27 +0100 Message-Id: <20210708190941.16980-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Wainer dos Santos Moschetta , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Gerd Hoffmann , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , 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 Thu Jul 8 19:09:28 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: 471331 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp603605jao; Thu, 8 Jul 2021 12:55:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx56I32VusASYTMnr40fwhWDgFi+TlSFjakl4bSP0eOyVA/K593jjshG54tVgbI+Mo5InsZ X-Received: by 2002:ab0:7216:: with SMTP id u22mr31734250uao.48.1625774158616; Thu, 08 Jul 2021 12:55:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774158; cv=none; d=google.com; s=arc-20160816; b=u+g++iEoUffXVHUnCv7kMpN25Xe8bbVbgs9MMyeOd0kAijIr0w8O+dLwdmEjj2YABf BY+Jd5KWvx5uXzaGJzpKXxfjpfBMKJP8yPjGFaAF9TgxwvjH38OGmuKsaQGMfyeYMQdk IO7G0K/OTImeboWOQSk9y6PFOn4jhusur32Chi6U0ce5/bLkYPTY8x0iL3D46Fm+Ey3N A1xSyosYeQNTC6nduWRdqnRyJX8cHgK/oXEqc3gGCoPsMUcdJmT4bksh/y5698UrbK+1 zpyFgO9BhEy3//2OQVorYMc+mxUnn+1Lx6SKiOTvUanGoQDWLXp4YT1IN30zHlMNAFhL 3I6g== 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=F2JJ12gGbw5c3F36GjrZ4QHL6f9G9eEhcSC0FVq0WCGxCvK4z1iPpmAXG64plZPtxn mCOkFzYYZzjsQQ08gqdvzFWVlmnrvM0Q0QT13+vBCfEbZaXSMI/9sVFdnZCct5OP+kjk LzSWyxhlMtAOyREz2cK7tvAPzMsPSwtJPEvXmB5losYlTx8qi5NpHrALxiJr41DN5qbV Y05q1EimRRpep5ygGajYTOEZP66Z31s9ICsuseGcwnN3mi4p299sWthg9Kti6knmP0lm Jv+3j0+t4CqN7x0GKPx6N6PP7HnQwcqKowVZ+vLLRTQvgSuicGKeYn6vExGL52CrSPn5 cULQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hPPE2gO4; 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 v20si3421257vsl.142.2021.07.08.12.55.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:55:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hPPE2gO4; 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]:59398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a7p-00027Z-Ue for patch@linaro.org; Thu, 08 Jul 2021 15:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWb-0002b5-8v for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:29 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:44561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWY-0007Xa-2P for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:28 -0400 Received: by mail-wm1-x330.google.com with SMTP id i2-20020a05600c3542b02902058529ea07so4718413wmq.3 for ; Thu, 08 Jul 2021 12:17: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=1h84YElBs0lvJoVGYIgs0VI8lqeK9O8muT/nnP9fJ6Q=; b=hPPE2gO46NXah1NC5HCsus2mCSo9+W9MTFNZT55qkP4DbU5HAuJ5wfbpclz4AyvONe GP6BQHFdTs7OSzIC2ukraF5K//zJ1v6fDsxhah9jTdf0B6UBvpDWQkVir9jo2Nx9x8mL a1e3kSSU/QB26+ynz31pC3wzvqHyjjdGzb89w6JNgYXD4CIvltNx9rL6mSwD49vzJalv WBRKKvIMf66j5y7GTejghs3RXE+yrT6NmkvVPYSnOL52vbpyI7WUMo+aXiPJ9Lujf8pf P2eWVJpughypFYfGB5/lNrCOsTrs8kMaxFBIBB/NJC0rEQQMCbUC6AtoCrR1c/gD+/HK p8lQ== 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=pMj9qyI4zNOf0qUQimHPmMmHZ+nBQ67sogvvltrqjXTNCK59WxIAnmPColmJ7QfwT4 qMLd6FsK7I1xXIypY5D599S/aH1rkJj58BhMVUzD5I3uOrXo5WuLMj+GIOS+W3NXm0+I S3DJmmsc8QubsMzlZXKOYDYEFA95rw0DGEgN/7s3sp5ONRDQQZGa5oI73aCgk9AasYfV hYNQwtZPVJm3mAuX4fY9i7Zj9jpDqgA4MKfLZE0XlB7UlUTJjmB2DnIfwIXlVI7Mprhd aJ99umt2aORSSWEN0zfRJGpJ8KUrdLHSOoQgk1a/v389zNtCR3t/eCIB9Mhj0ITfBvff CRFA== X-Gm-Message-State: AOAM5321bDMjscp1pabY35iVznRM9mS1SfMzmGY+QZRIIavHZZQ2PZV4 jW9JUXcYZvbZP06mpAxeWYi3r+kNvrd6aw== X-Received: by 2002:a05:600c:220d:: with SMTP id z13mr6922203wml.67.1625771844715; Thu, 08 Jul 2021 12:17:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 11sm5289184wmg.40.2021.07.08.12.17.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D06B91FFAF; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 26/39] tests/tcg: make test-mmap a little less aggressive Date: Thu, 8 Jul 2021 20:09:28 +0100 Message-Id: <20210708190941.16980-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Signed-off-by: Alex Bennée 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 Thu Jul 8 19:09:29 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: 471328 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp601383jao; Thu, 8 Jul 2021 12:52:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0VN9hLsJcqMBnSgBJ1tgBYuH9vhdXr1olhCAIiM7NcqVZLB1w1R4eXtNpuNnGp+DeDS93 X-Received: by 2002:ab0:3b18:: with SMTP id n24mr832435uaw.95.1625773956691; Thu, 08 Jul 2021 12:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773956; cv=none; d=google.com; s=arc-20160816; b=RJUWAlwkj4lL2KiJl97kaxqlIsGgoJIXPmXK1Q+cNY/aKN25WHs1E0bcHI8dRYgezZ y0fySXpezlypod/S7mM01s9ooOebisEDsy2TSAisCtQefzAwzDQoipWMRuK+fRQqd000 P95eVBKkxoFE5WeK02LAlSL5WMhIT8uJIG9da2H9al6f7RhQDc27jWds5KW00DbFESw1 3NI2uRDGp+kJQrAcefjWZD5ENnFBH2tFGv+fWQPeip6GsSP+uhc+C50XPC3kWS7XXppL vHfc1MUhgSTQJbPssLs1LtfwwIffwnBRADziaYrzP4ySoLRO2xZPPYh/Kx7GEDlWrWk2 r7NA== 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=M+NVGXXSj5PBzbykrkoJlCrFphif0w59addCMf8TFSOJu54d2K01pBdnBr7TxoLdtG 9vKRAgz0PmC2pY1+UmUUQLOuPFqWFNKVItAw9XR6KtHKdAWD+d5WDg9/xBi071/iofej HNIRfbkQmQHMsNcLDlBE94tUDmipVOZ/58Y1i+lBlwLo+gelYzBIZEOvmsSqq+0Aw8cH G42gD3BuBzElZVOFAKsEh7U84kFy0ajbwm3Om47931HcFex5me3Hk0TdU4hqAX0KzcL0 iHjrATSraPFMKRPiNijnF7etQEk0BW4UqPYZuHKjHpUYVGQUi8XvuYWLTd2f3NyI6XNr zvFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fF4lYccg; 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 y18si3507115uan.171.2021.07.08.12.52.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:52: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=fF4lYccg; 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]:51088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a4a-00050S-2x for patch@linaro.org; Thu, 08 Jul 2021 15:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgB-0005Wb-F1 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:24 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33302) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg6-0001yT-Q9 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:23 -0400 Received: by mail-wr1-x42e.google.com with SMTP id d2so8963886wrn.0 for ; Thu, 08 Jul 2021 12:27: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=fF4lYccgE5zaRkXbcGb1m0QOi+mPXnbTmm1l2Oe7MmCEcNvAVn35MUIpMJ6+o1OQcc 3Ik2RP2yuvOo56emb7UbWj2Yk0UVDxftxmQMdMHscd8pW9RBMM23k1Wh8afuwGBZJSdU 0Jp0C3PaVI/40PtRpqDZKT74YCqUUAavnFQSCW0dhfSXoCpknsNobtq5nZ13/1s/x5TJ Jtdc5HhQa5AN6wPNBImXvWzmSF3o7uatgoMrGVecx06AHi4WXnMPKiWLx172zBX4YubN HKpU5X/RMijePABBCSzKF56eVFAqtJP0ILmsJOn82BwSyCNGUv2uBRet+hAdqwu+N2ZP DICg== 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=ACUA0Apzcm6eQeyE5pVz29cUMUFxnfyshXcH/kcr9pc3iUBjyEijdYd0HZQr5uV/VP /CjqGErecx9oFbgULB80BGl2DE5+3/rbYcZUCDLrFgsO3jF8bjYpvPtkb1EaqUbIo/wF pmsl/lQHk2L5kBWqcdKW7qar5uiEy78pfi5XR3Cpr807Ki0keLxYI24jffM6/KTNb+lK +elMvav6o8cXo5yaMjLzeyCXAMew0Bl/m2s9G9AFo8vIoZluqlwhwVhrbuyF/vsK7HA/ XDp1BYFs7QSPJHuS3bGrxvXipYnTsGfcQPjklR0EcJbVA7kEt3r+PXwFNjaQr4kNsKou /YUg== X-Gm-Message-State: AOAM531sHLWRMWo4sOv36lfJwcCfYFWPVRc6kVNIZlghRq5OQXDSHmht ZsxHFJF52AXWPZq27BtpKr24GA== X-Received: by 2002:adf:e8cc:: with SMTP id k12mr36244891wrn.163.1625772436605; Thu, 08 Jul 2021 12:27:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x21sm9844150wmj.6.2021.07.08.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EAE8C1FFB1; Thu, 8 Jul 2021 20:09:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Date: Thu, 8 Jul 2021 20:09:29 +0100 Message-Id: <20210708190941.16980-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Reviewed-by: Richard Henderson 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 Thu Jul 8 19:09:30 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: 471315 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp591018jao; Thu, 8 Jul 2021 12:36:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOUkyU7SAqIHmHMra/v+TM24jp+D6H2GhfuOVoPQScKdF+KM7SAVZthH9a+BRzwe3G02Q2 X-Received: by 2002:ab0:906:: with SMTP id w6mr20460803uag.37.1625773007738; Thu, 08 Jul 2021 12:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773007; cv=none; d=google.com; s=arc-20160816; b=TOUR5814bgBEFxQSrAiLArUWTfZbvdmCfc7yzNC63BvLDINQ2bYZnszDbbfD975+xM cYr/+9xlyV78xcLE3jR0Ux6g8heMBsBPHrylegDOoglTnJuegGGlAOSGaZ0TBdsMCg1L vhhV1ndOwt13mYHseSPa+sJeyuxlqJE0uLgoAl+qytB73Ma5igp7Ub/HWdsPXuAmxoET cUX29PJN2IWfvvx7hlBlkQvEtkBvqk/rbFWaNFORJQR/CB+vAFn5q9wCWWNhhMZbK8Mf O/zShvjXiRYOVw2jGk+Gv+DlhfRcJA7/sntwxuVdOcjmyZhlT4wQQgvPSNo5p6sHT/jK /e8A== 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=VFkAAe1+C/XIHmPSBT/bxQ3ZbPwxRIEDcHJxG4Z6/yDVi5dvHchZit4ncp/DWMDNbk pq/b8HHEM/z/hJXXSHWHKEv/JhymVqf5dV5w4YTPknxRmNLQfRH0YVJjdAfX191B/Fap Tvi8cSjcrup5emGK9msi6lMkLQFFAsib/nhe7k0AwXWL4RDsuWtNa0jbHHV7BC8x5zNP MHrp/HoA5HdDavFqKIO3uJOPlHSLZTzu5gPtgxC2Zgo1G8LABuknQ8/GmEIqyagto8G+ uCGaedXY8moguFpuBBQjKxUiDvAlnDCkDFDdiFTK8Ew9hA9GptINx93NaAxCzrkrAW0N jd1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=azYmKppu; 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 l27si3912290vkn.6.2021.07.08.12.36.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:36:47 -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=azYmKppu; 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]:43342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZpH-00066y-3w for patch@linaro.org; Thu, 08 Jul 2021 15:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWV-0002Le-3r for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:23 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:41844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWT-0007VV-7m for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:22 -0400 Received: by mail-wm1-x329.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso4749032wmj.0 for ; Thu, 08 Jul 2021 12:17:20 -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=azYmKppuhCB+MOQfzl4y+i0BvKDcBKy/7cc6G7HWV0tuB6PdBFaJZJv8Ab47PTh7RT 8j4wJjIReIbabhigq+a/RmlRxeSfGQNU7jlW7uAtbIANN//3+/yzxwxFKS8vDhXNdrdU NgyacgpK40CChRW1rNYuSw+tWjPjoc4hDldujUUf0fRDO5JV/J06lPUGzjZZa17w5Zq0 iRKjMy0ZSyfUAzNI6YSVj40Fet+OsADRYIoIBEGAstm1ecI3gFkCbdqHGlSBxMmNjbwj /MtaCAz7eF54+xu6FmUlAvm4cSSx1cjD/wSVjIkwSoLzprZaMAt45kmvKhyxsbU9IApL CllQ== 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=KxqtypeczlNb7X218G31gcNiMnFw0NEzd+Gu6A3QmwAx3jzRoplCAvNgygtgvMGrKY +3TQW1HSjVMvyiLeCExNOtqvdxp94QSKT8EXiU5uQu7yfWhjEoOuL+EVNSpqicINc806 EkgoeQjKLstr4mLMqOmz8UF4LGlO2nFYvlBJsY92bXo97ReEWjeBSRb/j3vLcjwbppOm 3RomIuMlmE8uqlyGqqHuksr16y78pCG/MIktnm/BImWNib7LfSH+dAkA+25WLjc8YqtU I6DoJ1/d+IOdkdbVyR3JLAsGxfWPYwTBjMjg1Zl08CGHtyKsrQn/V0FOjzXfYPsLoism TY9Q== X-Gm-Message-State: AOAM531pRsvvXcoHAKsVaNL0IY0vTX7bt7Cdq8fPlm+KpUuMYRXLW7wt RJ5Lb8EPewtStGgdeLieURi1Rw== X-Received: by 2002:a7b:ce05:: with SMTP id m5mr7262266wmc.64.1625771839903; Thu, 08 Jul 2021 12:17:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r18sm3334531wmh.23.2021.07.08.12.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0BBD01FFB3; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 28/39] meson.build: move TCG plugin summary output Date: Thu, 8 Jul 2021 20:09:30 +0100 Message-Id: <20210708190941.16980-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson 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 Thu Jul 8 19:09:31 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: 471319 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp593828jao; Thu, 8 Jul 2021 12:40:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPCFZqZr3FRMvepfqXWQ7xdmk/2KVpzmvop4Ir8TL+Pc0MeMMC56cMA2o7/JPjdLinovyy X-Received: by 2002:ab0:1362:: with SMTP id h31mr22927414uae.24.1625773246617; Thu, 08 Jul 2021 12:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773246; cv=none; d=google.com; s=arc-20160816; b=sdjwp0fNrCg3vcrcAgwpThOGqjuVshXDNL9KbT5zB8EqsWLlqir52VxN2WeohJhV5v GoLbOzr7McAJOmrUuipZOacgvjV5YDTK2Ks956FCP5VkBrzMEglmWRrMYFqKlOCtJ3Qx PYIrfmgseUgu92fDLkbtjtwJBkWPVulGeWUACvfwlRRl4m/wAwZ4l21sepahPCKVhOND iQP4u1nzGHsOpEAUBM4eTnUlsjdh5+Ukrh5PK5qRuPfODqFfb93lqj6BwzNWjyLdktRA npoSyv3vkiFBH2B9yBDtSo0Sd0wQ1ckCMtNDeroQU1gs4rTYghATD5r3whr/gkKhnie+ 256A== 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=Mr82V3RANAgu55hmStjZWk0TQih73s6qJMB8WUffM3M=; b=XPieLgFSAkwGLRvFY8oK0T9oAs/jlBgJTAOuURl14J5Zj1wmHLkAl4HDqV+Maiirc7 i8lqmWrkuESBFsEwzx65ww+nDCwvLsjG/LcMIjj5JhV9rV06DtHiM1w9MmtPFA8gEEwe TzjdgVri+0ap+0rERAEQIShAtQDZcqzkfI6eVRAILkH9JarL42PLuQGJcp3riGqoJgil QdjMt8qheKeJjBsDL8bJv1e6z+oG8iTAOle37o32Ckw6zDz4xOXs4qi99TaqxyTH+4XY 0z0YU45663ISHVjh3axzhuuS0y3wtgXFjPk+jPGM+ykCHjwT4Ko6bVmRXIGtP1IdFR5o Od8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=s86eB1bF; 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 r68si5542913vkg.48.2021.07.08.12.40.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:40:46 -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=s86eB1bF; 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]:51940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zt7-0003Np-VC for patch@linaro.org; Thu, 08 Jul 2021 15:40:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWi-0002rw-EQ for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:42936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWf-0007Zp-Vv for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:36 -0400 Received: by mail-wm1-x332.google.com with SMTP id j16-20020a05600c1c10b0290204b096b0caso4723568wms.1 for ; Thu, 08 Jul 2021 12:17: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=Mr82V3RANAgu55hmStjZWk0TQih73s6qJMB8WUffM3M=; b=s86eB1bFEpGTxc5M/zeZ7jtC5TfAENxK+etuD0OqFKXM/mCGr41X9b8I3V5cMKIww4 AfLFRgLpQ5JTY1gXSaUfS7cHFVaP1un5YCTR21IJU5m8zuGblQ4EBQYVh+8KjeRhmZai KVjfjfR6D9+Qkp4jC85z8eb6WXsHw5jA3FC94MTAceVzys5uKRx/JQd++KXbIv6WCh42 XMoUzyUI308blDneiF8ELFxwWRZ+HlBaA0JXyjVpG6Zm+5oq8aQEIQCFAIsco39MDaqL jgysNxhVIf1cFAYGZd5cT3zefmhNv3wMSpoDkDBsSWUqs0xPRh4H3bbBxjizBl8yKYCm GilA== 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=Mr82V3RANAgu55hmStjZWk0TQih73s6qJMB8WUffM3M=; b=ge+c9vXNHORaO+XyOS0e2XXepXCWKuksABRiIo0+DP73mKsM4s0cPN5zrufHGpAJmw 0eJPa07HquubZc811SCZp7iVi9q2EYcBI5J+GkwXrXl3zWL0Gcq64I1kVeIzgLBz2fAc ZFCiu/EWC0Cbvv2c2b4ALEXCksRCBb28lkjbFwoEtvX6T0Y4HntKix+7wdutxo35A09E Cr2wgNYqCawAquY1waJ+OzepcVymEU7vFpYTpgPE1CaGgbWhP4VHO1aNTD4GpM4Qi/zg RbNSBlgn8FXOJUEXmzJjVFQppx5RNihujPxKj9X9OqDqzp7kFpgh/kcfxXr9gS1qVtPV GqTg== X-Gm-Message-State: AOAM5334tb10b472s9hzFY9i+J9w2yYkvUedqCgs+GhMmz8/Mlm4uen4 napyeabwB2zI5aAGYOVZWFLr6A== X-Received: by 2002:a7b:c182:: with SMTP id y2mr6996058wmi.155.1625771851838; Thu, 08 Jul 2021 12:17:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j4sm3175449wra.1.2021.07.08.12.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2161B1FFB4; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 29/39] configure: don't allow plugins to be enabled for a non-TCG build Date: Thu, 8 Jul 2021 20:09:31 +0100 Message-Id: <20210708190941.16980-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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 --- v2 - error out after all options have been processed --- configure | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/configure b/configure index 650d9c0735..7f906be68d 100755 --- a/configure +++ b/configure @@ -1098,6 +1098,7 @@ for opt do --enable-cap-ng) cap_ng="enabled" ;; --disable-tcg) tcg="disabled" + plugins="no" ;; --enable-tcg) tcg="enabled" ;; @@ -1563,6 +1564,11 @@ for opt do esac done +# test for any invalid configuration combinations +if test "$plugins" = "yes" -a "$tcg" = "disabled"; then + error_exit "Can't enable plugins on non-TCG builds" +fi + case $git_submodules_action in update|validate) if test ! -e "$source_path/.git"; then From patchwork Thu Jul 8 19:09:32 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: 471316 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp591380jao; Thu, 8 Jul 2021 12:37:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyAFgYBeGHDdEa0+4vypETZNPc5RgxwlNiV65s/GtF231h0dBHMQrO+1y9/walXRaUhnbF X-Received: by 2002:ab0:482c:: with SMTP id b41mr21748527uad.97.1625773035452; Thu, 08 Jul 2021 12:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773035; cv=none; d=google.com; s=arc-20160816; b=bKtJTITl44XVOAhsThiMnSYS9TlnIS2JPTEwUnM48tVE5kmCvYCSh+B8IUiNMz2f0U NhgKIDa11c9oF1iGyG39V21gyyHyDGV976wsdtCOhI6JT+DyavMsFht/r5DC8fL4OCd0 OVZqX7TRIXDrNA56R2WFA/3IyxMPjZAXwP75WKm9xopGRo0LczciZmxc1WLNqAWxTM1x oQqm8dr7ewbhIlyCUymV/D67TM/vWb/Dt30nfNvPa+a9XokfKRl86sSvX8MUJ/giGoCd whpUa2N5KB1jF7uyuJDVPsvLKnBcZR71tu+vOmLYGcxdklg0r27m3EeRoB/LY7nSEdN5 xSRA== 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=1tFxEjWS8ph3QIQaLzB5s7JcBmanfU2D2gi2t0MWK88=; b=ZPliGwcQhj4q6fknVdtAqB4PvW6jBGTtRLJ1tG+M1Tk1bF571dP3A00vXFVPC04UA5 CYdmBy9FAeCEBu0g9nPY9XIe3ZncAOjDlcfsJ75wlds8StcUOrmjjK7iHbPNf5JSgGCq gdZxG1XEJdtpA+YZ731NU4MV0KZWy0PpK+iNen8KxujeVH7fgF7xUDzveU7Qy8/eXQ/h C1ZUt/lbiAJQQXsIXesqio/ogFyPNY1MOmj8+I5ljlDLqQPO1RsnYASQjbOUz8oqsFnZ DxPd6XFVtY4jr5v+7woelPaabMNanDNfZkERlnTDzyeoohG8EX/XPMw+msfAEe9IanFP u9QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ADKU35rs; 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 e18si3553506uaf.139.2021.07.08.12.37.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:37: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=ADKU35rs; 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]:45448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zpi-0007Ux-QD for patch@linaro.org; Thu, 08 Jul 2021 15:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWR-0002Dq-Bk for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:19 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:42936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWP-0007UA-38 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:19 -0400 Received: by mail-wm1-x333.google.com with SMTP id j16-20020a05600c1c10b0290204b096b0caso4723078wms.1 for ; Thu, 08 Jul 2021 12:17:16 -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=1tFxEjWS8ph3QIQaLzB5s7JcBmanfU2D2gi2t0MWK88=; b=ADKU35rsfvrjNghrFP9PT6FD3RydEny2MgPTdG/I5tPhCw5xkJq4iKUpFC9Vbvl+RU 5W6kAtBSi1i6sjS4/jugdFEUzq5FXx6YEadKsZKryW/HXb3G2i1OXUYTyXLScmB3g9nM /O5mG3boY4p4H6yl10SrJdadE6ugQZUwRLaLyOA4RcPrxaP4mrv4kB48zU3OnlPwHJTD rmbqjDUUyoAkkUMONvli6QerVMHLJ0XdRKSufbyns4VjB6xgVQFNY23/ZYInlkADnVj3 520X5BfchpM0oUZKPt5Ld5ESS8Aq2Na/TYAVoHvqnxd/C0AyfVs+q+SDDkk4jAsa3QRu J+PQ== 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=1tFxEjWS8ph3QIQaLzB5s7JcBmanfU2D2gi2t0MWK88=; b=j3aTPNtZrG7NOm1tW9kMhfRbsQKNMFhL1VWntbfu4vnPpb1DyGHAsBpk5BJ4eb3W8x OaODT6YBpv+BM415HVVEfyXBbYZiJnvcE/rI8YIo1eQ1TNKt/byLtdO/dX15+FwlTXXy XVbjCViclm4w5OHRxIeqHDckIN1bkDST4N+w8arn0Mm+fhjs6B4JWrtAxjPQe1VayZfP 1xZhAeusKoSYGm2V0FgoH+aj1EHitUXVCZSNLpDqMPVJ1fLBpXbLbZAwgw2+rdhPjp1c +DLr8BoWFq4tJuV9LykRRBPQYuioT9Fkkp9TUwImyZAQpL1GarlJn607fhZu6hupe0rQ wnQw== X-Gm-Message-State: AOAM530sduHWG31BMXy3Wft+3C0gYh4UVvxsf1p/KJqiyQgGFzLOE/5U JOo/kIanUE/W2vTlr4UsDJ7TyA== X-Received: by 2002:a7b:ca45:: with SMTP id m5mr4512671wml.46.1625771835319; Thu, 08 Jul 2021 12:17:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p15sm2641544wmq.43.2021.07.08.12.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 36FC91FFB5; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 30/39] configure: stop user enabling plugins on Windows for now Date: Thu, 8 Jul 2021 20:09:32 +0100 Message-Id: <20210708190941.16980-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net, Yonggang Luo 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 --- v2 - move targetos check to if we try to --enable-plugins, default no otherwise --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/configure b/configure index 7f906be68d..43f4d3220a 100755 --- a/configure +++ b/configure @@ -708,6 +708,7 @@ MINGW32*) audio_drv_list="" fi supported_os="yes" + plugins="no" pie="no" ;; GNU/kFreeBSD) @@ -1510,7 +1511,11 @@ for opt do ;; --disable-xkbcommon) xkbcommon="disabled" ;; - --enable-plugins) plugins="yes" + --enable-plugins) if "$targetos" = "MINGW32"; then + error_exit "TCG plugins not currently supported on Windows platforms" + else + plugins="yes" + fi ;; --disable-plugins) plugins="no" ;; From patchwork Thu Jul 8 19:09:33 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: 471303 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp580605jao; Thu, 8 Jul 2021 12:23:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm5AdWlV0eHv8SLVfB0XECemsweFyvCrYC1QolC7XTQu3ziGDvNMQW6FQd+/7/QG8XILWD X-Received: by 2002:a67:eb86:: with SMTP id e6mr29166529vso.27.1625772197472; Thu, 08 Jul 2021 12:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772197; cv=none; d=google.com; s=arc-20160816; b=PGTyVzFlSVJlxZF93HSQ04kxRS4mvqd0h/vvZVQ4OOPcSWSb4jc+VCN4TXi82N6+Rd 6xs/+mr1f+kUXldXiQ+6fNwUOV3ionrvGfoZx43kTyYOLbcCCDTwTiR04U64CIMYQQvr Ou1mAOyoryFkcC3+OJCa/2qjHf8cDEow1rJ7mEdoitXCYQ/IozqVaZn6f7fHXUD3c2mR sVJVrELgozZmEC0SLPCrCDtx1UD2C7PtQp9ULWVtncj/86RiAn0qUS9Bhkdyzowx8oB/ IdyGAaPuAXUs/ji5OeFd5R8CK7nkkHOt0rnUJrlXflcRBfEOQGfBvw+ULixi4PZ2S2DR q+rw== 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=0gyrc3JGYbG1/lrB5uuyjPa8WOVT1SfE1gj4xzt3DmQ=; b=BnUECFEbxONOJ3SQQHz9uDf4KFRFStfNrqVVwV5IuuQkXjlNbEyWQZ8fHqT9RekQi+ nCMPbCqk5VHXrn48ESbgszq/W5Fd34pmZGT476CtghMymizvgQHmlLz3fXJJ3jnJ+Gv3 qoV4otA18xg2noyipCIbrTgAykNqYc3/AQVUIaNyNllLgwNSLTwyhLyoqsIIN8Jo1z7l W4TwHjQIUnxp07TPVonInCNGWuEdbdBbIH2ejrbjUHGKeGIxUxB0Z8QyFxdql0B7evA+ JyUTaoLlhK8eeO/hjuxpuiKXv9g/sT+oVdkDZ93FmZs3HSeduH4H2VjaktbGg2vQFhai KWwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U992Prap; 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 66si4651553vsv.28.2021.07.08.12.23.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:23:17 -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=U992Prap; 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]:58280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZcC-0001W8-Pe for patch@linaro.org; Thu, 08 Jul 2021 15:23:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZPY-0003cV-6D for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:12 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:46947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZPR-0004rF-Sf for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:10:09 -0400 Received: by mail-wm1-x32c.google.com with SMTP id k16-20020a05600c1c90b02901f4ed0fcfe7so4709617wms.5 for ; Thu, 08 Jul 2021 12:10: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=0gyrc3JGYbG1/lrB5uuyjPa8WOVT1SfE1gj4xzt3DmQ=; b=U992Prap+GA2uk6agAVizTq/GFAT4S0m1Hq4i7204QlygS2BFU73bwG+zMdbpNqL8K w//XzkO0lckcMaSyFElb6kOIWZ3vrL+si/SZu4jbS+a8LNB/zbQCvCRJKN2SfKfC169C 9X1FcteP1OIGXRzAHMkhtKGySyGR7C2livmwYh8qYiHjnjvDuOksjx06EgWl/IiRJFP1 FjXAtKgLrRUM75js6/3v88GSlwb+14ONATynFepGunLEi73rlXKth8qkq1SaOwbHraA+ XHX/82dPCVdQtb//UEkwlqVnwlWaBdIwhu/p9R2azZc5uWIc425wsUI+Cv/kyz3KTG0o ZgtQ== 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=0gyrc3JGYbG1/lrB5uuyjPa8WOVT1SfE1gj4xzt3DmQ=; b=hL6gE6SPoLamcZclDNRNFCFk7kMs+LmqRD77crgFeOvuYwdEA4l8GxELh5V0JLVhFN C/MQxcXr7tsKjgFreNBetfmRDllqtc2iolRKdmGmxpik3UKd096blThhJlo1Upobx8Tt NH+REU2Lgrz5U3gb+O4ZSNxGHk3LhXhFVw6v4WXvicxV71/YiLWkRM1A2+c6S/HehORh 6nEz0cA248ugdhc0hcayi9xP5VXfhaLrZy4/4gBe5aeGou8H+48EPXwWoCSM0DqCKcPa wRaMPF7Tp3AR0nWjKnSnOArFPK9B8xMIlpQZoMBlMoPpPVYyvOKtIH6Bi0qo1V1r4LNh 8LlQ== X-Gm-Message-State: AOAM532r81CHSrD5worVPkBfwMCrFr0VGP4ncu1mwLKzYVxFkNlmhKef oyFaKlkykZXLOTHA+w+tXbFTqQ== X-Received: by 2002:a05:600c:3b0b:: with SMTP id m11mr35225266wms.162.1625771403422; Thu, 08 Jul 2021 12:10:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i12sm3263564wrp.57.2021.07.08.12.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:10:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 526901FFB7; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 31/39] tcg/plugins: enable by default for TCG builds Date: Thu, 8 Jul 2021 20:09:33 +0100 Message-Id: <20210708190941.16980-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Reviewed-by: Thomas Huth 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 v3 - remove stray debug ($plugins) --- docs/devel/tcg-plugins.rst | 3 +- configure | 125 ++++++++++++++++++++----------------- .gitlab-ci.d/buildtest.yml | 23 ------- 3 files changed, 71 insertions(+), 80 deletions(-) -- 2.20.1 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 43f4d3220a..2097fa69a0 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" @@ -3086,6 +3086,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: 471323 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp599156jao; Thu, 8 Jul 2021 12:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6mtaOj61HcCb2Pi2GhPfYN7lepggl1U79xB3Oq567OP/aU1e8jd0i9digivC6GXi77vH4 X-Received: by 2002:a5d:850d:: with SMTP id q13mr24508169ion.3.1625773746141; Thu, 08 Jul 2021 12:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773746; cv=none; d=google.com; s=arc-20160816; b=wz411vJEqQqvQ49/effsa2RlDf+8bpMCot4v0kfjs5PaO6HL9iJ4wrjgmHWvXSdV/G DtqUmqtXa6+vgyxa0+R6bAaJrdnhhoob+tmvZYTBylXDdtrPhOR3MMnPlATbf0VBc8+H +605W0B27yiqanqGIxqmvyPUq2l3zWeK4KFVC+UmNeSOBNd/J7lFadREWAUeNfzs5AL1 4qxRSPhg1hyWfvQZEHtnN1CnvrYhBm+Z4PHDwbXsOGy4j8UzaLs+FEj8MHhnh9S5IGII xRz3I0PKGxtmyV6f0Gs+y8My6ijPysJjFhk8HVs1sob/IyLs2zb5K9tHhe6Z8RNR+5NS eXZA== 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=iRi7K6m52E48PuR0TYg29XhKTFnAlwfy+AuYcl9pk14=; b=K5F8nldD2lVTRG+bXBr0KGUfAGcJljzHzLrS9OJe+DeirgJVQkXYKJASlkbFkmmSMf RwI+cw9NzJOAsCei5HDJg7KLiFm88oanvlcco1N6YRtPAnomescmTPtlesDFKzmBOEUz x4bLqH2jRfl53qckGL5qxJEHBov4/6IXAl+dvwKsJ6ffnjcuCtYxyzwYJK1+zIaqyPYc eBrwN41LxykhOP5Q4ZTdbysBP7Z/lGLqTJHKcasyMsl5iqLwxAEEFW/oJI36MV7xSGtT IR08FY9T6s5QAFTzdT4wwLWM/0J0ABwTLeXYZVfsUIwee396gOvLAFyvmAnd0YPsLJlS d/OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wk74hF96; 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 w3si3104666jap.29.2021.07.08.12.49.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:49: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=Wk74hF96; 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]:42158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a1B-0007Nj-H2 for patch@linaro.org; Thu, 08 Jul 2021 15:49:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWQ-0002Be-AO for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:18 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:42644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWN-0007Ti-9O for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:18 -0400 Received: by mail-wr1-x435.google.com with SMTP id r11so3614020wro.9 for ; Thu, 08 Jul 2021 12:17:14 -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=iRi7K6m52E48PuR0TYg29XhKTFnAlwfy+AuYcl9pk14=; b=Wk74hF96FRpnkw6ok/mjGQ8a5LQMVJda4afHFAjCDghlFRnSHMm6e6FKNc1vjxlDJc HRaWBgRhygr+ddoSK0pcloPEpn4T/vkij+3rL+YxWf29PnKHJAQtjCmTHYZ+JZLoVgVT BO5w4qxW4ing87jeEtCjHNbT8fhd+uRjbk2FzDbbZ9pgnLu3F/ID5FIO1tFKX2GjE65O NM03lcOdzmACmWbJBaVGfUotm1e0zAdWjU4dszsNH5Mhu904fgG2J7AHxgY5t4FBTaEL SUoxDzHHZz7w4R/EJPu6z3wwtKheUJpMs1ZaLUwEUpkHuz3TjttxPp7NCJZws2RfevMN NgXQ== 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=iRi7K6m52E48PuR0TYg29XhKTFnAlwfy+AuYcl9pk14=; b=UQ0i6L8I6AkhRsvAubsfAx8HMQKMci5efD287+0l02m54PfdEH/L1qbjMhIpEUZ6JR XdrWTh/lWUM1AeO0tujv8hN2Row+hGr1lsJqIGL/e2yBwnwUareVVo8hQe0U5Tq1XMVA F4Zjymy91OCnODzdJigg/yp9YwmtF7K+7k/0V7QOtTRY6wEEpHA2HYx6I37ycAkVBs2N wVqDxtKPxOel46kN1vpwblxROSY+WOdBWKGYdCAbod0c8/0kvExm7MPpQhpWv4zl7U1c m8eYYx/TWr6ak1tStEkW+zhWg88TlD/gBal3p2phDpnJoX69ktupVnxKL5N8aB2etr// Uv/A== X-Gm-Message-State: AOAM530G+0ifY1xVZK3BZIjZXPFY351CIbijzHK6NHArcamlyqliB1Vq S5jSbG+t8fbGHmijmviXlmVywg== X-Received: by 2002:a5d:58d6:: with SMTP id o22mr5767562wrf.48.1625771833522; Thu, 08 Jul 2021 12:17:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d8sm3122589wra.41.2021.07.08.12.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 68A391FFB8; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 32/39] contrib/plugins: enable -Wall for building plugins Date: Thu, 8 Jul 2021 20:09:34 +0100 Message-Id: <20210708190941.16980-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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 , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Lets spot the obvious errors. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- v2 - also $(filter -W%, $(QEMU_CFLAGS)) from the main build --- contrib/plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b9d7935e5e..3431bc1ce9 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -24,7 +24,7 @@ SONAMES := $(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 $(filter -W%, $(QEMU_CFLAGS)) CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) CFLAGS += -I$(SRC_PATH)/include/qemu From patchwork Thu Jul 8 19:09:35 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: 471335 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp610256jao; Thu, 8 Jul 2021 13:04:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpGP1eN99g8fJm9B1mZordFwwTSEkQ8E1nS7Oacgo5ZeE1Kaie6/Wfaa7e9cGswAVQUDWg X-Received: by 2002:aa7:cf91:: with SMTP id z17mr40733617edx.112.1625774692960; Thu, 08 Jul 2021 13:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774692; cv=none; d=google.com; s=arc-20160816; b=eDhpdwNiHiBIS8pLJR/sww9kveN0PVM1Y7HRDmj4RfqyUmZj9/08uPwPvSRET9LJgE DW95pQgp5YyaZZzsRERaDUX81TsCV0HKS0Nchofq6vprvUsF8iHw4iDLRcgB0A1PZJel SwTVx5t5tuSQmmDJiWXjLNA2OSBBHGY0UXoJqJsMF1P3irFN46IOSFs7Dz7OBR1e7403 y0ldkrWxU89+q7XoNt6HNjlh9np+W2pP6F/OZRJi0FenMlsoSgHiWCNKdmnvn97xsvAC +tZxefvg/P7OgtugnIbq+BwEMN8rdR5al7qcKHhK2/bHeQPLXSg3ifowuk7H1D7rzUjz FB6A== 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=4FTfkZOV5J8pPR8DrVAy9dNoascCzZiPQY9J5eWzkN0=; b=EBtGASJ/KsKKW+Uh58PDk8toX0qVaccLC9H9PcGapsVc7GoNHSKpv5x5ec0JEj1Lz0 nk/Eof9g6VNoPmXDf3lcScGavAea4pUkVddpRdAQxs/KHZBhz7mALnf5VEkSpruAoG3o Bek3UWKSn844cCzBTwN5ApWM7RDtptlM8gimnz0d9KqZR1BruPab+UMByRSfYPr9LxzI u0FxdacSr0no8RMqAe718Pw8je5sXIKziJPbqktusW614Pp5JCIAuqMlcyVIxLzrBUen toAy8p4fxwoJMdI46zVIqkXavPZiLfpbwkC8pO/qitxpyrHcT6zRehrgulEt+V1mUDFL /cMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lPQoL2Li; 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 hr35si4000462ejc.466.2021.07.08.13.04.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 13:04:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lPQoL2Li; 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]:48756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1aGR-0006dH-Sa for patch@linaro.org; Thu, 08 Jul 2021 16:04:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgG-0005bH-Le for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:29 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZgD-00020X-6T for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:27 -0400 Received: by mail-wr1-x435.google.com with SMTP id v5so8929515wrt.3 for ; Thu, 08 Jul 2021 12:27:24 -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=4FTfkZOV5J8pPR8DrVAy9dNoascCzZiPQY9J5eWzkN0=; b=lPQoL2LiKpwTtjEti3idT6Dm0GQcMHIWjjihOqwohN2sJ4yy6F5WVrnKUr8mncpo5n SKTYTrICzLS0au9Li5/CusVv8dIgbRtbVKDX8OS0wEghkE1CZ4LpPM8YwG2bM2gYOhYM +ElGrrpofoFcZ9kW63P6CyF97dixb1uaSMy2ZSRZR4wn0OQk/XSKskSMVQnooqTd0ntN kLsFyrKsGuA5msn5XJi7MlWgD67s8HFjiMqbxXAOz+bNWx3mURAfeOrymuE44B354J4F L0FIlaEg7Fl/Xt72Najf0gsmAuEyJAgeiql24Ld7atILqKL/WVUee4bUt8uZxYYydcHY ljOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4FTfkZOV5J8pPR8DrVAy9dNoascCzZiPQY9J5eWzkN0=; b=mNR/YzVPSgUg2mtqbxCLvW4jDjgh97Z+X2GQuh7sPCYMgpDMSbrVVrk1JBOIdy1n0/ xZhq7LgiJinU4TFJ6qrGBEZvUr1PJrquypiVG8yO3LV9W9y5aCQuV/Cpu42/aZRXBn0s w7NFvHNMZwd2ziQLhMX79xfUduJccXhNMV+UpjWB/n5EzOSOoL9r/6oe/I4rYCkjaMl7 8Kr1AdrRnnv6Ech8iHKhkrosHeV1zxIg3MiiknddMnFZ4ppe+5sEwPrCsuJJGyEJW+qf eAtqYhOjgfEZd1icECWlWaS9ZAMwQicZCf9RsjYrAC6MLK0ktSMLxl/YlTQBYSJZWxiH Fnbg== X-Gm-Message-State: AOAM532gedblYcaAG8QlI39RiQ63gV092VDJH9y4f6j/pgSsjUeaY50D eum0L+sUy9L5iRVs2ZlcmKAW3Q== X-Received: by 2002:a5d:4686:: with SMTP id u6mr35478049wrq.78.1625772443408; Thu, 08 Jul 2021 12:27:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p16sm3145650wrs.52.2021.07.08.12.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 82D831FFBA; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 33/39] contrib/plugins: add execlog to log instruction execution and memory access Date: Thu, 8 Jul 2021 20:09:35 +0100 Message-Id: <20210708190941.16980-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 3431bc1ce9..3c9209b6b0 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 Thu Jul 8 19:09:36 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: 471310 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp588836jao; Thu, 8 Jul 2021 12:33:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPxoj3bfXIod+sVUZTV5l1VCdymd9xQppeNrJQ2FcbOItnf/Ep4dTJCqazdoifAP7qECdH X-Received: by 2002:a05:6e02:c74:: with SMTP id f20mr23719103ilj.85.1625772820899; Thu, 08 Jul 2021 12:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772820; cv=none; d=google.com; s=arc-20160816; b=g6NOyhFd7XMO8QJthkKOzMNczdn/zrBLwFva+gMGMS+HBrL+JMArZAuD8a+RpPAkUX oWI0Q/SEMW61q3fvZUnjvbrTYGyblIWyQISyxL2lOhTk1tWNHKg8lJ3g96wna2tpAtpz o5fy+TtCiAD/m+qVFWyHLHpIawCXE/iiY/z5W1aTpOD+MDjbbbKQy16h5UipkxWuqKI6 vr2lf/Zqd2Y7NeSOEzrcV3eY2ScsyyhESAWEgdj2hXYGo9b8/dK17s1LFWJUXQL2Z1GM UXo0lsuRuptofmsWI6XIhcUkTX5rFPEZn6n+DAdQENrOvyUcfY1pkDuw/SBNAcpNh3rA j3Ng== 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=tAmdHWYMZwWZog3uuY8cAUzUBXm6uI6A+lXFQmkTGuPRknxQaMLFtnRGAtMU2byG7H kzuICGGF5Ta+4Et2SelOM+3hRhe0inlvCsNS1uteUeOtXmieKnaC7LVtBcRlWL/LyVjL Q9gfiz+QzhCKFSCmQ4wazu5IkCQZn+VnOgeBfKWhCtary8S6z/X/cSYN0WDbCINFTVna othC+2tdBQyKnGqd04+tqzkEkV0pqXzhWB95rDT5xsDRvcgB2B8v3zV46SKqljh21Bsu +5NfQdY+jjoBjnEC4mhupG81txChiVC2ikucAlH0pVtFwPRNyXZXBOB9DrVvmmKMD7zB qgSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fegvHx5O; 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 g2si3926685ioo.75.2021.07.08.12.33.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:33:40 -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=fegvHx5O; 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]:58342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZmG-0005kG-95 for patch@linaro.org; Thu, 08 Jul 2021 15:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWN-0002AL-UO for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:17 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:53049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWL-0007TI-Vc for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:15 -0400 Received: by mail-wm1-x32e.google.com with SMTP id g10so4791142wmh.2 for ; Thu, 08 Jul 2021 12:17:13 -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=fegvHx5OP2Ie5+W7AjJfvR6cN4HDnWqJD4TXaYURha36aAqDoYQPDJK3EJGCfqXYIO wD6hXyYquPfcjY27BbfisZuj4OghWHW/8xwMxqYNX5b3sbSvma8SPr4ZjJslnvhvyals knfFQzfltoKOU73loXl3ljxsIs0+G2XCyuoPvXGJShwCaADxwkmqGxxZENHR6ZQmHHaJ 9tGRcdxkfn8Gi32CBBR4IkH9gQlLYkTx9OjoOCLxG3Ra34CdtFEf1kFNhUsq38DTcZPc iQfn6ymtkJFAmGBM5Ysa0QxaVjnlB4vAQ7telXIACMcStPgp2aH2vWPg7LOKoN/e+MlS NP8Q== 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=pLdaK4lYhaCEzShAY+98ADWzAyuElj6q+m83t2go+BdcQGtXiZ5sqm7cJNwi0rKU7t LPfcWs5yN0DoJnd8zJlzhdq72kP/UQE+IOa9crdt2aUEoQBP5DYBZyGYVb8Ef6HW0r42 xMG9BT/ozTWFN/t9Uo1R5luPpK8qhmjNJN+2WFJOjlEYFloSLThalOt2uCnuOlz0p96I N5GHM9+Jz4nPM0i9R3uqIezGDSWoGKT+gjy2GLtn46bic8e7Xe0Pl2ySCJT7Txledu9G rrW3xkKma8yyEd+9+qj1RwI3a7aUgFWj8IlShnQwcn9rkEYP8UpqIC9KiiRMIfSLS/9D 8i7A== X-Gm-Message-State: AOAM533oGUIy9Hijbw0pLdjKiQ/RL2fDxwLjjYk8uDQP75Cq3YDWhfUL 6MjQPBglCapAJOhzdIDL0/EQXg== X-Received: by 2002:a05:600c:4fc7:: with SMTP id o7mr34389106wmq.16.1625771832637; Thu, 08 Jul 2021 12:17:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m5sm9637964wmq.2.2021.07.08.12.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 97C5E1FFBB; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 34/39] docs/devel: tcg-plugins: add execlog plugin description Date: Thu, 8 Jul 2021 20:09:36 +0100 Message-Id: <20210708190941.16980-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Thu Jul 8 19:09:37 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: 471326 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp600373jao; Thu, 8 Jul 2021 12:50:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyysvaWcJWAen7uYUIulNK0XcYCR3l39mAfq9iCevkdk6CJtS+wYiyAhgbMcmfR8Svhoj4O X-Received: by 2002:a05:6102:390d:: with SMTP id e13mr25071554vsu.26.1625773858815; Thu, 08 Jul 2021 12:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773858; cv=none; d=google.com; s=arc-20160816; b=iUG89zWpGT+1nUjqbz06GWJi6fkXeehPfnezuuwccIPCoFHsAJecScOY6fOQeo+3jX 85bNvdEADTqdTHVLBGzb9JK7gMbjvMwOt8Lz9h6aSgMC0P2Z4qsYGc1n1Yk6lcDM/CGV JNj9EFD2kmOaF2WY1vgzReVxwZ8p6SUmZ/2u3nVFHGgrJjrwkGk6qx7zIUqPkr3BekI3 QikJf49y1+/Wwesvbnxcq1Eiq4KxF2gVMLYqzvT2LX4+3Om9BwN/cezUNMprxH47lUxm G5c5v0w0ifcnPtSiS0EUxlb1PEvD0b8miS7DMz730dDG5IzLHn+X/IKPXn6u2tXwtqF0 /DZw== 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=Y2dEFzgPhGXTzz0SmMn+gndtAoKd6AWU5+DV/S3PIUQ=; b=g0FUA7w8G2O95MN+fc9sISfpHV+9T5DVMrC3m9MHk7EtAYUPoD7cLWalumuNLdamCE bUQJ+980EBwpc99XrXwsqd1f+GnLn1/FPlf3hMLnTZ+Ggx8tg2z/JZLUypdzpM01QG4O RKQQJpToSp8M8t78CQnRtYQgleX0tU5MIzGTQ3/KdHMNkoLvvoF1sD3S+9EspkQuEYfw pwA1UaiT+F29+M0AJIWx9qNoM1xeIC7RohEsDvajrQnJMVIhxXAuWhFVjC8QkfhEYRH4 4+kstUHBfxsw4qKJTJbah3WowFjO+rwIXa82SWO9mqR0nzPfs+lOUTQL+tidRcKpe3s5 YHXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z6d26LEV; 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 r24si3917170vsl.374.2021.07.08.12.50.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:50:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z6d26LEV; 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]:47286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a30-0002Kf-2I for patch@linaro.org; Thu, 08 Jul 2021 15:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZgE-0005ZR-LU for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:27 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:42968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1Zg7-0001z7-LO for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:27:25 -0400 Received: by mail-wm1-x32e.google.com with SMTP id j16-20020a05600c1c10b0290204b096b0caso4739817wms.1 for ; Thu, 08 Jul 2021 12:27:18 -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=Y2dEFzgPhGXTzz0SmMn+gndtAoKd6AWU5+DV/S3PIUQ=; b=Z6d26LEVtZsO1+46W1/X2EWuzgVMSiVOiFDB+5anIu3Y77bOJYZeG25mDXxmiccFFZ lCzkhreKV1iXV7KMaW4aV4TiyRoIHBrYGbfZ+gpWsTEQZPrkWig0L9btMuBRvo01/Tql cMNfwRAVi2SaxAQe+FpMl3n2ji4zjwolwh2oHB8fwL2jeL/LZbrZQNnqDKRAkamCjLn/ htJk6mPmO7HWDp9mU6JtVe5SbGxIeSjwpDSsWbk23Gn8e6DAUByttOhaV2L/zF9faCPi JfytNJKSGgEvr+xW0g4wPYIggO1pPEgybYbgU9ocoC4VZmnS6pzld8EJuY7aRhNypLpK 5AoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y2dEFzgPhGXTzz0SmMn+gndtAoKd6AWU5+DV/S3PIUQ=; b=jsfO5Og4gvlOWt/qXzc6lrlzNLrP7ZMwlGOjRTQzXUPRoJ70+DW2W5ZJuzlw3yrs89 mOtFSYWGBR514NSJ9RvOI6hi/AL+9ZIzc0T0sjiezkXj5zLaL1byIQCE8sGh0TW1o/yX obO/l+WfZxAg5/eWPtgdV9l6sXm+q4/7gNHRC22gr1krujlFuYwuGwXSKTGgazXP+iH4 +ZWLoDi2vNAis/LT3fJQTuNTy2P94z+1MqGE+oyGO+LiSjbl3scBwizXm2hV+xPfLOC5 IuKPYgvVeVj9F24LS6G7uhm+0y/xVJNEhS3qLsDOEs6G5vyu8ReDcO3a8jU7dbs4SsaF bh4A== X-Gm-Message-State: AOAM533LYQdR5LUAR630f/ZSDHFvXz6BvuXLwCsxytGkCyyIuRP3Jtc5 237xZ9k5/6S+mZxhoP2mvFjApg== X-Received: by 2002:a1c:ed14:: with SMTP id l20mr6901651wmh.20.1625772437267; Thu, 08 Jul 2021 12:27:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o11sm2801286wmq.1.2021.07.08.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B14631FFBC; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 35/39] plugins: Added a new cache modelling plugin Date: Thu, 8 Jul 2021 20:09:37 +0100 Message-Id: <20210708190941.16980-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 3c9209b6b0..54ac5ccd9f 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 Thu Jul 8 19:09:38 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: 471325 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp599874jao; Thu, 8 Jul 2021 12:50:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs8Tj9GQ3iNbENQK3D5vVA49NPtCMfS5V8EepzwNrsRwjOkKTdwwiw9uBkuJ1yevycLtyG X-Received: by 2002:ab0:5a4c:: with SMTP id m12mr16255383uad.40.1625773811970; Thu, 08 Jul 2021 12:50:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773811; cv=none; d=google.com; s=arc-20160816; b=YV8/YBJFAdV7uBagLLgPNNd+aRfYHQvxlTMWnfsCJtZsXpiAwm3AJJsd7T9vlBMWV9 tpYrAWDqGiUyv8i+yIemUU05geTKIfEITfF4hjRcQxjEfOAwCkXf4pm7PFIheRmZLfqg WpqY2C2L2V0RKRorKo5c0Os8+9ngCddde6DMp/NHen6eqXBf7iKQk3tyt94n4pbPgKJg zjKIbxnDpUkrPCFqs1MMPAO4WMDGbIDWkcHRyiSFm8PJf4NrOPS8ZsYgu4VIh5+0YtVT xcmgdIJV3KP1Ewp+LN3QT3dXqrl0G+lBNxJO0hM4EXn5NCxUXtSiV5K+V3U+w5Zd5l4/ AzJQ== 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=Y/iAhEqtiC0gtqosqv97zvrZ8aNEUiqPDa/8/PUR9zv91OUNAA8s3qlIBumAhJa2k5 iV6O1umEdeoFBlUaBUf2vgHX+vVYThEZllgFq/tb+lZuH2P1CAVvkTe60Bc+3BdAVnRb L7VL8zRAyky3ZoO4Zqc/jZjf4g5RPwMU5LRV+4hxd1XetloAuxTgglcBws0wvnU3qdPe m5+4zX2h1i5djC0bxCB4EUZfgttZt8LEGhGChywmGeOmz11JAOLfafaUmpO/TeUsMtZf zBVBRVkrIj1Dshbdhp+D0FwtOlqAH9j0Vh9BNjCoSKHYD9X7sBngZ1tM1JNaxk5lHJ7h b0Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jRMaDYlz; 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 l10si3027065vsm.144.2021.07.08.12.50.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:50: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=jRMaDYlz; 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]:43336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a2E-0008B0-8I for patch@linaro.org; Thu, 08 Jul 2021 15:50:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWg-0002p1-Dg for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:34 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:33701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWd-0007Z4-8P for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:34 -0400 Received: by mail-wm1-x330.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso5413840wme.0 for ; Thu, 08 Jul 2021 12:17:30 -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=jRMaDYlz+3LwvnfLdgSG0hEiOhcpv/nRCUHNqeTmuX+n4sf5GzhUFnM70kQqEdT0p+ LqUN6KSNKprNyfXdaan9o8Dvk+VNQeZO8Omc5z49ekVYFW474oHgYfbyniSVHzB9UZhk phbJkdVfLculrMC+tUVrqWfJqIE2yqcL/taJfUGOXl1iY788/a6XKi8KJZXGSbBG6xwo tB/wwIZfaaFpRsMslPBnE9dd7ISDbXc3q+aEdo/JVayAy/PawtiCGPL8TbnMtqeGOsEw 7nOv7dI456zmhdgqSENWtBvGl5fzu6zOtOJQnUV6ylv2gShVN32Qo0ej6rkCDmfkGdCf L7eQ== 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=J37ZvKoUofPGGH+uXAgYj97Eb0MlWEosA7+U0HgJQjJbYoRx36FDTrA7z1kHAsnhZU N4vUt+GiSVsQo2DNw6Sg6xyRO/6w3LkKn+z04Yi5MHWjCTLUmfsmqm7ZAfJOq4vfG3Av WKjD+yguC+SIM19RC8fJiRevNffA5C7Y3z5gxb1//EMLOmufMvbUzCvRJhFrvc8iHyqK k4TvKeqI3/8tI+sW0RSfM72o6oDk2QdPMljY/bH8t2kMSKxVO8Cpbs5AkrEYzDvJC+Ao 6fD9Hq5qEkdaKDHSDB4+qRD3XGimERlMK/nlBi8vvex/i9/E70yuVsNr4Tr48qoCRe3a eNqw== X-Gm-Message-State: AOAM533lzZ2Pa8NZsJytRIy2YhNNbMyEZNXfKNMV4ciEq9TAF6nnksNi 3C9JS4t6JqgP+3qE69GMogXghQ== X-Received: by 2002:a1c:1d82:: with SMTP id d124mr7044308wmd.68.1625771849827; Thu, 08 Jul 2021 12:17:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v18sm3589427wrr.54.2021.07.08.12.17.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C73AA1FF8C; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 36/39] plugins/cache: Enable cache parameterization Date: Thu, 8 Jul 2021 20:09:38 +0100 Message-Id: <20210708190941.16980-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471322 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp597680jao; Thu, 8 Jul 2021 12:46:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwExh/uL7wOpvQMLs2OhxFggnXWk0ICEm4HGY3neken4HRXr0PfbtF0HmloJzmh7nlCMsD3 X-Received: by 2002:a1f:e3c2:: with SMTP id a185mr27280026vkh.7.1625773595191; Thu, 08 Jul 2021 12:46:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773595; cv=none; d=google.com; s=arc-20160816; b=ImqvRp179eTLnj+zafz7gbdzIxjItjU+K2/rYhkL+bIuOjcuRve3FVw3JyTVjQKVsj lIbBJtAhZHQ1DTxTaEa3xRHTCKOLEEo0HnWpVCwT1e1hFKWAdME5ixwADKf/GMHfHOTV vLPr7gb1JEkv67+UIKfs16U03uBWYitO0o7/WXngGbM3Ze//8rHDy2k5Rtu5qurMLvi3 jMuFbztVyqGh4ItB/e+YWmPp/ilkgOAP9ZDeC2UgjV51ZXizG6S5khTuzK+C9nGsm3Mc rQ8U2C3Wy/C3dIpLbH1aST15bBNC2fXuB32vSK5c38o/ZClf+TS4AiOZbGC6X4lImVYP aQwA== 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=vU9d7kvry7k4MwFIgc6eLu736tCeLbWfg37tC5eaykaIAwND8/4jFxJ8Hm9IhSzRP7 6eVGpaJ453OOjaGIgRuUc7mddK8gP3nOAH49c8ZVyPgq9LThvGunj9I2lU6zKIOwmNQN SGLBFEmZVVQt4Kd3TnpVz4UBkgC9K5ZqRyRACoyuuucj349H9byeGajwzpOnq2CP+Lz9 sn8mMs6rI8JnhLNr0fxojKBkkaCvq+Oy48tzUGRad0Ooqa9/qLorFDnnvZc6c4D0qkey WA3h4eGAdRbgQ2C3JPaAG2cc0z0YF7B4LLB6k6feecJVAOnpO6BZWuSAIJ75v189Bpk0 EPcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MAiFZNUv; 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 b17si3245136vsr.372.2021.07.08.12.46.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:46: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=MAiFZNUv; 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]:34500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1Zyk-0002DW-In for patch@linaro.org; Thu, 08 Jul 2021 15:46:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWW-0002Sg-SG for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:24 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:56197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWU-0007WE-M8 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:24 -0400 Received: by mail-wm1-x336.google.com with SMTP id j34so4761269wms.5 for ; Thu, 08 Jul 2021 12:17: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=8GBODLRjljT2CqIfm6ictSx8Ob2rK1eePeAxvgZ3b20=; b=MAiFZNUvvFhUML7tWtajJ486MmmNfYK3M3e2NsaITAYy4VhKekjiFBCc25l5fl2wNw v2o9ZZuqnXBYOovUiddm3brPrmNdeqxA65L6RVP2/YxSRgyWtsELP+Bd1x6yNKezmH/X k/C0gqjVs+5O5MFghiMtJOaxdUDG1CAeOFX/YV2mz+HHZZG8S9WBlX9cBHYbOI2kyteN AEA99sHN4M9aV8v+6wVC7//a35MO/O6WxSwD3Rc/DNitwo/bEZm/dcYkHTCT+B9XXKIX aSVN6EMGyMGSZC8cif7uzljh4jkcW7XgRGHCmRPoMVZD0BGjQob8TqM+QWR75D0WooPp j0ow== 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=WD8CHmv+HieNl0Xl+siS3fEgMaObhxIM5H9+XyepaYQeanOWKLWkUR/QuJXEP72OXI n0PHyIrDeJzeFN97CIcY7A+2PvkOqgdJ44YYJmD4+Zt58dAa/1YHr6ZsyP9yrRNmi0bp jQuGcI+zNG/N6rN/yDm3Z5Hwq7RDJbE1A8FqsWRRTpBquvpjutxLtQol0lhe37v1LnqP iAiGLRdp5qFYGF/b+s8ea2wMlW8Ak40Ta7WElHlPwpjL6JtrXYotciK1uWpV2ls894p/ b2zgXf6a30rGUPmAL+KLxVdJcJarjflan7iWw306YAafOjVSZWV2qrXMTuxl2UqQPae9 JEZg== X-Gm-Message-State: AOAM532o34rNfqbbKfDsg5fo41hgpmgbyPsEeLm8nT8ss0IiY31o7HsL QxQzdq5J95xsKk9i1/MVXcJPHQ== X-Received: by 2002:a1c:7fc5:: with SMTP id a188mr35554866wmd.133.1625771841180; Thu, 08 Jul 2021 12:17:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a9sm3015836wrn.8.2021.07.08.12.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD7AA1FFBD; Thu, 8 Jul 2021 20:09:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 37/39] plugins/cache: Added FIFO and LRU eviction policies Date: Thu, 8 Jul 2021 20:09:39 +0100 Message-Id: <20210708190941.16980-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471327 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp601344jao; Thu, 8 Jul 2021 12:52:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqTQQPkRfuj/1jkwcJGXcoiDyelCEPimkmvS6LCyvNKL6P6L+q4YIbUMjq83DfdyRnjnbj X-Received: by 2002:ac5:c24e:: with SMTP id n14mr27061003vkk.23.1625773953773; Thu, 08 Jul 2021 12:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625773953; cv=none; d=google.com; s=arc-20160816; b=Vlppifawfxt3pE8+jm73mCWOc6cnIokNwAtJlOL25au+l71CsJe2H2+YQrsrAjpWA5 hpJsbg8GoE166HaFEyxIVzGfWAw/pK003ags6s7tga35FBN7L3yPn0lfVUXb9/EX8h6M jcZiHGrHD5iiD5uW0pU8DISMg6/wfigVKH8HnHk4fH5BRL1YycgTrBXG2PyIHEI5rVzm mPpFnb2IWaz3W7z2HKTft8wKvSe0nUQ3sQvD2Ru/K/YMG8jGGV2iWCapcVuREVGj8iLc d6So4reBw07ekQwtKkUnuHs8u9q+sV5eMjfjm9PVLlpmlje3HikCyLc3r1f0qBInAhfB g6/g== 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=N3QtDQpAgfknHfdmjmBeCl26DFPuqSYRAnb1lY3zcKDQAx4FqT7tcqqG37vNDIxLsO iBbxvNJ1trNb9X57VBYfReZeSvmYBeN5u4CKzYKFqVPLcE/PMzrx5UB2KS7fryDwEhoH KxXIPATRP11Q/Y8OhTWnuvBX9urXAlgb1kDAdWKOE3EjM5rBgtm+JKRVJlX4V6cZrwPY qaRAELZNvAWIHh/f1whImnmHtJK+2VNZ2bbRXsKcOB1a4oFxf/tC6ShC42oAq3L5FVec LsIN38+xad/Ak7JRkwr1foKv6reutfcwICZjo+jH/PyUuE0/UxWd0xxeueGIoCVEcBDQ rGcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NpcCQtBb; 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 w15si3806108uar.109.2021.07.08.12.52.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:52: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=NpcCQtBb; 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]:50872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1a4X-0004rx-4d for patch@linaro.org; Thu, 08 Jul 2021 15:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWZ-0002W0-C2 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:27 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:37401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWX-0007Wl-8T for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:27 -0400 Received: by mail-wm1-x32d.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so4311886wmi.2 for ; Thu, 08 Jul 2021 12:17:24 -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=NpcCQtBbL7yvJQ/H3z+Q5LUT9xrifFKZ01sg5i6kxaEoBQCKOmUITZs6zLExiTvg2H pgOouVgUvoZurX7MFHYZVLNUVznLSR4nxeUySIqGhoPbgyDoFEgbauTiEr8fitP3vpcg dg32Je6/7gUJRLyvGmw/Im7U7i3c+KA6cOGUDDAYEsrdrDtXJdsSoPUu+PhHhP4wc38D ecn4UV+DzYlUEQlGXPAA2YyvpdprQ+Qz7otwBzKWMDpcc04/sWWRUnWKGtPVmPL3Kltw WdTFE2U1VDTBzC1aopGZvBaj6Xph5kHZQYzWso93jK14x1IMvv9rIQ+9qNoLv1R52hM3 FeLA== 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=W1vAZAlSg0Gy2QobMY4Dq+ovFwjX2GtEt2OcQNin4OFkk3plyVwP33pmZOf8hrqEwN mS1y3ZXkYkUIVhEg68/yfqrkL3gblOzGI1Yn+ZzQnU+aU3pYyz4sPVHjs6NQ9hVVHzDp ojU2gVQQ/jd5y9MS0oMOZCVkdxHGmePD67btEQZP0XckHUPfPAJ3Yon9k92ruXac0SSx DmesVp8Zn5kV3jPoacsmZVDlUOUNTGCwgobxEDX8EQcerp+SrSI0MHYKhmcGi6fwHwKI n7kbewz2sHmjuiiNYwndXweGduUGFOY0TWL0y4omh2Fn1XCx1rbht0ScNMR7nn4/VOIs 1zFA== X-Gm-Message-State: AOAM531y1DG7WcRM+oKgAzVhmkbtHNzQtdGjGu44hqsq1iS4eAL/k8ek GFP6wdnvvedkcf10WqkjG4Bmtw== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr7151954wmb.27.1625771843885; Thu, 08 Jul 2021 12:17:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a6sm2450007wmj.29.2021.07.08.12.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 007721FFBE; Thu, 8 Jul 2021 20:09:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 38/39] docs/devel: Added cache plugin to the plugins docs Date: Thu, 8 Jul 2021 20:09:40 +0100 Message-Id: <20210708190941.16980-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_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 Thu Jul 8 19:09: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: 471313 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp590306jao; Thu, 8 Jul 2021 12:35:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhI7P9jpn4wvas4kvtz5z9Cr/40VQOwFeaVpb+BgGrcAd08AorB5upbvqUwlwtDFHPE0aK X-Received: by 2002:ab0:2554:: with SMTP id l20mr4377092uan.58.1625772941026; Thu, 08 Jul 2021 12:35:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625772941; cv=none; d=google.com; s=arc-20160816; b=d4FF3J5cn/g1V+8iGB4RdJPQNY12BMfsvv/9/p2Whhc4B0pJDSvPLBIwu70JzUedgA c898ywKqlQW/xfiO60Qrb+RVSKRugAn5rnYldAjCo/A9XfRxLLW6KQv3XOj9lAmDpAwf J7zn94WP2/qMkkGw3V9XYoZ3yqymM98VoOIWwW7CsDlQsrEAgACRTPZlXQ/FxnoPOgEC K2o3YJo3QRBAC9yRD6WgxqGbIbrFNr2qDrIPz8T2MF4agCuQuKYxLPcoCe/jRIb9KgDA Q60DAqbyHStZ1J2WlhkXSc5lKqqafVVnCEGMKqApJu77eeQXtLjb7g4Q+5EJZsdQBsp8 S0Ag== 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=LRtRrfnvN6DZVnVBaSvZVnAEG2vLxQEsAFNUuF/Z2LAWH0HWvmc08+o7mXjvAGzlbT qyGLn5kCuMPQB/taLx/mV38N/6k9hPjAIE9FzxFeXBY2Fj6z3r8CjKYiKm67448CYuBm SnpgxTQh9Qd06K4RJIt8/3qOaio/KjMk31CClODg2mfKn731YVYukvw4u2cyh888dcMj v4iAQimULS2VagEum+FCg1T+PxHiExFeuq4OwSvC4JNuEbhp5KezDYGYrRvubj7a4vEW gC9R0zRFbYg8YBSCpILFpCSqqz2Uz8twcqKqP13cmyzTWhx53DR2ueNZLMk/X6PGDOW0 OZVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="T2f/SEhW"; 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 y6si4526679vko.56.2021.07.08.12.35.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:35: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="T2f/SEhW"; 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]:38686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1ZoC-0002zz-CE for patch@linaro.org; Thu, 08 Jul 2021 15:35:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWU-0002J4-4t for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:22 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:38562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWR-0007V8-4W for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:21 -0400 Received: by mail-wr1-x42c.google.com with SMTP id a8so8871933wrp.5 for ; Thu, 08 Jul 2021 12:17:18 -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=T2f/SEhWmHwb3UZFa/a5cFGzwSqEmYxgYZ0M9DkAzaJW/iraFvJJjQYhHcYNVXZYr0 4f+43wN9Ylb5h5ocS/z6TlnEGbMyQSX4dDZCuG3RVmrKpw7v/ezbIaVSbquBy2imwsTk 4W0EDRaqCXxcLXTzZINayZ1e3AviS0XEsQgF8UPgvsgO7t2jG2Pg0ukM5aohtrGO1XcY pjAESMweJfXqacbnO3xpizXBMmJEm65jvouXJhYEp/fLdomBPt+f/hbFE1svzTPdszmX +E9DD/LLWJEg4+65F8+8Xyq0AQySTTV4BVxddjqNgRlH2+UN6vTaEeHui9pmUPviGUQc rMMQ== 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=GIXW9nwvWdIfDiHtutcT/8E2C0sku2/NNfIKtEJCbXDFxThSbpHTWkNWh5cFuVFWCB ++wLI3Kj6MdldDztuKWjhro5gkLAe+i7BsNNGHyHSGZx5y5S/IyEN76fTRt7A8lYzs33 ODIWLxfJN24ILRljjlEibb8smqAM3xPRwQFIglB8rIlBSqf8TGxv4i2W0WtbmbYDtfOa ACkJmKtQoELfnNJzbrPOqt1e9NrX6mQjEU85rRpIF5JkPwgHmIn1LHSJ7+O0N/dwwT76 vQ10I25b9K6S2NYxYTAvKSspphXaHBCLNuRTqzPr+edEQoLeXjl01vbUF4Spi+gWNjOb PuMg== X-Gm-Message-State: AOAM531ROsJAAAoEcFCovHPwHUjkZB0K9ETlpME7OK/9pxGJ5dGy9O8q atuOYe2hYA41hTdvady0t/Hp+Q== X-Received: by 2002:a5d:4812:: with SMTP id l18mr18935049wrq.68.1625771837897; Thu, 08 Jul 2021 12:17:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v1sm3345875wre.20.2021.07.08.12.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17C291FFBF; Thu, 8 Jul 2021 20:09:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 39/39] MAINTAINERS: Added myself as a reviewer for TCG Plugins Date: Thu, 8 Jul 2021 20:09:41 +0100 Message-Id: <20210708190941.16980-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-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, minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_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/