From patchwork Mon Jul 12 12:26: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: 473083 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2892716jao; Mon, 12 Jul 2021 05:29:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZS/+mefrkE+iarW9E6YEuqTVNxWnipu23MrbyuIN9xtytdRS2qcURXO33bi1Rdvn7BmjD X-Received: by 2002:aa7:c857:: with SMTP id g23mr63034920edt.100.1626092952775; Mon, 12 Jul 2021 05:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626092952; cv=none; d=google.com; s=arc-20160816; b=C0r3SbL1mVXx28BjN6kftzuMUSeHYnHrdlaiF+A/5cFIgkoXkA8l8eDiVJz+KHaZNv ZeQxZmtqJHvOlbe4V/4QGED8vxINEiVIxWwhmoFLAyOt2DRUXoQaTcjexXvB6JQLOr5V o/c3f/k3vu8AG3sLcdNadfdVgxxBmFGiSQ82iHNluLNcNE7MDX0BRU30QYf+vL9nnVhP MnxHuIqn8O3iTwtyUr3A4oAGQjOUIFnQdVgqLYZVBUS4UrO5xbyxKwPKBvmvoqwNkjvH e37sPxJG7ODzebbt2Y9edug9jQgiV+GWh3ANDRAYa8E7TItmFfW0duFME1sgZNWzBjp+ SfSQ== 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=CmYqC7lobHkUYsln7oehaYwCSRkOBiL/sZms1OJnH7A=; b=QZXFglWmVAhYO3c4x1NlG45uTR1vceUo+UFGhhqx9zNfQ4XzQXFxUExltbaSfIruca cxDBF/vf0u3HRIHb746V1DQPwG3jQ/ZMhhVVZfN5mUIhI2nxneGaCx/hTf1AnB+6okxQ TrxpcmJGmHjh6Aq+HaRH97/n6Lpz0CWu5giWy11VOR4NrYRuEqRpgppceRP5VxsSpsGa FjkbIVd/XFXC5Zb9616r82h7HP3DSTFAdDxdoyKacL54LoZ5mR9gMw2vnvJRhkuIIXEs MwxrRHn9OI1rsv0NdQLahNVmfZZ7166D9kfM2gzUPrbPlUdlhnPjPHvwAxGdQIma+aDW 57PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kwCejYWs; 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 l17si771605ejp.323.2021.07.12.05.29.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:29:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kwCejYWs; 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]:48070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v3f-00045f-M2 for patch@linaro.org; Mon, 12 Jul 2021 08:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1d-00044W-4E for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:05 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1X-0007jD-Du for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:04 -0400 Received: by mail-wr1-x42b.google.com with SMTP id r11so20093871wro.9 for ; Mon, 12 Jul 2021 05:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CmYqC7lobHkUYsln7oehaYwCSRkOBiL/sZms1OJnH7A=; b=kwCejYWsgOJRE1BAT7ixs9G5JqYoIlMy0GTed3qzp0HzjOHCFJoNAZfxw9v+ZynBxe h8Iibs2Pvu0MfDEIFyxXUH3izY0JXGKVk9YYnDhbcdmx69oL9EHhZeU/ErXy7vkjCoUr rw2E0ruIcpHR8cVguFM24CIDcbMEGraIR9UIhO0CpyWxKGfOft90ClAYC7J/hPwMtzZx lf9diD/7vkgCmt8S7TlAzFGUFrP6EDq76fO6bM5syaci0v/qUEVb/JlaQddJJ/SA5h8u KgrRk2/P79cgySxkneijpV0DM4qS1nexDZ0rrHrfTFK79QpPN57XdcRw5qL/Su2SIalb fLRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CmYqC7lobHkUYsln7oehaYwCSRkOBiL/sZms1OJnH7A=; b=FlQLwTgTmkhT4rotocehskFYNn4izFQhIG5yMa0RQ8J/FIkLZphOF7aiXDNvctG1Gx a7IjOp/R5RWV+AuRdhQ1jwhHy3NLEmzf/GM+7dBe945xUoC4W49AstYzLOPKdqURH+xA TMfd0Fbpsc5M+6iu2CoA//NV8W60pDfHYTjD94i3eifFa+yxvlHIZUabvY+Xa5fSusC9 K36TAN+YybAv8t6D70ywKVisMf7rE6rXlUnji/bly3lpS4JnOzpXU5qJIuL3PvFEsUXJ vRxGVL31vecXBp5J1wjQ09Ps21c2bqzjajTKXvlZ5AQQ83XqYM5emmf1yT9DLPWPDZxL phoA== X-Gm-Message-State: AOAM5323+zJvrzPQh6t37vZDPAjdYT/9P1LhV7Xx2Y25zI7v+GU/kC0b ACxuZDg18kwjhEeHrRXj2LBj/Q== X-Received: by 2002:adf:f305:: with SMTP id i5mr10336881wro.122.1626092818097; Mon, 12 Jul 2021 05:26:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm4159700wrt.45.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CB2FC1FF87; Mon, 12 Jul 2021 13:26:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/40] Jobs based on custom runners: documentation and configuration placeholder Date: Mon, 12 Jul 2021 13:26:14 +0100 Message-Id: <20210712122653.11354-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Signed-off-by: Alex Bennée 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> Message-Id: <20210709143005.1554-2-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473084 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2892758jao; Mon, 12 Jul 2021 05:29:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnnvKizC9o4TjgG4NsGB2GsmJJaQzKXpkzI4RPjo1flEctCXAHO3oE1TZQv4EPzQhQhaud X-Received: by 2002:a17:906:4e52:: with SMTP id g18mr32317125ejw.214.1626092955926; Mon, 12 Jul 2021 05:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626092955; cv=none; d=google.com; s=arc-20160816; b=S3mBmDCh5noIXI9HrqYMmCHHoEOFYhlobDaJ+MxrzT42dHrBJWOPxo3xu3kJg/CmmQ VLc808qLWei2AkV3nvY2Jq6Evx/mYm8cvzriC7YLG0mZTQLLriQIZKbOu9Tw9lYMIzQj wYrYOOf25kLQXVpw3Qc3xTcrJYg9Q+PoYZ0HbJOzCz/DHEtTiyiStjWUwT/Kbm8vuuqA KMNPRhMXd4kXtmO1dPaAKIy1szmOWimrg0yq2aAlQro/u/UtKcg2CIcu4qOIzigoFd0W YB8zV3SYCPYLQEFNKNVAH9BrU9TbhXvQyU0/QUKw3iAEDzM0A+AJBZdrdus5/xSdSPmZ 81dQ== 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=q2zz32lywOPltrggkbKmBSuMZVXiEBx/R6761ZNEd9k=; b=mEB0RFSlPOBjVcv3gdUZYa7xRS1z95xYWKf10SoQ/oz65qxVgZt8anRfUBgHcPBzt7 8Wp6PR+onGifMQ8jKNivQsJhq5SMeU83ZnFGWqMZIiVXZJhMBSq+/gsQlyv1FjeceeEm 9kgdG4jp5ST4RSABvnAHCa5UdbcbKIPWkvUaCpPIQY93KUcE+X8IWnX//ufT0C6rSPjT sads63afLyNzilToB74ZubIFC1BqT+RwA7dxGbAn8IT08Atll83+4PCZkRMkeqWakb1n loRKDqtMfR0KaJS2JCtTHMvQrm6MS13qlrn1DTfqstLmGSZnA2ly3NAwZGclf+I0+/89 mbgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fmuTe3JH; 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 v18si16588118edr.159.2021.07.12.05.29.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:29: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=fmuTe3JH; 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]:48192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v3i-0004AW-S0 for patch@linaro.org; Mon, 12 Jul 2021 08:29:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1e-000466-0T for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1Y-0007oF-IO for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:05 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso9698345wme.0 for ; Mon, 12 Jul 2021 05:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q2zz32lywOPltrggkbKmBSuMZVXiEBx/R6761ZNEd9k=; b=fmuTe3JHkF6Z3OruJwR9GCRFqEC8/YaoYfEd0YWBc5kIlk7LpUj6Jcj6UoImtK//oA nllKbUkeRDfZvgmkcODIQnTZxP5t4U1Y0sG6Fz+JJ9OUn3qTYPSKmtjovtiVbuiOt+RQ vT+XluP5tU0kdIWC+65+VcqJ9XPKe51CGosGNFkfCYpcThm8GOAGgYNA13ZSRiFWzVJI O7kNTm0fqVhie6Rjeg96/7i+QgkuzodT3gHueYzU/By4ctStYO7+Lo91BY9uefiqiWa3 vXuIspHREFU+Ex9iRYMRZ7YM6jTfJ4TMik2V5j8rquLalBe8WwM1BtFIMbTIMEl4H8so 7hXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q2zz32lywOPltrggkbKmBSuMZVXiEBx/R6761ZNEd9k=; b=NeI7UoYDba41NLglX/rqZ3sLq3MoeByE4c/j1MIZDeen+9Eikp9hipvGzlXngSXvAZ 25MtSMKiyVbDHlhihj3unQP9tXigjaYz5fNm/s98YIUXLdmJioJqpusvLUtUuXQOzyic zqIrajWAMdSO9d0H6+QL/8lQCD8yTIQAmDDTfEWW50Yf7ZMdNyqz9Ae1BaJkWKNalVAT rmIbWD2dq0RWJPQgF1CGsjmrgGunfVm92SOqaEElknqXp4D/V5cJZEnNlF5U6nWzLkrz i2zcohBVeShdx6Q8f7ZC/XR9S4vhLEOIMp4C7g0RfYw2nN6T2kLZy37mBG0UkF//IWoc Dgkg== X-Gm-Message-State: AOAM533qKhgc2B9e15spgkMqqSok3qAAwXE6ee3TIAWobp3hzkJcQuWG lNn+epQKYXyvEHvuGB7/07pKGZFTJs4Krg== X-Received: by 2002:a05:600c:a4c:: with SMTP id c12mr13977892wmq.38.1626092818796; Mon, 12 Jul 2021 05:26:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d8sm14311946wra.41.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E91871FF8C; Mon, 12 Jul 2021 13:26:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/40] Jobs based on custom runners: build environment docs and playbook Date: Mon, 12 Jul 2021 13:26:15 +0100 Message-Id: <20210712122653.11354-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Signed-off-by: Alex Bennée 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> Message-Id: <20210709143005.1554-3-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473086 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2894653jao; Mon, 12 Jul 2021 05:31:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwppVxa4r+KOF7kRl8SuJPCn4Sy3z6gevpeLfM9PbdMPygusQAc9uxQx46Rhkp6hu23GHQ/ X-Received: by 2002:a17:906:38c6:: with SMTP id r6mr51543030ejd.411.1626093094616; Mon, 12 Jul 2021 05:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093094; cv=none; d=google.com; s=arc-20160816; b=cFa3EhctbvzWhRqNtnYbOzaFXEsoDzSyQ20gfTwoPvanfsc1oNoemCGKw6TCAP35K4 YMKGCKnqm5epJfucgnqy/NLj59kBT8RcHoqDs15Qbjw1r3iuo1ZUjjGD8nU1KaKDdY5h Az/O3OIt143csLHrEk1bjVDL0RVzNyFTvJwUXy6p+qE2iF+jccAuqtzswYOC1BUS5+ZZ oXv3OB9VgXTNb1vYBg0lq9UJrr4iqrywPVwXY7awG7AhSlW9G2mjtSvP8kaTyjopt8Pr F4kwO46PS6AQ9algJ5Hce43RMGkuO3zA+wYOGdnwsHUBod7PmQpLxqAqxtMTEu2tQnwc SCIA== 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=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=mkIEFiqjU8137bea6xL+hrpiJ9qsowy6spW7WcOuix9/srXYdd7p7pTiK6EfNVdTo0 Twyjp+ohTS+fhD0ovLKK+yCYvNOOECe5nrYhKydpYwtfZqoUuiteOZs/RIPmqiS5Gj8O nyJHb3TouMojqclcWZdm8gI8SjSl/qXPw1Te7gHALTdLA5WHB3OwNrmrotoPvW2WTVPl mz16XB0BOd8JAxdeiBUOMdFcKSHkb6HmY5kf6oEQGrmaLwTBpioxi7ybcvCEhdV3nqAp QoZBnN3YSTznS6W24sVBO7znR2uBw5l22/19pg/SmfD8X3utjeKCYvI2m9GPwQM4bODo O0mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bv4ghHQv; 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 en8si16909981ejc.744.2021.07.12.05.31.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:31:34 -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=Bv4ghHQv; 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]:56894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v5x-0001ot-FY for patch@linaro.org; Mon, 12 Jul 2021 08:31:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1f-00047b-1G for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1c-0007vZ-QR for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id v5so25369153wrt.3 for ; Mon, 12 Jul 2021 05:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=Bv4ghHQvcMURFku2egcCKn58fNild1gAethoK1n7QYvfMHOpaZmLwnk9ESk4rLkwBz psAmfIEZx14T/ThQl+9LucLP7eVeQV6zHBlx1pu6zqPaLSkY/p1l9ZbtuJ9pqYv6iCaE kzuyyt6xBsrSj7sbTFYS52kcquyYba/nzd7c+RsEixE63yREgIeNPo9cb20G35kTMA5v 3oD3UHDRLW+BLk9ebB2xXnT6MLEKZXNp3yw8UVigLyVT9bOA7CkP0yp4OeCQ8OjOueKj 2BfGiru7fnokQ+KcUYBRbjJLCZE7FfHpyEIKFv7QleD6cq1DcJXdcPQUru59zw8sm1Oy 3DNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=mYinU8E+C8I+xEEzQQ1/9DJTjY/6SIxfJxiS1UaK04nPMOTnco9XkI+EGNrlzMP++h btt2bVbJ7XirgFmahFFvqXXZdervRM7bqjS+hsXxI8o5Bx2bUjXbvq0tuN1tuRwH/m9q ZNqaq5XlJsTyCqGlNUDZWDzQNMxyFXMC9XZrMRRNznK5HuiZFbE7CST/ISoENGjtIlGw 2hLBxy/AA1iX/tGIVrrWmlHRJWAnzNR8Jrkr8/mvGTq8IMqh9rsRH//ZH2XiYIMk9VvD S8FsIxvf3gi+UU3qPZQhqoBbjG+mnEVhZcK5EaYXx4eOIRMyzdKS5FeQWAO49VExggPi 0g3A== X-Gm-Message-State: AOAM532t5OzuVPchbh1au//762sC6cIqxyBepM3qdVffpiVZSeR5TtdZ C4XT7efpKcEQPVVXai/BarxjyQ== X-Received: by 2002:adf:ebd2:: with SMTP id v18mr60260668wrn.248.1626092822408; Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c2sm10212382wrn.28.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12C671FF8F; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Mon, 12 Jul 2021 13:26:16 +0100 Message-Id: <20210712122653.11354-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Signed-off-by: Alex Bennée 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> Message-Id: <20210709143005.1554-4-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473088 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2895507jao; Mon, 12 Jul 2021 05:32:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqlRjFe8iNPR2yl7ceCdlaUq67sidavIZ/iuXqCDJH8ltraHCUgUU6HExaUMRxq9BcdoqV X-Received: by 2002:aa7:d514:: with SMTP id y20mr5328749edq.371.1626093159527; Mon, 12 Jul 2021 05:32:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093159; cv=none; d=google.com; s=arc-20160816; b=Xt9AXN7XfIm7c8KNkNrUwJ52Lpfh2iizGe8mlx4FDuRMMAnudfpWcXykQfuMT3zFUF 3V76RiIFKeP4P9W03opTtzJmyc7ZqK88plxVsNScehLgHkfLPm4O2ok00rCbR7UN9y5p /T4hZ4cZ0Z2vR1YtSz/Ki9JLxoZDBO2DLEWaKs4yZA9EdS0AJXM9WSBhcQVfV/Auj3ym 0lGhWICeYpJGlhpKiWPOnntBChiyNFKMAPBUXCD9UrgHXcVXbeXFkcdURv/5yJcN3ZnM O6rhZWrGUNJRIoV37Xj486iA2ZvI0k2rmcvWNXF9klVc9UVjQKq/7Exxy2Tiw5qmzSu5 5PxQ== 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=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=YYVFfWPp6KBKCl6RveHm8ss2lihbx7Sg84qvjBUMCX7jguAvZfAXPQqNBNIA6yFOGi skJPnfN2D9Io1ml5/rG2DQiFb2BbKJVrWIjsZ11cJJsoh4a+rJYCLbKvL5WvjLATXLTg Z1gPW4WMQ1QjFPy33amkoxGtAoeZMvg7zZkwIh6+oNgPzdzuPkouDVgrHZ+JOfUlgDfs PeNsVhJ68w0/Fcc76TTdhhcveV3BciC2Ztg1By9cWda1Z4IQFiItw3CgKfbCGoy1SkAm sUtRPRCjuXF2W8G5/lXASZdA5sq82gihhWf+EIc5FvbJ4go13oijVoE44wtZDJc8Tzxe 1BYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QlnmxoCW; 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 x16si1578184ejo.182.2021.07.12.05.32.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:32: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=QlnmxoCW; 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]:56642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v6z-0001ex-5l for patch@linaro.org; Mon, 12 Jul 2021 08:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1g-0004Av-7H for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:08 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1c-0007vU-QK for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11116324wmi.2 for ; Mon, 12 Jul 2021 05:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=QlnmxoCWQsT0TFCyGjIAntwkTmBxzsBwGh5ttRIfY3e3kItfpnjqMBpVXZTjgenGH1 JxGaTHnw4bvf0SIcD3wwxwnSVUCY4DCkJr1EVxtw+VXOGfi6wOWvta+/mx0lZIqE08so /CwYqR0e3hDOsnsZnoNQ0ETxjMiobnicJXheUIiAahZMqw6JpLiVJYxPrIaTyOdhZqU1 25EajudQjMrNCnO5E2bYiOaNWPQh8alkYJd5snSv4FY0Lt/57GBvOl6lOXFzQNdbb5Rf nguLHQuwm2WQBa6cZZhn0GipuaUOnSrDHymzopGr/1jqxFJ45zFG8pMgGhlabCmzltKc NYpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=jcsT5B5GhOu4+POOhKNDHg0u9XcHcpklvgZbZ4pGqvNFIXGwG6So+W3HZUUc5mAFFJ sFF2QJzCfIflXSUkDtp1TkuiWnpCXHwnbgvWEsE8Xpj0kQB7AecmvS9BlalPLUlY13JQ JTVeetdyHETOGFOzogufW4bBiDkaBsvTzDQVUVWvPBkomlacXrMNThX9iaRuJeLD/7nz nr6qZiZJ4pxjagRhl/ztsfL9HT2haIi7CQlo6w7rL7BHaTWS4D2QAv2b6ZqcbvGN/g67 1ZzB4SF865f2XDP3CAuajXEkqecx0X3SDx5nVTC6H0CGH67cGtv2KiFuWNjZxhPx23ep FVuw== X-Gm-Message-State: AOAM531ewH0mCvM7wXpXgZ8aGChH03ABW747PCLPwWMKazabKtAn/npu /texe/s4frk9lsDNL1iF2vI0rA== X-Received: by 2002:a05:600c:1c86:: with SMTP id k6mr9483822wms.147.1626092820932; Mon, 12 Jul 2021 05:27:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m32sm212380wms.23.2021.07.12.05.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:26:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2FA5A1FF90; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Date: Mon, 12 Jul 2021 13:26:17 +0100 Message-Id: <20210712122653.11354-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210630012619.115262-5-crosa@redhat.com> Message-Id: <20210709143005.1554-5-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473085 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2894626jao; Mon, 12 Jul 2021 05:31:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwu9E0gXZ3cJ32E7Pphy+vKd6+yhiVpo3CA4nw3++T8MgE2joUOgYMBH8CIaFWj6KM7CIVD X-Received: by 2002:aa7:c458:: with SMTP id n24mr27866039edr.30.1626093091954; Mon, 12 Jul 2021 05:31:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093091; cv=none; d=google.com; s=arc-20160816; b=Kujt5SttTCkawCI7IyExRnAdvH6dvlX+j/arCcRKgCFtXtB+rCdyvBL2xszpzZ/MKX Xk3sOeSRFcB3/Iq9krwTh/ZjVuSJrzAGzYJLXtP0G5fpNEgG3/r3TbgfdJ5zDZSWzKWi uHtxlf78eLRV81ANewR2psJhKLVyatjSE1MpC++H4sY83TpaI81RgDK9UeQI6chr86cd GrrI4k7vQG1natsQ4kDhTI9kQ8nizoVGLkw1kMHUrsjQ08tsoyKbkyjC6hJMmOfRZ+L3 w/4iGtRBJyP8bQZAlOBTGPzcVHAIk3OhBAuIYBwN6mUkLINKu4DSUFFD46pwE+6Cd1EC Jacw== 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=bEWuCkwFDvQybyyjFP+c74u0XYV/S/sranziec9O85Q=; b=yVDrigDcI++mOqcFxgCkGqicrVVlLFTXrhGZFp2nR0U2nsHbElaUve4ze4VAl3JpcF nBSxKTEfoBoh8hxNrAE916sUSgtskqL/7GWW1HlBWOq8pNeNWfyPYf9YCQWlyvKwYk29 JQueQRN7SV5ITI0PrD6GuhByIJR9wjzCXFsNjQGd7aD8Bm3nKUArFYPOPt4H1bYSNzDE 344me0mCYik3oft15fKntZRAMGmGjcz6VwCFORA7mTgxuDSpUF/qydPiAaSAG6mBlZJv Ju+bqg+CxlL3Yvg36AImuEUOSDynGQuw6mNCtAZzXYFCamtKJObWZyEfBvhB7VK9Bk2K w3NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IAEAWMTb; 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 l17si777879ejp.323.2021.07.12.05.31.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:31: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=IAEAWMTb; 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]:56654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v5u-0001fG-Rr for patch@linaro.org; Mon, 12 Jul 2021 08:31:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1j-0004Km-AR for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:11 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:35366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1h-00082x-40 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:11 -0400 Received: by mail-wm1-x335.google.com with SMTP id j25-20020a05600c1c19b02902269686f585so1094186wms.0 for ; Mon, 12 Jul 2021 05:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bEWuCkwFDvQybyyjFP+c74u0XYV/S/sranziec9O85Q=; b=IAEAWMTbJaEV/Zqskyl07NJOz/Kc1J8SRYEh0mndMToX355KfIeIG7mx3N0piaYeSp LSRQPA0KKev1aa9ax7eZ9GHTjB2h89xjEaBCxKADP7uecGxOyF1cgpyBgQ6AblA8jcRz mbP+uWEU43NySiS71e6zTMWzUfKyQ1GZXCghD2GnwAfvXNXzvRIMt+IlsnnTnvMCsGNY TpRMBVMyWiTRJ/2fQC5nuuJFkhLJIscHYm5KXXEnmCm6tF5O/3rh0JECLAqmZvG0tp9l mRMaZ0X7uKIEfu16RrCOZM9I+aj8WU052Dp5fsbLO6dtyLG5P1r+HX568ezhcgb+NmQH z3Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bEWuCkwFDvQybyyjFP+c74u0XYV/S/sranziec9O85Q=; b=UkJ1+jqRINy17O7Lxph5QhlyS9ty6GG0fPW8E5Mh0rkw/mF3CBNkSh5ldtYkGBSnLW +F3qsDgbmlPbxZscDhAAuuSG767mTEmicBJBMKu+rtEw/jObtakFioZ7802xIaVnRsWk ZmBeAaStgxk+Q6fCzCAF7JY4LK5LTBqh22rNO1pIJ4ZGfAYvnFK+pB7E/eMYHyEVZjQw 5lxtzKlEuVDTkrRdFvZHdZGas8Tw940DbRWQPaC3oSUtkg9+LNZpoTmUW/g4kUdSohXh kGOvOQZYC3n7WyXppAfvVEHeOO8KF/dzUkZDiXYneDd0njuHMu6n8ZGv8pPuxmtRt8Nu NzSQ== X-Gm-Message-State: AOAM530MGFfi+vCdNR1UAWN7AW+qkl1Vpu/I0DTCBOjrSj2ZooVtqESs Y8krSzSBQ/lBpH3IzUTHea0GyQ== X-Received: by 2002:a05:600c:354e:: with SMTP id i14mr3071871wmq.96.1626092827782; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v9sm2454369wml.36.2021.07.12.05.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44A6C1FF91; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/40] tests/tcg: also disable the signals test for plugins Date: Mon, 12 Jul 2021 13:26:18 +0100 Message-Id: <20210712122653.11354-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org 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 Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-6-alex.bennee@linaro.org> -- 2.20.1 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 Mon Jul 12 12:26: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: 473081 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2891815jao; Mon, 12 Jul 2021 05:28:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC4qpR6FXmo4WZN1LwPdK2uXGac48ql73ZYfdDPteMZgdtKosEULxtqCHdlvznBmsfkQno X-Received: by 2002:a1f:9c54:: with SMTP id f81mr42126114vke.11.1626092889097; Mon, 12 Jul 2021 05:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626092889; cv=none; d=google.com; s=arc-20160816; b=Qw4kYhZ+P19P6mXQip0+CWEYL2GQQCRXBwwVZG+o4M+j7OEMfP4JMMCFZSZ2GhTNZb veRbS/zoXW/7FKsMIrr8hhoyBFT3tsIpOd/Y+DwcBpMK7ckHR7X1L5y70QxLMVvS38hb E3iaAh9YRV62S934uQ466CVi0Aktk8rJjQyNgeqYUg4BRZfmScRW8Ckyx+VziBjmw/3Q ixiaCl8AAr4g92WBG8gyEsMMhcLUWYSopdzF1b+WH7YeZ6GMhYQvFsduFxrkW/sRV27o 49QBrc8PKzqL3jyTKEJGtHZDAicuGbvi6L7u0Z5J4Zm6aEeFLYhJx+OB/C9vpNIXCuF9 JgKg== 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=vfMIiyHNfTwBacCZ/Z5kXuUc3K4JlBoxSMTzFBkGMIE=; b=KClPCYh0eVfCxR4MSwDWziRSnaUTnOTiaODkSxYPu35ul9PJ8cRFdlSd2YsUQUsqjn LW4ELvyX9USsP7Oi3mV74MWMZ2tfECV7PrAyyu6TavOkRi4TXIQWYtFDUIYw3MudbdIp 7wVKVrs5KpS2ubhaC6EbMfqxZI33Dzn9x2R0jifHMfG8yPyub8aRua+oVsR92QBecj6Z p/QSEHJBX3bkObkGsVTBaIK4aM5vYfQg9XmowlcQTtyhSo5C6lz4IRVAlTJVjBEUnVNQ 4twHPSxILWJnV2K7Cfqk96THj3lEDdlOkHKeNs+Y5U935D2bXJ1jFLTmWT17b7w/uv07 IXMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U8kaS19z; 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 t15si13777957vsl.253.2021.07.12.05.28.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:28:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U8kaS19z; 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]:48238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v2Y-0004Bo-Ts for patch@linaro.org; Mon, 12 Jul 2021 08:28:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1f-00047n-4C for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:07 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:46017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1d-0007vf-EL for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:06 -0400 Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso11380095wmj.4 for ; Mon, 12 Jul 2021 05:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vfMIiyHNfTwBacCZ/Z5kXuUc3K4JlBoxSMTzFBkGMIE=; b=U8kaS19zVZwGOyfBs4xSViFZJK4/UO5JjcrFwKvrE+iLdxpetjxf8DnkOBh6hUXcDm B8DwhwCJLr6DtiGqoceG71EN7wVI5HQ9BVwJ3pJ85YqCcvy2ZDZ+jJxKmeGc+yfX3q2B YfKeXfS9Yj4oE9n1r/H8OP9+U7XfNrS7C60ZnDVqy9hCd/U5w7v3MXi/27gXHMuLx7WD gmKx/pzpw30c4S1WBFkVmmZEC7qGdyEnyAPO4gX7EaNdbSGPGHJvEv8M6m/dktbAP3JK QrAFmUIHKQP0YzyRjTuNaxKZuPSEUNADaHeZJP/oILkQi+B2g5R2sq9L6Td5PqDqOOGs GaQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vfMIiyHNfTwBacCZ/Z5kXuUc3K4JlBoxSMTzFBkGMIE=; b=cWsnqyt6wkXOex9HYdNhvr2FyI6It3Uxh9FDcKCGrTz4ksKKVn13eoPCn13F1iyvYU 7bCf3bUW1tyaXPTibacOUs0nZk762UrysXzabLSectXsl0RbqvOPANcQLXpvHX9Dy64i 5foFV2jrWjjkD6TjmBqmaCZh6y81Mp2OOHymvhIPE3FbBxKASY+Cmd1ASQa2o+wvQgYH TjFJle2E38j37lOdCvQOSvYtsNHWFlupuJvClUv497wXBAMQtktdIKB3gOL82wl412kT 4H2t1BiQLwEvMrAxIA8SpCxOmiE9oNA5HrEOn+J2itr9bkdfLVeEZduPlvU4Qk4a96Fo luvg== X-Gm-Message-State: AOAM530cB1Mq0/jivXhUIe/pYB8bp/nehCDsiWy7NEXCj9Txcmnt/IwW DVgD//gxxTp60tBpC51GeK9QLw== X-Received: by 2002:a1c:4b04:: with SMTP id y4mr2945735wma.185.1626092824194; Mon, 12 Jul 2021 05:27:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm8309852wrj.66.2021.07.12.05.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A96C1FF92; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/40] build: validate that system capstone works before using it Date: Mon, 12 Jul 2021 13:26:19 +0100 Message-Id: <20210712122653.11354-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20210625172211.451010-2-berrange@redhat.com> Message-Id: <20210709143005.1554-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/meson.build b/meson.build index eb362ee5eb..cea8196e53 100644 --- a/meson.build +++ b/meson.build @@ -1644,6 +1644,19 @@ if capstone_opt in ['enabled', 'auto', 'system'] kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt == '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 does not appear to work') + endif + endif + if capstone.found() capstone_opt = 'system' elif have_internal From patchwork Mon Jul 12 12:26: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: 473087 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2894657jao; Mon, 12 Jul 2021 05:31:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXtX/kUmT4V2BaaUdYKDKalQjNhCMUmGFIVv0YWKy31vbG87jlLuCxr2k+7otxpzdyalPZ X-Received: by 2002:a17:906:4f05:: with SMTP id t5mr31770412eju.351.1626093095141; Mon, 12 Jul 2021 05:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093095; cv=none; d=google.com; s=arc-20160816; b=xV+Put1yXb8HtHBZZn9idEwJFmX1FNVyIPsoP27OllvcKSY497bdRz0vzM26c64m7S +uxvaJdgS2zdQjaPf+bKPlWpsosy2XunV9LIOW+OjcviTJoQr0MSUUbI75lkDAdCAmLX JQvIwyTD06kfZ26+BHjJHQDL0QFe/FVy6Aep9vhsj5ks3DyMDH61lfWKNzfKAZdweFyG vXAnPJu3R4+Y/wUHsHkRX+gFTz7uGbdeh0Zw3q5dLLm7HYOU5KMi3hvzJ0jB7WuuGPID d0SSU4WvQbkLQWenU7d2zakdnCu7mdApD6MNzLXrwuq/0KWknPQBRUc5fiu6cgoIm6Xk 8+0Q== 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=1wJ/NQ5UneM0L7R4xiidXrYaCqQq89DBptt8dB7gDr8=; b=0hzlMlD65+PlaZ0Q4HFXUpj1D9sbF4yhBpjjuhKtQ/pbaub3EIIQA5o70P8juuW6Ul yhGr1WWms3+ecAkBHF9jDvUJNPJbfPMf5ZD5KI5dZLEnBWf3a0X8z78EoU+n8ij9JbD9 PESDfxVFaWqs/Biwy3sVOSmgkbVAQayLbrrMl4XvaG/zd06e2WlIwaTDEiGcz8m7sOb9 3Pf91C8HcuPbsOAg/fEhUr4wRyGGIXFueFA6U1Jnzih+zRpZ7OpwXPd0lzhBxN6urh3Y hsRhkRz8jIbHdQ9VKP2vJEzIIxSHSR05dEUCFlaXOqx3wl1IGtlDrlYX0kb7OMSIF0my 2tWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VHpxa3sZ; 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 p13si16376616edx.221.2021.07.12.05.31.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:31: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=VHpxa3sZ; 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]:56910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2v5x-0001pi-Uo for patch@linaro.org; Mon, 12 Jul 2021 08:31:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1h-0004FF-Gu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:09 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1e-0007zx-Je for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:09 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d12so24724594wre.13 for ; Mon, 12 Jul 2021 05:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1wJ/NQ5UneM0L7R4xiidXrYaCqQq89DBptt8dB7gDr8=; b=VHpxa3sZ/y3sI11WtyH0+DEIrR/6WUvs3akrnYaj5p0wLdoKWGyLyvo3Sx6bYCQ064 JPvI9RgnM4ehhrlhXmGdIGKN6wznN4nnKst4XKp9N0mEoxAhs2xwYRA+EPpJGFVhvgO2 Q5vUwWKXJTBJTV2tYEhlFeK5LVCBnKuNJ6pBjBmr/inkE6XfPgBe11d+zdrX08Xt+IVh QE/CN/Wlp+Y5H+hA/w3ey2SaYVOklMcXnjMdzIjcjcvrFL+YIefjsd2+z64ttWQbsWAp B0doxJGcxZlrB1ENq27Lsghk9uardoLIXkaP4SZtUyPK2clwsgRgAAjhjA+j11rw1juy dOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1wJ/NQ5UneM0L7R4xiidXrYaCqQq89DBptt8dB7gDr8=; b=cqIcu3IodqGJQRnxUc8mG3TGAn7TyCRAO8ft+qfBta1dQRqqhBaSB6Q13f3qFUM8i+ ETecBtAgqJ0+Skssnw8XoFjIVqs2I9PFCMv+VR2auX76wG5E0l2CYrWg4WuCGNIaAgN7 VDDNuwwBF2eRgXcOYuB1s9WSSF0JO8151u+czZ3fGaY4Vx4eLljhyaOnbE7ujAJBlE4+ +rnWMNKvATU38MXW7K6cVrJb1NXCTLrOKSDMb5yguUUVszcQghocXeO5ixipqr2M/vli rlu6duOs3DVwa7DFZ+RCoADjHWD2i9pxJLIOEJJh+yb27vdRwhqa5ZwaYSf4g/LnPea2 MMsw== X-Gm-Message-State: AOAM531ao12BJBsV5wdEz8tT7VljnoKCvSSJVJqsp2GeNjhfQw4izxMQ EUkWanugZJYuudmnYt1C3NYGzA== X-Received: by 2002:a05:6000:1c4:: with SMTP id t4mr13457077wrx.181.1626092825163; Mon, 12 Jul 2021 05:27:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a207sm21604379wme.27.2021.07.12.05.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 804A71FF93; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Mon, 12 Jul 2021 13:26:20 +0100 Message-Id: <20210712122653.11354-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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. [AJB: remove $TEMPORARILY_DISABLED condition] Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20210625172211.451010-3-berrange@redhat.com> Message-Id: <20210709143005.1554-8-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473095 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2901066jao; Mon, 12 Jul 2021 05:39:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMrtT35S7cDVQLpcnVtGEgtYeDpEQkPcSfq/JqcgZqBXPZQE7AubF7KmmKyRxVJH3UTyk3 X-Received: by 2002:a05:6402:207b:: with SMTP id bd27mr24101110edb.195.1626093598931; Mon, 12 Jul 2021 05:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093598; cv=none; d=google.com; s=arc-20160816; b=N9Fg5oYV5JFqDzcAZRfGEc8NPAZUPLJkgffQu+dFJZWtgfP3tnfx4tcla0J8cQs2wF yG3bv3dkocIC1wVXbWDgoAj0YaXCyJyqrb/PeVswbS7l09eB0ySy618x/IOSnUlUdFfe Z7huz8rKFHgBycjoMhKPawM4XKMCbflfSzj8QChOCqAf1yISOS5UaRa/S9QCDnsLQyY0 B0Z94oP4QQDq9be8ot8MC6TVDeZ+IHNEmxufcq1W4pDWR9fx8iRFQjvZhxj0Nrw36uAN mUai7eOXaTosm7oiKZNEZWKXdVgh4j0y4djnhMYTy2l477A5zX8gUutLxbSjUfgC6RpO 8+6g== 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=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=EPeLHoEfWKiz2ZDKeSfCH9MtLkmau5L7n3CSrHcQYWDLSeen3g985e20pSaYYvBqgS J7VxlSINRA67Ue4SVxABRbcmQby2Bd3MNVVRpZgKK3RgA+ut8j0igYfiAc0EzpBpRKoC B/qCQ7pDAKYIjaLJjclUa/TZezCUtvk7aBgwKX4tFm+dg0zvGH3FsmvcU1W1+NkLEUpz xEJFnS6O27FZxge1iWmOLHvjnIosvsFwJohPZiR6oZI4afQptVuw4TglemJ91tp+QgrG vpd6mNWBrSCaM90iwVkzP//Dxtx/mo6UDQM+DlKDZxbAAnMSknDEfhWqYK0PGUuFL5Kr Iq4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CMnFQdJQ; 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 p92si15594475edb.71.2021.07.12.05.39.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:39: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=CMnFQdJQ; 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]:49314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vE5-0007br-VO for patch@linaro.org; Mon, 12 Jul 2021 08:39:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1k-0004Ny-TJ for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:13 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:55204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1j-000894-6J for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:12 -0400 Received: by mail-wm1-x336.google.com with SMTP id k32so8074179wms.4 for ; Mon, 12 Jul 2021 05:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=CMnFQdJQPUP8sl6LAz68UBKE8mZkpcy4TDBoBWK2HmCVnwzmiYz/ybHhbcVWt4kfk+ q1Y/lHo0FItm+aeXGuMc9Gpk3/W3UYH/aMS+hLbRcLi8SlwEbCqY1REBOOozqq75NH1y yBVzDJRHIrTH3mlxqeCXVRmYVZ2F2qHDBdS6O12sfw2dCo+kGWbNVdpYE5t7gG+A2a8P g7i86pxnbclwdTes32B7J5WcQr5HogjlZVVCQmMpZJH7S/0TK4PKbo0c5n2HTmCJjb4T GPj3jN2QaasJU3Hj0vaB/n7/VcHe/MJXHU69VCU2jqn3IIvkK8cgfQW/NKHl+EoP3jgw nsJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=Gdi0ebY5yRMTYpP/u4fw7ePzqVdJxIRODqnIO7D9VuncG7RAxeRBA/XdLG0ZPS5vJi d5D1EuJPh4Ez3IEITd9YfpIrV+H77uhb/eeQ3s1WmIQvdOB5EEq8tPy78x8VBURP1pYL Wg6x8cOzX40/dTPZ+9sVRzF/qiA9uKH50im2aqgIxqTGeIntmRTbaukt3r03pB/2KOFW b+lq4e+TKnPDN+dhcbH4lYn3RfDOLTkBjwohp3q4y/LhpBT6oqHraKIkCOH35fX0Mqfc 5F0MJGAGvmcs/9AJij4j2RracCb5QWZQcvdYNtncHeAnVCeIV5Dk4auoHfpbscU0kXIv R6Qg== X-Gm-Message-State: AOAM5314ClFXewXNnlUMxBBaTwDNjCQmMjcwULCgWjF5exff58b8T5yL GU3d6lvuZnyOTB8bykmuhXDMKw== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr13644559wmh.89.1626092829826; Mon, 12 Jul 2021 05:27:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q19sm19542536wmc.44.2021.07.12.05.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 95EE31FF96; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/40] cirrus: delete FreeBSD and macOS jobs Date: Mon, 12 Jul 2021 13:26:21 +0100 Message-Id: <20210712122653.11354-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Willian Rampazzo , Yonggang Luo , Ed Maste , =?utf-8?q?Alex_Benn=C3=A9e?= , Li-Wen Hsu 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é Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210625172211.451010-4-berrange@redhat.com> Message-Id: <20210709143005.1554-9-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473090 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2898156jao; Mon, 12 Jul 2021 05:35:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1HZO2FRFxn+cXsPE5oSkZ6pDm9sekJL1aj/OzxXFs/yscw2PAv0QgK7AuOy4wuJfBoj+f X-Received: by 2002:a05:6402:2154:: with SMTP id bq20mr61375774edb.111.1626093355403; Mon, 12 Jul 2021 05:35:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093355; cv=none; d=google.com; s=arc-20160816; b=b8nSCo78aJkbFlulzQvBzbPgSVYXh82mLVDRhqibAXekJQynShLB7g9N+Kx1Fp61pg M22dj6OKxS7z6XzATAO/e9ORR2v+UlNruxfPV+0h9PD49VK6ZAS2uTACaF7IwzcBEZpI l8cA2kQsOL1PY+rWZDaxMLO/HkUGRRn+CwegO0EAaEB0jw18X9RK7ETQLi2Azv2R6Akl tLZb9WYKTUG8q0FEHkoifFgYfQOr9y1Tg4weZ0vWOf1R1oGYDlC0CmwoyQlLCsjS/02o n5HY6kB02UifuMLvedpF8XvIOqU3SRJRfsa0khaMcK3C9Ij2OvUZ18MJZ4nXfkcw/xeT t+yA== 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=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=Q+a+umJx9EQDX7L5StOACbk7hY1RJ7bWMd0xzWA1YNWuQhVd4fgqC5jZXbRxTmPkT4 pe4gz4YdRzCdWLENYjp7wYig7hxHhlrD/ucKMoZ2WYAvoAiOO7RCyvqCsmsZa88Q30rA HOjpn5NXlnAO6mCLoiP/AiEtvs8Nm9EEL/JsuLuwooigC507qAvNBek6vLR5ODFHVCU8 HEgyuVlGqdy7PGHqHs2l6WbIT1vxAJkas26dDm6MR5zv+hybZA5A+Q0l7vixdQ+yjUTw 2C9JZBUoZu2pQmQvjyb2eTB8hmcIvUVv5cNrVYlOzz0AAfwreDjbTOT2q7BnEnvR0KnF qUKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ihQQgcmc; 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 ak18si16543066ejc.199.2021.07.12.05.35.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:35: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=ihQQgcmc; 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]:37406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vAA-0007rW-A9 for patch@linaro.org; Mon, 12 Jul 2021 08:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1i-0004J6-MB for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:10 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1g-00082W-Re for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:10 -0400 Received: by mail-wr1-x42f.google.com with SMTP id p8so25362995wrr.1 for ; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=ihQQgcmc2dN+0RhxX+8eMbmRITsVw0ZHbhZyzPGqnR1EWHRi43/266lNI9iYfJ5ANQ RiBCKM2SxPt+JvllCc4nJwHbagSdk6mCkopZNyXdZSmx3aBMLIIUiGxN0vxVoS7ZYxcs 09XUit+K+XRNlU7advrO3NxvU3YdujiSJoVSUThSLBWlN42XSlpzwQai037gS6eU2Hct tOd2193xU8YlA5QmkyiNDn4HYM5SGnixguWIkErdfjiL2AtVCHUCJ7WtroyQGQTSOIlk rZgw+HEy83i2Fkhukwlr/xRCntZWQXRFDGSIPK+hvdu9THJzN4VnXhTP84IUCvB3CGV/ uvVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=UEaLc3Xgv3ARTxQ54geyhmfQWGPv4I4mKcLmtwuMgsD90mUQ9X4TkEUqLnYZj/XRjZ KLc8YOqAepLPk7Z1Yni5lDZnrte+F13oWbn7uGZkCR4L1+0HaDADFam55pAnypzaghWI 7yqMTm3luR0LnSS+a0CkncxU6u78t8x9zpLQzEe+K/fDJYXRMmXSNR/mCd7Ii/vGXbNO 1HCsA6GNsMmuvaCIzSnfVJ0bDK4i2jnTp3VlNmVpeE6JBxss07g/W61Hi4fjCD8thDoE 7xbcWd0UH6p6Ye8nqBjE251zrUxbGwvUbf18SvBDeWYaBqyE1OyDUFBgc9iGZ+jwgBIi AOMQ== X-Gm-Message-State: AOAM5319y+QQHFDg4C8YNgMbpj8j2+gp9TsFJHw2Avgn61rr8e8lUQ7E GdBsZTB4ejTEm2ScyYLL4eck8A== X-Received: by 2002:a5d:46cc:: with SMTP id g12mr56540191wrs.136.1626092827054; Mon, 12 Jul 2021 05:27:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s4sm1742640wmh.41.2021.07.12.05.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B92B01FF98; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/40] hw/usb/ccid: remove references to NSS Date: Mon, 12 Jul 2021 13:26:22 +0100 Message-Id: <20210712122653.11354-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée 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> Message-Id: <20210709143005.1554-10-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473098 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2903255jao; Mon, 12 Jul 2021 05:42:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTQKaA3muzttIqnRBYIoQsnHa+SU6gkTvGrdEyZYAKKgRvQzga9FR6n9jFu7VqvQ5FjC7S X-Received: by 2002:a05:6402:2228:: with SMTP id cr8mr10940579edb.309.1626093758154; Mon, 12 Jul 2021 05:42:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093758; cv=none; d=google.com; s=arc-20160816; b=wYdifl7m3vLsXbD1qrU8TDdWeO6NX0Xx/DNXmv9LjHO4/Dbf9jnvQP6rZlAUP8hrxk einuWqCQMCuVSs6AFa5BHgxk+ymcGuVMqKA1IL1WWjjckpxXssO2FW0V4bPToce2a8Ew cOORVQePjJVssFAQv3yvbc1OrNFDq8DbAUgRODwpVjPTJDFUeHOhKy0zSIUpaSifkR/q ieUY5iQIntD0WMYQ5BKH1ltW3EJ94MI1dwMIx4ElhMSkiJKhNGvC3sL6VhzTLJlz4B6/ tXt6+Bfjwm+cBeN7BExQOLylVnNNxMdIr7IrZTsiNy0WiJHQSswSY3jJ7+Vj6obKonvL RH+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=QEbH5l9k7N8Gx90XscEwcsUsnFMWyW/ogU84acd3mUP5li8zQLaOqmUuedjVLVgPcf wQWVfQJEr32RExrp1EGRuuPjNITd1bUNykgpvD2rqEJCEdDCoUgmy5xF99Jl3v42j5G9 pdIYbxX0VeqxOAvpplRRxa6mbOd9oKlXZQ0kWSAlXFl9jiSlqB1JItbqHnyp2Z0bng7K n6psbDv2Ma/vZZ0vkixbJNLNaHNAZRi8c5TUCcJnSUbgIOQN8/SaIQAtJ+9qENY/Bmeb 24wWGuiqDTnYMKvXjUSxy1B2i+kkMyVTki+saSO9hhoiDqlPQJFutF7eA3sJTNO4PAPi +muQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="N7uS/q+/"; 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 a5si16724602edu.602.2021.07.12.05.42.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:42:38 -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="N7uS/q+/"; 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]:58128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vGf-0005S3-4r for patch@linaro.org; Mon, 12 Jul 2021 08:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1m-0004P5-Fm for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:19 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1k-0008C3-6g for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id i94so25336811wri.4 for ; Mon, 12 Jul 2021 05:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=N7uS/q+/7+1+BLnASQZmYRuLyrv8u+hLp8ZCQvwEFbRFl6qH1nSIJDkHvCRvf7K/iN wnq2QvMWCLHYvKcadepO1Y0VkyxLmAybTvujIBTDDC/vTT9Oy4Jc5X0tYRHNTNHXGL3O BFWIzfjqQ+Xx0h/59GYuHhfHki6Uun5PXrS9Sz5SmnluvGy6F4WABSKH//0E3ca0HBjv mF09q/5sjsqdpXUWyHEjgTIEgcF9QI423A5o7G32Bfe79VeXmNq79+Cdw/j81CK0ruEu Oi3pxMSytde0a9E0KIh1s7Qpgd4+ue7GOzJTDeFau4bG4KkVPPACQ6huMTS0D68NSK5j CuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=ARcDuOVMAGayu040WRCeEPHI5+rA/j862xI6wGtcy27VhhUfW6O3j0YfeTr3SAAiiP kCPCdcr2oajV9EzW6MbrG6xbmKrXm5dGxIdQ3OLJtJt4v/9MgeQtm8lxx6jmXDVORVE1 3KqIlr6o+GkUrXD0bR0VWUGnX0WqDCiDkRrOEZiEDcUqZxtVj5Ejo4Q+b7vhlK2w341O hcjnOdS7U/R4+6PBPESERaD0uKks9dUtcRo9IrL6CtqboqSGWC9NT9w1Heiy9YGIJHEh 3jtY00MCVtyLBCb6RpDyeoJ11Z+iUFqqKtErNeWKah3oU4HzK/rO/7QurrdkWZJc2GbI U2qA== X-Gm-Message-State: AOAM531/dup1jnA9oYDtlun4nV/CRFxEvwK9CMnNmhZOppb2tn5xSNxl gNJbeQz1sPtCVsFIWDIlME1Keg== X-Received: by 2002:adf:f60a:: with SMTP id t10mr34154155wrp.127.1626092830808; Mon, 12 Jul 2021 05:27:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm14163649wrw.62.2021.07.12.05.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D31201FF99; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/40] tests/docker: don't use BUILDKIT in GitLab either Date: Mon, 12 Jul 2021 13:26:23 +0100 Message-Id: <20210712122653.11354-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Message-Id: <20210709143005.1554-11-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473100 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2904982jao; Mon, 12 Jul 2021 05:45:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJUORnmStU6u1gPd5ntmb5FnA2jtvpD5s3LK39+gzwRRrKVyQcTWoeVMDhJL9PuFAKhFSS X-Received: by 2002:a5d:46cc:: with SMTP id g12mr56630116wrs.136.1626093903809; Mon, 12 Jul 2021 05:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093903; cv=none; d=google.com; s=arc-20160816; b=ApZha/Ws8pzcOLgyutb/1Nd4pg/Ca2MPbvvVgMVIaRYaVX7n6NlrDL3VyjjlNRPTum /rlRoF0GJmmVcI7QovgdnBjnLaI/oaC/6feF3NE6B09heObkK+Dx7hyJoj/y0PbmtxkU Cb47iAb3lG3i9G8Ueee6oCR5mKxmGsv0/CMRSFbL1xQ8LVeISV9LgTYYJGhFUoTUI1Zs xJRCZbrEaaf6X+VMSeC4V2EHPcdFhHNnnDKkZd8ZP+yJpZLalrg/EbQ1MR1p9s7gbyWQ cYdJFCmaP+2yJ+M/95PP9Lty6qxqECHuRXN2StE3cIwxwqg3H/sb0YVnLtHZZa8B6Yz6 HxJg== 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=QGsJyJN7LttFhIAfv8indlVD2zWT1TMrW1Pu0xBSDjk=; b=MjBJBB9upBz74XgfyRzJNy6Rqxb/lHX9qnM7aON+mbXbHZ05oBwg6OTnzcipsLTrJl 6LVMj/R4NMUs8QoLqIqBdSn/h/r8oTwqx6W5vQtisDqdZH+uiNQnc3+tU/+ODJ3yev6G qkNVKx2o16KX+Uv2rIPJkulApppY3LFPIiwmK4JynhPlrCoHOhItqLZAz0zs10AbQlD5 8yIaAwn7RgzZ9KnZzL0N8n3X1Jgq4VEbLJ7iOKU6BhrhT+3g9cFhimtEiH3Y3qd/2OnS WP2Z87NMGZx6Kq5eBmsvvyKAW6FvtXOjrfj//zjHt+J6e4n3PdrhrI02JBi74m0Q8EaW f/oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lpIa7WlH; 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 w4si18045400wrq.16.2021.07.12.05.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lpIa7WlH; 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]:35462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vJ0-0000iB-QD for patch@linaro.org; Mon, 12 Jul 2021 08:45:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1y-0004V7-Pp for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:36418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1w-0008Je-Dr for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:26 -0400 Received: by mail-wr1-x42e.google.com with SMTP id v5so25370593wrt.3 for ; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QGsJyJN7LttFhIAfv8indlVD2zWT1TMrW1Pu0xBSDjk=; b=lpIa7WlHwYXScyb82//53yp+nB+I5fCLi1BLI1YZkjgMEU+ReSO0l2PjPtxWuot823 b/hVSGi+TrMPs6qbnhBgWoSlsNAd5VlQvPw6dnm8bkyPS+V2HwuXQ8QYXMAnhJAXEYa7 QGnP3LDANtBZuCqqszeyxY0vvbGvAA073T5Uptei1hIeJHXoNiHGwJoOq15pA9PMI8Df PEqCSyxdZ6ZeaKhh85dLLs1RrXlyG6U1NOIIG2GzsXq5JT7HPYiRtaVF2pnuOq6lFTDj smoeR4HGZwWUbDwPgir0qBBpPdiOHTAAnE7CXtouDgYMZzi499qbg3464LvgCmPjNxHW lRCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QGsJyJN7LttFhIAfv8indlVD2zWT1TMrW1Pu0xBSDjk=; b=ijTcC65k8m/FvoCFUJUUzFhjSwLCYIjOl7PNY0mJoWHCeXeHsP7ly9fdc8bPmfDEil 2ksmh2rJTMQxS3Ogk8KJbAioKF0JBOwmvrNgALo4thQxSRPRNqDOpCYIvEvc9nk2YmZk Qogt6Z0w29vrgU3VaOQp9A8XAVvXLH7Hkvo2Q7179QAGRGemA3KI5VIosHsM9uNJGH1O BV83PJUGPyLgyE9E9zIpjJokEa0zSItOpGyhdj316dtA11yhZijchNLRsefBsA8ZO3k+ N34uK9E7OzXmJtQIUstG4QLM8SdlhAvHcH9c+bh4nQ2Dcs49Yx4PX0XEqsh40wtF62z1 ggHw== X-Gm-Message-State: AOAM531vyZOvTxBGd/wL2xfPSP6lo4yfSaPUNCV0g8SHo2KHE5d3n23a TE65En2h6FfVD7EeX4U0HbvG0A== X-Received: by 2002:a5d:4fc6:: with SMTP id h6mr8756745wrw.112.1626092843046; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v21sm8940683wml.5.2021.07.12.05.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F371D1FF9A; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/40] tests/docker: use project specific container registries Date: Mon, 12 Jul 2021 13:26:24 +0100 Message-Id: <20210712122653.11354-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée 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> Message-Id: <20210709143005.1554-12-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473122 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2937987jao; Mon, 12 Jul 2021 06:23:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyND5afR9ATwRJtr7WMai7tDBmBIdNCtZYr7YtKuSCL4Ze6jAI1Q6w1DdTjEMV7HTyvQ3HN X-Received: by 2002:a17:906:4d08:: with SMTP id r8mr19658038eju.464.1626096197646; Mon, 12 Jul 2021 06:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626096197; cv=none; d=google.com; s=arc-20160816; b=ivjTGfCgVFZzqdEOA18zSBxP7uLU7/jZeOsWpSqjzjBDt80Ln+wFzqtHUCELRft8Rp KIFkoB/8PicmlsE/CAJIbKJwyj4/1ys0ngSjYjL/HJB5x6nxV8q5WW1YZai3rkSFfH3j Kr2FSmU7Cmse4OpCXsWkJCTdvrEBZyebYakqQ9UN0nWZRKe8IPb8A6vf40ivsPE+o2q9 ApXnWiHT48hYmMJwPwQPI3KPXR9Q9C9kDha/SESZ0v48aS72uTOOQqeEirdwoR6TFPy9 xynSlMUbh82GW9CY7WHqLPrc3nADB8F2Ib0w+JlYFwM5Lh6LEYdVVNVLv2xoFZYy26OR 3xgA== 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=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=o36FHn4Y7LIXH3AK0VWY9gVdQhJtTG8QUgsZlGAGyhut7vDHGhx4/YOx05emq8Ci/L a+ABbAgtaxPSDmojSxgRfOJIEoSz4p5NTHmSVvMTp+2zGuncj3I+mA861fCrTf/PdtYd GqJddIuHbI/bNqC8umFelZgn2vcLSD7YagZuLeNvA4O16Vzzc58/XWU9yfO6WYqYpQka 1PSnqn7qtaww5hldLrgZ4Lma1pxdBzjuKHeuZVM1mdr+zvABaeqf0DIqAAZWXv6WUOwR HIgCJiDq/hihUKkWxUT6lcFtrCRdGL1qzZ5JRC5KtVwoVGPg8GWd3mjF2vpjJjMRClZZ BxLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Eiad69jK; 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 nc18si17622773ejc.167.2021.07.12.06.23.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06: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=Eiad69jK; 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]:37082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vu0-0005LM-In for patch@linaro.org; Mon, 12 Jul 2021 09:23:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH3-0007bJ-M5 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH1-0006HS-Pq for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:01 -0400 Received: by mail-wr1-x432.google.com with SMTP id l7so24503114wrv.7 for ; Mon, 12 Jul 2021 05:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=Eiad69jK+FNvRvB0MqK6bA7ZhnGZFB1PjoD3hlbDWd75jxvojV4vBhQbtqUFFJsS0Z k6V6YQZdaYYyAg+AZfkVhx2MPr/84tY5O5RzTBI9C0+55mNQ5xWyAzomBd45d0E9uonp m95cbGcqPyOhxUFl912dOPd1eFhrFtNSqdyPIGI3QBqlbF49ZQGCbd/iosQkHk9AQsL8 XfozznHh9SJg6ORWhmm4TQDnyB8V1qVrRclWMwLDL7SFLaslDAywXlrWaZ6Tp3KT+KCR JNpfy+nEIqZgD2mYURZLPFIfFWiHMVL4VVP/bz9LyLdXnidZ7stPqhQz8m4WJuW5rAVn jFTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=k1WFNCrsR87lJvuAej5CjphyY8KT5jMWtluWyVdwLrY/N0r4SH4B25IYGiFrURGKte 5OfWuTp+LYVPVv06IFxHA2hVozSkud09JBTnCn8ICUQ8wZbaCPgZAzHCvuOPfTXlBbPc WLGqcchjutH0Go1bx+1390RgAMZCjfu30sW6ikwiwi9deI5WK+HzdPpp3pKqD6cD/xTc hnvQD01DvFitWb2wrKL9jN8CmsHSfzjVxvxsGHP184f7htqQS383RVPjpQTTG2A4bOcQ X1Comyc6ug84xDWKn+gb0Oxyetlgj0GaXx40CaWBSCDSKnWfTcqUasi2zPIHw+gNOQsq 1NaA== X-Gm-Message-State: AOAM530Kcmou0rySlLrsXzuTlT2L1ZpqRQe/LU2bHseFusvCXNsUD74O 9DZFyIttjoRABKVapVRzKUlfgA== X-Received: by 2002:a5d:47a7:: with SMTP id 7mr27350949wrb.150.1626093778237; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x1sm21290835wmc.0.2021.07.12.05.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 24D3C1FF9B; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/40] tests/docker: use explicit docker.io registry Date: Mon, 12 Jul 2021 13:26:25 +0100 Message-Id: <20210712122653.11354-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-5-berrange@redhat.com> Message-Id: <20210709143005.1554-13-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473107 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2908330jao; Mon, 12 Jul 2021 05:49:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy81PHoCktSfgkZF+5QQTyZJ+BBOrXZCJ9wu+Dy+OOL79RUFccU+V6SOsaMatniW91MFRIl X-Received: by 2002:a17:906:f104:: with SMTP id gv4mr5340541ejb.193.1626094181376; Mon, 12 Jul 2021 05:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094181; cv=none; d=google.com; s=arc-20160816; b=Dnco2WD55b2qi5sT3B07Sj7cs/Xz/9UL39itsPZ1BE7IZNC9mwToSLY6FiGibh/Kr+ +uT1Emu8zOu7VR6Ousc8ev5rnNlJMeAdpYubBe/zeud2PphMIyHpHTXA5E+Iya9cRlJA rq7jkHL9emxe6Ybunkkm1KFtN2sNRdmMGam0LrluAln6NXSBWSIhtfKHu1RwD3v5SweF ISw+ydYlcllql6YHa5/jntUv3rX3EhfEN6gz77QSPagnUnpJE2GlEeasJDEl8kd40NS3 ttrQKHFZyQrQmbDc2bO/CAl4ssUvoQvXZXhahCI97blfitJFmtI/8tum+mBf+x8t2Qlk 3l8g== 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=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=BfFOH5JNGjOTjIFFNMR7Rw5Ny0xWAK49CKh6UVhmqTVkiqI/Ff/JEf7spiBzfHFhjE YhI3qXbw3g4KgNwcZiwABtQc3HoMP1uPsO8uhpnTIXo65HSoVWhdz3wEJHFipu+GsHyJ TGqgXAJ3DanJlgOLucJ8A8A5SY76RbTDc3CAifh84UW5i0VN3jIVPM4o1/zheELnLvlk ibnmN/eUZb7pjWj9wSVYahYXXfwWmo28XGuQrL0mpUqQK6oany+8cyFYckj4GMTVsF9w R5r1qukcbQYAUTmZVX1HQNzJqZVKonB6cpAKny/Rt/gMGJ3eGC1mnbzii3CxiQGdRNyz dSNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sa2O6Qqc; 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 ga14si11972954ejc.427.2021.07.12.05.49.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:49: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=sa2O6Qqc; 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]:47436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vNU-0000mf-3u for patch@linaro.org; Mon, 12 Jul 2021 08:49:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0004aK-0o for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7D-0002Hu-Ry for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:53 -0400 Received: by mail-wr1-x432.google.com with SMTP id f17so25392650wrt.6 for ; Mon, 12 Jul 2021 05:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=sa2O6QqcnRxSvG77gjGaCnFSSPrGAgMiKFXKBRIaoxEe7bF0L4p5dwaSlymOZAQd+x jIoHrthnYcugXeGAt/5IPvLafAOcFkgr56Rri/zk0rSWCZZXN+OAgE0fwhccDEqS2uh7 hrT6EpCr5DysQ6X77pvIVXA/2BstgQS03/D7vjpBMTIg7nFRT4ifv4b5CiCQS3ccGrSq zlkLuoVx+5L6QBvdUW7vD5wXerC1niDMStivMGc+9zAkHz8LSdkKhEiLp7NfNQhyXooB PqhF5tIFDtu0EI43DAKE8qrQ/F1TQhrNAKV3UMkn3zIXby3wZJydATchozVRCzaYKeW8 ht0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=qIc9jrDpr3VzMVEjNignUWvWjWmzBBUI6cvhvK56nNgI394CN8iSWW52WCgbuC7LP3 yohZM2BzjWpy7877XezMuifxBhSZLL8PUXRp2UJVw9gWye1IKH5FN2ZFme5X9Dlcu2o3 yVvRB4r9ray0wT3fysVxWViJMPDi2FN4fxQMh/dKdUD9NR9AVXTFW500UqGw/IKEV07W B+GMhIBnbiye39aWTE7LmcXE9N3b3b7/IZ18W3e+oKGiM+KvMvx8hmVWPm8wxzM912ua tHjq3wOisnNHKYMj2qP/5KkVR2FMrdQ3fUZ2/GTl5DLqEDIbbTpf4rcdR1M1q4xVz3d+ 093w== X-Gm-Message-State: AOAM532Khhupq0Vq4osvSNMYjp1PqDI0ApvXMqVi5mM1OwPTE8io9t83 6NUBtHDzAI/aEEON5mEOT00A7A== X-Received: by 2002:a5d:52d0:: with SMTP id r16mr57664470wrv.323.1626093170255; Mon, 12 Jul 2021 05:32:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s24sm14982311wra.33.2021.07.12.05.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 574C01FF9C; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/40] tests/docker: remove FEATURES env var from templates Date: Mon, 12 Jul 2021 13:26:26 +0100 Message-Id: <20210712122653.11354-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-6-berrange@redhat.com> Message-Id: <20210709143005.1554-14-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473121 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2934968jao; Mon, 12 Jul 2021 06:19:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYO/DUzI81kecXQhnkv6h7tADkh8MwvFwviq0NFTmjba/hrI774Wih8BBLiTbA67ELsfIF X-Received: by 2002:adf:fdc2:: with SMTP id i2mr35283563wrs.157.1626095984879; Mon, 12 Jul 2021 06:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626095984; cv=none; d=google.com; s=arc-20160816; b=ZL1R8A9OYcyzjcEeP2SQNxqFj2u81qTv/XKK643y4mSYs8a7X9sut9hpauCbZiKxJe uREdVBhW8l5zS8xI5R+AqzhrAyJyiBGNTPQNciCcK74CcWc3StsQChbymAKv7H4jaS0B TNWT2KK78HoqYhQQKtL04HeqsfRYdmMYtjxd/hljMyMzfvmxoRba+3QV3Q3zNP3d1x6w 2BSXfJiHfZWhP7H83VBOlyKCm6CSdezFUGkPzyCnD+NKy5FY8f4xnxrrcLSVcjg007Jv 8JrvoClzqkbPRpBcWPH22uDVWvp7SxApUBOMVeov62XX+dhijnbZ2Y4Kig9ea2/8HE2z mOQA== 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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=IKyCfwfPJOUv0jDI6v0sPyH6wu+UFAIsGLs4y1BwZ5jXkkgQiDrq4kK9z1gyiGoUXi Vn17SMJoNiXzRqgKgwwVfGCVyMf6krX5rvoDO1rwSU2Me/E+tuAQ1XOfHdap1UtZp5sP MKxfmqP1nDZk14UI5gLTJLKoaMcEj9oQw6DTXi/oG5tN63uNT4Qn3ATNYpp6ZqU2QgoK 0aWNioRkon8yyRj349VNGXTMrx0wnPQxdPU1tZMzbqC3doniKRstSRoVhgIC0NJq4VLx n7EVqPEgCjoZ6Vny1HHxa1TiS644OdIz0DbKUh/1Vt3aOi4EheDqZs6dL5ijEOkHK6x5 2YDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gaWzAosz; 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 y3si21516910wrh.171.2021.07.12.06.19.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:19: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=gaWzAosz; 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]:57460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vqZ-0008A8-Oo for patch@linaro.org; Mon, 12 Jul 2021 09:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0007H8-Hf for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGu-0006FE-OF for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: by mail-wr1-x434.google.com with SMTP id r11so20161338wro.9 for ; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=gaWzAosz4396SjvK/SyAkrH2ekQLjYru8h/92oE2dgpKDak92LAF6Ek5yi1tkNvWQK UADJ3YNdqZouosLouLmRwyWk7v9dPL092wQ1a70fZHvGAjZTqdqZlmmZTzsVcXF42Ui2 NUa6Q7K4zezw0HLWFVX+mbhvg6akIImkgqhEATwtRBInx0s9U6Or8UDedFO5iBbd/U8F QNgqBOsXAOjQ4e1HGJmnf93FZnAFMhgJVbo/7Y6EzFMU1Mo5P8XklVF7xveOWsBGjNbW +iFWgz2re/51dZ40rKJ+RLfBB0VwvN0nIH7r/1R7B0EG07/lbbkpPJZ4BevKiKbw6tf9 v38g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=VaPhVKL/PzIIl5kE+pKOxsFNIQvomYyTqCWwCvTb+3St+4JQxT5PW0gwTPHrJOi6/V HB37N6uDkMFOd2odUMeCJueHGU+AWeezwWvq96+CKZVEJh2nWNdR3Pn/7zj96KBMomSX M5NvVVpYYS0/M4uA7i/xaQ6paUXx6/EErlJMS5bQEsYgVYaV0N/yhxf3GgFZcEu/sOK6 EY+1/H7bbBWMVRLkET5l/3/prbBQ1iQYUkB7aAHvBPcoVs7TbcM6zxacIXSYouC2D7H1 2/fe1Uiq38l96ZtGKrGaCuAqup8aZJYFEDIySg7aqMENDDIaN7hhoQH2gGdYXfq2khTh nXaQ== X-Gm-Message-State: AOAM530xXJ76VEPgh6r2JSLFC2GmIyBb5yVuVzeq5BxJEzDQJHTn/Ih9 PX5DLQ0jop5Ky0QjZiPqASUrUg== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr9402006wrp.351.1626093771240; Mon, 12 Jul 2021 05:42:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14016963wrs.4.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7709B1FF9D; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/40] tests/docker: fix sorting in package lists Date: Mon, 12 Jul 2021 13:26:27 +0100 Message-Id: <20210712122653.11354-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-7-berrange@redhat.com> Message-Id: <20210709143005.1554-15-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473104 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2907157jao; Mon, 12 Jul 2021 05:48:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynOy5blBkYy+KdiuhWMLQL0T/798uDis+CLsDq6qPhjH2Zsp02To3yI1CsJZiTBt6kHL8n X-Received: by 2002:ab0:35d3:: with SMTP id x19mr31234286uat.124.1626094083788; Mon, 12 Jul 2021 05:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094083; cv=none; d=google.com; s=arc-20160816; b=po1qXXZj9U4FBIusQNllzL72hkt1npw6tffAaWkln1uPxFBq2jBSV8Rx3z6iMu014G h9HhCF+JA+21+kBaf9+RniKNRHDdU3TaskVKmKATlpzdwcRfubDcdQZDANGzd8YhKMB0 hC+H+b1jzJXT4S2BYQCSNRF+CN0ljHJef21MYc6ONTClpTay6sGXfqyhKhWSL7c72Sgy S0+A6k0H1qzyDY4Bm7fvPShqk25Kp5L6V2p6ODv7Bu/qF3bbAmLv8ijIhdz4s6bnpbI4 Do0pakWlhQQmR9vGcjocTFvqU667y0kspYTn07amJAMxA/KhPtdP/Y6tSRpKQwDuwZPf vSjg== 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=4DWU5y/nf061VnY3HK74lTL314WIvo/gGKxXixXNuyA=; b=xes0dEB6BxtS3rDRjLjFjBaTJg7GqUyaclwIVi+DmGDljm7x8SXM7UIKq6VLH8DHyr WOBvekrJdRDaapjwI7ay9/1mXzrgHU925Q2b5YG0f69ISfywpYVMB8QaAv70icaS2w31 buWZ4e1oMZ2EJONOdzcmJt4knpN/L5NrIeqXh2c3ZgzkuLp+dq5he6PI6wleECZ6oLdt ZyKw1jgQ6WQv1ErBW8EJka+YeA6tvpcUCXMJbiZc7mwS7Rv3LiDYKCZgHXiEUjMo1MLv ksrFjCw7dHplT6HJxaQ8mjWOGBOpAxpVzOf1O08TlvRsYrZTWPM/Iao/i0zmFqPkMb1F U7tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ool0Zblw; 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 o190si11642501vkd.74.2021.07.12.05.48.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:48:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ool0Zblw; 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]:44114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vLv-0006sp-1I for patch@linaro.org; Mon, 12 Jul 2021 08:48:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH2-0007Vr-3r for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:00 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH0-0006HD-FF for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:59 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g12so3488428wme.2 for ; Mon, 12 Jul 2021 05:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4DWU5y/nf061VnY3HK74lTL314WIvo/gGKxXixXNuyA=; b=Ool0Zblwnq0w4zx+O/Qz87Ksq26natJbE996QQN8FuCdFLi3J35lvUO3EItVPFlakb h7TyQ9Ggsmj4sn5koLQVMu8PFhiECmhXlbAt/FxmECSVkk17cVd0l7sAv8olKxaDpRfH G7U8JcOFiF/KVbJEFqhjc9Duvr4Axpbyz4m04r0l7tDO+qfEWo7pglu3G53Bm4+eqeTE e4FRodZwP0aHJq+Q/C41uLe/NV4E6lPzJ9u4oWLrb6AJHnhspJUaN7CjlXqXcXA7X2p5 W5xdiATPEIc0YovJqWouNxmhrht8SvaoAXkn3fgth6j3+Bhf4CNAxP15slK4I6vajf1e RPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4DWU5y/nf061VnY3HK74lTL314WIvo/gGKxXixXNuyA=; b=AGtPfOrCnRUCuwdTC86UetYVLe2K0Q2+cad7zn79GS+2ZYn6PERCIKPQwnDC6LLQSn +uXXTf/jNuV3hXGcErLLXnko3otlEEEuAvT4Ux+Nv7Z8OXlyMNlHKH22+aoPCjT4u9lA WxlmBQXnXIxomcynKU4G278MALDtv7S2ZbCTS521ECf6XX89D7o4F72PGrlU586cwcX5 XBBVc/k9EOJKFSYq18g/9Stp7g1dZ/q12M0BUFPqhn+rD6ViaAQjg56gqlCLOF5r0PNc 1psrrMjCEPl/fOsTCRK1ydW3GZxXgvGRVToFP6+XLB8Sptin5EQvyRLxEVXwwpedtLGK FXAQ== X-Gm-Message-State: AOAM5312hPiOeROvA2uz2LKsbR/AFk1VChSInzJFLMzEObk3vl4pZTEo hRK68Qr92BP9Tf1rcQZpCtUipw== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr8870451wmj.15.1626093777181; Mon, 12 Jul 2021 05:42:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n20sm12206700wmk.12.2021.07.12.05.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8DA081FF9E; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/40] tests/docker: fix mistakes in centos package lists Date: Mon, 12 Jul 2021 13:26:28 +0100 Message-Id: <20210712122653.11354-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-8-berrange@redhat.com> Message-Id: <20210709143005.1554-16-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473106 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2907949jao; Mon, 12 Jul 2021 05:49:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRodqm8yAnwfILiF3nI70lJ0LlR8KdJDJz2qPIB7/U8BxRNyokdiBy+mo5RyBZZkg6RYZo X-Received: by 2002:a50:9345:: with SMTP id n5mr65609510eda.289.1626094146836; Mon, 12 Jul 2021 05:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094146; cv=none; d=google.com; s=arc-20160816; b=aPksnR353hdTxr9uUgXBSmx9zkDnW11cFLVNLLZ6LJm+ZOIXImznmZwctqE+iHxJIu pWUYZmKRcdbPNcHacX7gCDhyxKtejmUlTMrAAiSe1o19fwavXATiy5xJUJlg+x6t9k7U kYiPkgRx2dQTSNl9xXAOwnWuyuFnDNpCHa8ujRVdx7OSa/9MwyjM3PUGBtLUSkOQq0qg Xon3+hHWM9tG46s7v4zXO+BDZWbMY7/Lqm3Ga/ku3gET7ArzuBlKT5YZiv2rsytDRKu3 3XxGCagkpS2c2R7eItsPPnREYal9y08gB3ca9dm4Ifu3GxNnQ1SZpqxXFKAbqbuWZ4Pg Jn3w== 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=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=uE+sbzrrSH1svhIOZRzbW6+1x8TUFuHM/N0NEipeN+DjGfUg7A18o/agMyQxJupQCp m4JhICQAyOd8eIs1mwBobQBS/BmaI6BipO3wzArS+f1lOspKDO2bZmALjVtua5/Jd/h3 ptjHX52trtcQ2gRkTIM67rgQXT4erXbnh9mk6duh3/TJioz9/mg7GGQXCvY0uxq9GKUe mYPklL15rrpbleDRxcsPhYE6I3GBUCMbzlPKoO4Pju+AFyKoh2fxVR9j/bRyu0ipbTRW TrDR0Jf41jJIN8V6Byf5p9ZcWokN5d5lBBlWrWFcCd6w03sKRlp47wQWMFKB8UMJFE8U dW1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kpOD6exW; 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 jx28si16493431ejc.43.2021.07.12.05.49.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05: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=kpOD6exW; 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]:48558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vMu-0001Yp-M0 for patch@linaro.org; Mon, 12 Jul 2021 08:49:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7T-00052o-Ov for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:08 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7S-0002Me-Bv for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id p8so25389561wrr.1 for ; Mon, 12 Jul 2021 05:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=kpOD6exWcoQrovYxsqhSaSFW53Efl1dYqtEaEBUkzgAWBZrDVuhiUqJ+6TzQydHzXp mYr81Wb5xFCXf1iLaWyesigmHncXATmT4ro/Ksfj77TOjchk3F6GkdLQjaV28gHEI9Ph Vxlh6KEdiKJawRJOtqj5NZ/0Rj8npp3/KP3U2vfGVT/Lr5zICuhGOmrZrLb7cyP1crHW 1fQmYPAvmILzFKbnZ6nBmfAYWgbwTvVtIKFEihRPoYJ9FFBp99PHOGu/U3KkBGuDVh5q CkTq9LixtsUr2KxwnUZh/h4cDHEEKedvJzS8yN84yBMYN2mnQGfvwLGBVPYRyK4aFN56 HM2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=GhRogVspOcuP1Sy+zP8Lw+JfbcCdJ0pIS5MVAttmG9qnO572oJBaq6LJ3+EfDXMHbE bBbGkF38Djfh1ZIWosAx/Bv8fUSDdiobJwZUodDRzLWpE6+uDr2iwZiGguxw156eVaaq H5di3mmGg2HmA8UTUYz2HyhFJ31PbhYVY+veoOOeDS9mqRLz/V8zL1VVbLCS4EFyQhhd L0CcMHaeI5H/NprtnXDD6h77Z0iS+MqZcyVotmIfC07B+BaYa35JuUaFeELy6WBFsaoE 1XvjW5XGb9KGDQesz/fMb9hIPku0Dts7STDSqDtZoUTf5wRcgtcWfphSh9jYv5oyH5Pt mWLQ== X-Gm-Message-State: AOAM530jr44L6CCJ8HitTR/nz/5udSsGNi4HHECBAkwlvkJ3eWxo8YQ9 Rxvl5XjNkQRS5vgBG+RrUG0dng== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr58292102wrt.132.1626093184980; Mon, 12 Jul 2021 05:33:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l2sm3242014wms.21.2021.07.12.05.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4F961FF9F; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/40] tests/docker: fix mistakes in fedora package list Date: Mon, 12 Jul 2021 13:26:29 +0100 Message-Id: <20210712122653.11354-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-9-berrange@redhat.com> Message-Id: <20210709143005.1554-17-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473113 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2914287jao; Mon, 12 Jul 2021 05:58:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/JqR1sL3VlNZ/O6QWp+mNjYfu4fmI/Zp0pcQ85fziLwbK4IL01IGIQCKzmneHEv4Sct/7 X-Received: by 2002:a67:ed81:: with SMTP id d1mr46040429vsp.31.1626094696543; Mon, 12 Jul 2021 05:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094696; cv=none; d=google.com; s=arc-20160816; b=XtUs2tiRG+ePBW5WfObIR8G1+hEFiPGtpCd4O03KllgXUEa9MC+KVPZDmAtGJMF7Te SYrxR8VlKfmSlSmYW0drpjDnq24FBXWoR8teCl+VaCA7wEDnqF16K8gnveB49sFbHqYB mdJ2r1Ze2aW31WO7FFOZhVx3xQLAuvoLKK9DqebhdWNtLmL4Yo/INf6lajiXDUk1Jx09 7TuSZF5X455qjNXf+GTURgtMR4/rCGDWqmv7ptyFi2wRjBRnOhRvSdE046+NaJmFvsAQ 8jKAYzrcd7m3N/y1kHHEG9DzJOSraxO4Va9v/We6SM3AGFKVBecSCEhWKZRCsoatBVB0 DWzA== 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=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=yY4xka5lQulbVOJzTY9nSgYFH95U9fVLsLr9FehO1S/gwOT2rhesymWPCus7WVNqbw xMPCNI9J5El69Ot65nerhu9pDLAWER3kmvvjuVtfoNVnK38eBnGqWm/36E4Q9JL6MmUs lFGcZ76q2rO5uZ8+XsWk6VGRHugeTkZYEu0+5LRruTMHWEVkr+ENoP8BqlaMHKCnz1AR AD+AKU7I4YPp8x5Ov+DMnsfvktH153+tgBQztIpFLDJ9ci5HtHj1v8eAzT0N1pjMKRiI Z4bJ7ySZyTV+Bls3LlNta2CxeWnuIvFZfE9Y958HiVEB6a4inVMh1SFZTj3YWK86753t vzRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q7eYlYQc; 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 e7si11719735vsp.232.2021.07.12.05.58.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:58:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Q7eYlYQc; 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]:42080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vVn-00008y-R6 for patch@linaro.org; Mon, 12 Jul 2021 08:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGx-0007JC-PX for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0006FN-74 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id l6so3028120wmq.0 for ; Mon, 12 Jul 2021 05:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=Q7eYlYQcX8FFzbywsBDNVeYSIJvnSfvPNgD08h/G2GzTyHdj5aE7diosPGuxlItTbR 7dezITfsnCpFjP1aN3JqfL2fa2VYxxaJHEpDmb+qIdFkAHCpnGVIEdbw+vVzU1xIpACj R+XLfQD+HoML7mavzO0pudE5Q3YH5azSetj49Z8FSEcPzszHq0LV7EyNCkfs0ccGQBQI NJjWezPDm0BECe00d0Sz9lnYSxfJeoWQ89wxH1ufjAAEIt6dnhOfcXgzZGi2lvGS1H3b obOUIDjPV/GKg1lCizAZGfHau4JbyherXNQ1ZDxJxLu8ZO8dXbCzqmyGARHJ3GAs4hPv TqiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=IpUt5D6sK8U1JZDg0ok7xJ1X4CzrVG6wppePaE/iPp5j/idq5qk/74kT42OYj2zHYy ehVz+k8hWDggllCMu/1rXP16x2+MfrbXjjeE1O1FOZAeexw4fgIgUf6uRkrzg02QA53Q Pt5Z8/xOtDNTExnC9b9a+GP7QOderCrvCORIzJkWh8LnwSZM/1U5nmO+NEKD8QVk0/Qa iVwFIiV+Xe6VPf+qxpRuOaCEpqnFHd6qMii3QaBvSmTYuhiBSn2kVX1SZJ3ies/znDaa BK1vvNEA5scO48hWd/ZPKWmGtuPM4IKimJQ26j8kYo501kYxY7CxKjWn9ePI8V2LvvoA 0rzw== X-Gm-Message-State: AOAM532VahVXDeeEJ73twcLyQ+BgAy/oWuZjdv/8MLpJadzAa3R2B0+H oFchS8WO6papbufYPQbLAmiLRA== X-Received: by 2002:a7b:cb98:: with SMTP id m24mr5252269wmi.21.1626093772846; Mon, 12 Jul 2021 05:42:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i11sm22319891wmg.18.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC8AE1FFA5; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 17/40] tests/docker: fix mistakes in ubuntu package lists Date: Mon, 12 Jul 2021 13:26:30 +0100 Message-Id: <20210712122653.11354-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-10-berrange@redhat.com> Message-Id: <20210709143005.1554-18-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473110 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2911203jao; Mon, 12 Jul 2021 05:53:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznH2n/E0ldaPN+GIZA6rzFRETGowj/gAwibqOWequkfNejC1KRDVKXE1z86AnMplXYddYL X-Received: by 2002:a17:906:2583:: with SMTP id m3mr51145548ejb.506.1626094431528; Mon, 12 Jul 2021 05:53:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094431; cv=none; d=google.com; s=arc-20160816; b=LvRl8OMOMeWad5GPZX9ljHV/Du5AWJlInEQGbMI+Qjq76EbdXUHEpW0FcJYhDz2Np8 LnDcnJgbwy+b57l6OpoQm3e+DLoUsPkgm3BKyJXmSxttJHg9oFSzMn/BH2lmOTjmJ03Y 6AVx+7v+XDHU8MxpUd/YOB/vw/ETwEgAZxwtvnHFqPhPmQcKx5iSjIJKCoPdpKqdQo1N /Vf/d2B709DO1HvCZeEfW8h/F9y++lBUwMloG2WLrCiHAsU24EmnLdvXcvHimTcNor/S lmbk0RTr+Lwfju5Mu0kIqPbSQpIFc2XpJcDHTSLCTm/TEYxvQvdjbkyuwKlmlcnD72WQ luVw== 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=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=H8id17hS2V46jb7feC2VVBNWpt5ZWrZ8O6pBhrkPdS8fx9a1UrqSOO88RY2MBAeugK xWn4t0i9t5sntT3LnTvt50if1OY+zs2sRu3R5mqqDvilxx7OZx6M0Vi4z19tv6rfqlrv aebWDLQ+zglfoukK03+stOrHEDiccCEndknaXqCMV+JJgBcKU71PgTAegcjmOPyYCX7z 1A/Q2bc9iIyjacqLMbrIPHyRh8CXsWv8wmP3sFopDGhDjVcwvUlJQ/pCOYH1UVUsogmu 5UDI1wDGsmzH+u3OVz/RsmPffYDwyD4GlrUypfDJZkG2Qh3tzC7DCeIKoJeI4PhgiN7F 6Y3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wvKdg8x+; 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 t13si16341578edc.254.2021.07.12.05.53.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:53:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wvKdg8x+; 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]:34062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vRW-0002Y9-E5 for patch@linaro.org; Mon, 12 Jul 2021 08:53:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGv-0007Do-GQ for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGu-0006FB-11 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:53 -0400 Received: by mail-wr1-x433.google.com with SMTP id d12so24791650wre.13 for ; Mon, 12 Jul 2021 05:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=wvKdg8x+R0d8HM6PpRLWZyWX+9mMlLKRohz1oRgDXwet5ayQcVaFGmpOn6Vmo5+UQP UfZT77C8QXTjvVRMGqowZ6hiJUa4QfDs8Ct2sjMGau9A6xyQZgZ+HWNpUAAREbwL6wb9 O3CqPCiw5PxRDUcVKiiCxUJ6fs5ramDbAG8a/nj6PlSmLtjBx8OD8SsAYCXCU6XAUjGr xTXwxgWp10jpbK4OhIGGaN12nIIWtNMTumZJAIGksiDDFw5/vxv28XzLLOgQGqeuzjfg IC4oMwsDfP0hNyf8iAzVIZvz1npq3q+zeu7Ju+V3YdXftGtK3qo6Ow7/aLo0CSJe9R8x GEIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=REQtRENdM0CVunpdkDmZlHVjKGnH+i72T9GSuWZCGNdtFxdGsjeflI7L9YLOfVhBrG KpW9yahmIDyNYFm5tEUt1ii3e9sjXAa8zC3xxFvNeajCXQSR6yQBMsZ4eyo98vfWCiId vOW/WV4+y35GUYon9z6Uko6v1QPQkDKKLT4q03d+Xy3ABuIbM+I/QxFdQRglC9UMMi/b p2/peHEskP8oFn55afrBb/0WpdETMcTrggxBOgfAOwhD+HD6ReiLnV2hSU/gPCBn9RH3 w/g9Em4zdx+kzyZncvETUVw2R9oF23hNmDQu6coI24InUjDdWDDUj70sZuvjgQgWN+t9 04+w== X-Gm-Message-State: AOAM531mgYu1TpBF3EV5FRCI22jN4ddxgJpmPWHNCe2ZF/G5tx2GwloW wqINGAo6rY2IKeqUPOEPYSLc5w== X-Received: by 2002:a5d:5989:: with SMTP id n9mr3183238wri.8.1626093770399; Mon, 12 Jul 2021 05:42:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k5sm13437493wmk.11.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D1F661FFA6; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/40] tests/docker: remove mingw packages from Fedora Date: Mon, 12 Jul 2021 13:26:31 +0100 Message-Id: <20210712122653.11354-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-11-berrange@redhat.com> Message-Id: <20210709143005.1554-19-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473119 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2927967jao; Mon, 12 Jul 2021 06:11:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAx6EfqL1GKQ/zFMf5LY2GSAg0rJLO41AkhGETwqGYM8kuS0Bgy6yTIy7gS2FYEch3+8Za X-Received: by 2002:a2e:bf21:: with SMTP id c33mr42332307ljr.28.1626095507983; Mon, 12 Jul 2021 06:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626095507; cv=none; d=google.com; s=arc-20160816; b=F0vvoPit3+hoysO0LA54ZUethm33n74RZ1AToZtGlBzqI2CXJ0AGgOxd1FjHyovgeJ McFHMMxHgEGPsAHb3ZXZmT8zkJXN/0sM4etFJS0872koAKiuUaf9Mtf44ArDLddGgdPK Eio9Zia2MPtpasLpz+ig1yCxOn/E1olL1G6TLtAkJE6PLQxR0VxsxlAFemvR1TKCby+J +O+tHRxrKAT9mCLLxHipyyPNi9au2zq5UCIcFdM1TU12KxsZZXMP+iFZqi/einUXjW6w r0wfiA3L5dv994nuxLv0SRH11LMb5clsoQcc5j13LYaNa/kV3bCG4dzqxmzIVNs6xb+z Cpgw== 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=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=keKB8/2R4wj9i++KKWKTDH+BQc4uxEFgO1F1nY17/vdlaPrKpWXNM3jzUeFzjlmv/k JF0SY5zHhSm2fBUI3i71kUygBOzYTelPbLUi5AYXfcTgNgg5vFIGlSQfHVKW9WTSCU8s gE0yR9DRe4nt8M2KJODHX8k5uS+trA9E6J4zX86iW9JZXAIQPwQBvE1o+/jDc6ktskDk /x8G/e38Gd6BzWMyjM9+opk2L75NclNUfoBUSdme91mCY0dOd4LW8R8TjNv8ZPT3KTvL tm+bYHTltNvUEcXUw0eAcyzMARUkQy+m0+dIWBOYpNI6W4Sdr23ZV2tqXv6/n+aS0eGg 8TrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g6eSGdRn; 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 x18si19163553lji.571.2021.07.12.06.11.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:11: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=g6eSGdRn; 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]:37670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vis-0002Tz-PE for patch@linaro.org; Mon, 12 Jul 2021 09:11:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7Y-00059h-Vd for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:12 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7X-0002Od-4c for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:12 -0400 Received: by mail-wr1-x435.google.com with SMTP id f9so19715661wrq.11 for ; Mon, 12 Jul 2021 05:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=g6eSGdRnH26YIdfvJ8RtaYFaeP16HnC6iSr4BYVz0CKXAjnBmQ5aq2wbYzQ9xVvrXG Gfp/lPcI6t3jXWznlDlacjdRIVi1thQ/8Mec68MZ/1cdolDD2C1Q+U6fhTsk2usgPRt4 te/pTUqJbWlygpqv/BWt/leyWYBTJr8gbIYCaYwYS+uRW18as1LtXumGkh75LdkE/EYa ylwN5zKZBsxutM1BaN7205DFmdSAhBr+hdUWpcl+WRRPyR8rql4Z3scpzYHetTuycXvN QLmUtyhd4dEAM9icrFai3gMPDJJ9n9T8Z7rIdac3nxcrW1gS7jQAyt2xjuE0ghQjjZGy qmMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=l2/aeGRDseEjoyKXDsjMEmwpW5LacOkEbSlTIf0reu9aJVKrX0Ay9u7Vb9pKusjfc3 VvzwDCqROsbrptXIWHDWsUE0rxMbYUWaOwc1lPbZmdW5MJrH+fDPm34aVsDzd7aHDYx9 OlNgMJzX5nSkHwIabgZsd7do1am9mbyiLwDivGTpEXYpr+SDl59w9AYjr+DqTgwfPZek ADASabPq1qTi2NN1RLiFOUq2287v3hK+Js2OJOvi0uCDR9JBzd7A3Cah1kEb+d/luw2H JWc7BflFpceye0LmUCuDPouhzr5BDYTZ2DZqS3cPuuGvuaxAcFZhwJ4ofS435qc/BtBi p0Vw== X-Gm-Message-State: AOAM530r+Rvkto24taVmfvRwCweIrSexsSBhlOsmDAhG6lZ3RSAQZ6Ue 5m7QSUOBnB0RYygF9el3h/L6lg== X-Received: by 2002:adf:ed07:: with SMTP id a7mr26513208wro.70.1626093189971; Mon, 12 Jul 2021 05:33:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t9sm13777644wrq.92.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EBD361FFA9; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/40] tests/docker: expand centos8 package list Date: Mon, 12 Jul 2021 13:26:32 +0100 Message-Id: <20210712122653.11354-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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. [AJB: added centos-release-advanced-virtualization/epel-release] Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-12-berrange@redhat.com> Message-Id: <20210709143005.1554-20-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473103 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2906663jao; Mon, 12 Jul 2021 05:47:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3epDkP2bR8XHW/DPVHUwW0E9rJNb5sz9T+//8ykNogPPpkqZ1VN8X/ZszRREcEL1avars X-Received: by 2002:adf:f44d:: with SMTP id f13mr28234171wrp.353.1626094041432; Mon, 12 Jul 2021 05:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094041; cv=none; d=google.com; s=arc-20160816; b=GI/ZKyPLCmVfltN40ur1VZ0H8isl0kLCv1ygUbNZV27YUlexpElWE/Iv5stCvNOVog oHwAz5HIL1wgmu+vX3a+SyVqhPpgwdWilEWXdBmWDuumGEUlYAox37WyQ+gf9PTbv7RP 9judc6EP89ihV2gIuTePmo0B1B1fuJN32KNJvVh+Vuy55zC/ao84bBVYwzsE0O+prm0b mQSMapbWpbtvw8mavVywtGpRmSmDY8mfQKlLgMQAEUnKeLx64pfq3Vp2m77KZ4lWuGDA B3tSznbE7pmkuEnWynI2TQdTQdKXWSTeudsknxP6h/JcElQej6tlGNZcxwaZCJBttpH2 c7EQ== 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=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=UyrXiQ16dPBsTMym3wnIA8Ti18qRpTvcjF6lAx2x6bMqm0kscK5oLt9UukAhT7YUk3 mpvwZaAxWlarelVM1cyqfGhTWyyrem7rwA+6WA7MZNIO2RESYZY0q6G6WEsQAyB5PB09 2eiGI30WsLpJplmm0w3ifyyDGScJ9qmTXaozpptVgcJqhOPMT0Uc3p75CqGM5yhsyQ57 8A4lCQA6Nfq3r+DTzd8seDajFE/s9h+j0ingT0nnh5ZjTpUAEAOWA7ZKZxwOmF4bxOXC BZHxq9ne5QItRI7mf1Ykqbw2VaJHtzCU0cfp4bD0UzCk6Mj89C3OVKjkrb546hwh7qTQ NsvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V7I8i4qO; 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 u21si18876879wmj.135.2021.07.12.05.47.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:47:21 -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=V7I8i4qO; 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]:39680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vLE-0003hB-GZ for patch@linaro.org; Mon, 12 Jul 2021 08:47:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7S-0004zr-C4 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7P-0002M1-AN for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: by mail-wr1-x42b.google.com with SMTP id p8so25389352wrr.1 for ; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=V7I8i4qOEK4uS2xjB3G/A+sTdR0spA1Wi4WRNn7jp8I5mKFj33EO0od5q6Nx0/XpLl +/ya/cEe+CPFERMfztEDKIaPQ21EpD/STKJGlgjX9VmggWTrAaYJJnUfHJsAR1JNYhyE 9/jYstCWvG0SGEdaE2MymSYV/T5dwOqO0RYrAMvL7VAxeX7ixVP2o7ct/pK7X/3U966g MrVorCyHGDTXMZX4EPeQn88FHvQ/IYIfYz+xNWvjYA68QriLBGxEjpc2ZpQQCIGOBNHh 0Idw4gbz0MaidTRTrMIvpwNrAvqfUKcPufES1/bUiQKxCdUs+Neu+29g873Q5EoV6cEY d5FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=Bzp6/EWYgGOqsoc1Z8a/3ZYlfxZt6YCV1o2EXirqJh5z8tsDxprWnaQFEaxrvBwGxG CURFguNCrxUcLTyXPOHpgmDQ/IdJnUhV0bmJbZoGUfbbIF6DZFBD/N4M0tRDUvZ1if3L a4eTha3756N5SWZmEXJwuCA1X59wLy2+teSSec1TSyCDWL8jT681j5A7c7gxBffH4RAk Hds5FbobobwbCzSJCZUXMI0fPbwWOUnaV1GgnqlvwZijLXPC5PMtrHvxRJmH0WHL+bmx FB80+jAs4wo6m6uVoCohM/Ajz4JbeEEh99N5Ndd+dbGghkU7To8wlGrM58428GypCnK9 Ma/A== X-Gm-Message-State: AOAM531g9qXTIGJsYex4dMk36IFigr2gveDThuiefzXGWgIhwXo+h9PK w1ij0Q0AuIGJwG4XcuBdMAD04A== X-Received: by 2002:adf:e507:: with SMTP id j7mr58755669wrm.152.1626093182138; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o17sm11255883wms.32.2021.07.12.05.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DAA31FFAA; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 20/40] tests/docker: expand fedora package list Date: Mon, 12 Jul 2021 13:26:33 +0100 Message-Id: <20210712122653.11354-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-13-berrange@redhat.com> Message-Id: <20210709143005.1554-21-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:34 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: 473116 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2918650jao; Mon, 12 Jul 2021 06:02:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGmkbjQNf9dVGwnHLvwmaWhwnwkm10853aElkxwJ6wU3iDJAl0QvVqrDb2lrmzfbmaBXpk X-Received: by 2002:a17:906:71b:: with SMTP id y27mr17338163ejb.80.1626094961933; Mon, 12 Jul 2021 06:02:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094961; cv=none; d=google.com; s=arc-20160816; b=j3jScIfQjZH60yq7SuUHTmETCw1wYdjw78t2iZ6qrzIxoSX+X3SM+zrX2M3qlAYI7v qCOah9QbImDyLLQHLGe4YXUaFhM277T/akR5Zypq9oUq2DpbH17fBXkmQ2pnJKl04PfS z9FOzsqyqey1/94xED+645RLp6K+4I/pV+yS/NLjsf8aHaPmPUirb0UZyiYghp2aaJp3 mnbFg1Wb7XaS4BCpISZGPpC67yq5lnSG5dlDzE/iCU84v4F355QTgzdkl6exoRjIcfPU V7ZohoziwGgbHkT1awxQ0S6RFIdEb/r5PUucDyFrgtXgauD4qD4A/z1fnHR4ToP8KlDf 1K2A== 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=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=pDy1Cy7Sqd72I5537cq9qlVByqiS4jecxxjt8d11iRnfUbtSyZXUQ0CkoMWvFLR2pJ OW0aPC0eJXg1/aHLk8zn61yqjbxKuOCZUfmGilPE0TiI6Lslm+6IlrCN1xNuLgEem/Dn B96lLk7cOdAM8J0P28OqEzcOIREdLaGrID/t98ym25fSi9iwoXLgZp0eqtJ9AiycTx8b wBj7t/I5zF1/PVG3gUFxoMav7ijPDmDdxpfshmcHvmmCbafobVPFZi9EVL4aAEN63gGA RSqvDQPrhQ5Ns2+6oK7zsCJVbHFDYL9eqo9IqWuoKQDyeWnj/6LjCViC5W4m+gZlN55Q 6XPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I6LzuEip; 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 a9si16020439ejj.647.2021.07.12.06.02.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:02: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=I6LzuEip; 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]:50182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2va5-0007J5-07 for patch@linaro.org; Mon, 12 Jul 2021 09:02:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH5-0007gX-A9 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:03 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:56068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vH3-0006IS-HU for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:43:03 -0400 Received: by mail-wm1-x336.google.com with SMTP id j34so11311574wms.5 for ; Mon, 12 Jul 2021 05:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=I6LzuEipWvc2ywlXcDj3RNdyYHlF2heIwlQQUTe9an+4bOYz+OuTrNQDCOljaRbJEe JBqMfW4D0YQiOj7ZGdXzgiRoD1q5uQXkDNrg9+7xui35P7CtUBiQskOrPU3HLW1NFh/P U9eDgwaV3JkKVkXBe3x5Ykxnx9QB5VmikfstxspT+IqOlxqAGReioL/Y1ZwZjRVRHN5t B+rCIMMtnev/6uK1P/Jz/q/wQQ34WZWlpNc72y1qRhvdrXPV98b0rJ63fVdOUGg35L2w QoHNdCb+7XBnokci38O8vowLwspKMLQzbg3yZX51j8q+ohqcEf5/KGYGXxut/89P+QGA KMyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=m5vthjHtYLh3LGiIE+ti2r7nPci/L+Yn+hz2MSN9CNLLIOay/StJHHMoew4WpTEBcQ 5pV/xi6PZpb+DqV6F2mTPm8YnIj96f6eYmpqoWCNbI1EFqd+jvSWZ7778+Q5qvS2bY5k 9nowR6Cj5NY/Tu5I2f1vO9Kkks9BaF1UttjHl44ZhvW9P3iYjTmbgS45aI/9g1pL9lDK h5MoIFrh7MV4vfvLRznTacEjUj+T5YtODQnMTZtFh2vyoRzvXJORrzwoU8APbzo/kraL y/E233q8sk7w16g2QrVMI3ITR0LdLNSBFjX4BhPFM7NZat0zQd9Mtsr4hOsEkre0spew f6TA== X-Gm-Message-State: AOAM531S53430hK4Ymw141HFBXlS10rS/n0twR7wan7lgmuWs0yGSM4e XQ7pkLvb07BVlno4VpoC2fLgGg== X-Received: by 2002:a1c:4b0a:: with SMTP id y10mr25619550wma.178.1626093780179; Mon, 12 Jul 2021 05:43:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y6sm498853wma.48.2021.07.12.05.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 22FA11FFAB; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 21/40] tests/docker: expand ubuntu1804 package list Date: Mon, 12 Jul 2021 13:26:34 +0100 Message-Id: <20210712122653.11354-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-14-berrange@redhat.com> Message-Id: <20210709143005.1554-22-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473099 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2903795jao; Mon, 12 Jul 2021 05:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySaHn57mk4WY6qsFX4LoDxV0GoJ35tZc3Zump+E83gqn5JG9JbR3iEBdqZAgQyEoM3DdXa X-Received: by 2002:ac5:cbf6:: with SMTP id i22mr31460671vkn.8.1626093797602; Mon, 12 Jul 2021 05:43:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093797; cv=none; d=google.com; s=arc-20160816; b=DCIZG8qxzDwMbWxxPDmRyRtWIq8V7XDiIOVs1RPxFK2ma07nZFPhsv7S85Rqrpcp4X Ww3hNqnr94TtKEY9K4PDKJdKqwS7WObWodBN9Sh4YaoMs7wN85/+Z+z8CDXyBTZgF7fw hdipyJk1nUOIk78QGdlMTUQ95xWVdML/d7qtrnp1mrzlPxEhIrC7YKxMi+oapj/zMnPG CPByKSniNGbpq237B4hKeluwz2OHwkweNUty8gv9/BbJAOVPM3ZMMdaffBKAoA784YvH YcV6a28sXNf97IUcqxT5UJ1GqBeMzh5LUOmB9LL3c0ewA6lwf+zatqtijZNcyKM3Vd3Z E4GA== 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=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=qfIO1/JtglqAep97c/FKr7WL8ph72sNaZrmXUfQUSurRLc8FkdY7OU3Az4IJPHHaPz W0RWQhxq4QZQhDJlkfkQcAa3ArtFQ03hQx/RPFsbpmvDZ4gutib7h4jQCuinhSvcivm1 Fqsl1uM9xk/qJNLiywv7sZQSsK30xlXENczAg84UvnrsrQIOIRv06wXOBQDOgWvTfFFi U1zoY5ngDVvllibZrbSYol6484+XYWoH8rKjU1xua8odqYk6sfoQ1xWU9rOgMa0tSrVt 1n6+D4klD6lSqLilvyDmSTgJUekePQcpmlxekME3AVk43qE/fXg3YOpOh/edneE7g9Tg F11A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZLxw9izs; 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 h12si1564498vsf.290.2021.07.12.05.43.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:43: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=ZLxw9izs; 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]:59134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vHJ-00065B-05 for patch@linaro.org; Mon, 12 Jul 2021 08:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7N-0004pS-VY for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:55234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0002Ke-8c for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: by mail-wm1-x333.google.com with SMTP id k32so8086530wms.4 for ; Mon, 12 Jul 2021 05:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=ZLxw9izsxl2TDQGGGILtMNIOzeCDeiVVrFOZw13lzbU7ONbF04fLX8KOpUSow7pcVC 8eDEnBS8yOwWfsnhyR5Zbvy93v473VN09XAEIELeTXLZQeK3NJZj91KlsofcLDn+f+IW VRUQLdspsjhddSJ8TOxQGxNAKbjGersP6bfFUE569IFEKHzvLXJ2RII/uzkrC5UNELJ9 ++fno+VfM8qDo9M8A+JoU/6lQ861PuejLlUYpTRWhChuebVqqwUfZV6NB5hFY+b5PXNL yxWBlrnx+E9SmUB1XdzCScVeMqHbhLnVQVEPQ4VR4bTyJvgosKBd/4cTuwLLwjl/dG6O zvfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=DP972jh3ctMdgx3DNaXG2V7DS6iV8aFUoUrd8/tMhkIa8jq2IyNuuV98jZi7gxNflM RPP0svqithrKdNMHLy/ZhPa/eH5S61IyQG2fAhQRqjY5XRHOnvRmEqMrbHwsIDfNo7iX GJNhaYvLZlaTEg5IeJMpNgRQhh6RFTVPo5j597o7ENlN1fqN+Y0Dsr9WSSoY9IEjFsE4 VbNQ6ZjS7dVqvaZpEzxS9pNsrvfW8Twt6xh0himGiDUgPZ5YC4ocfOmzh1+6heqVsOrk g5baQYI05bcKE8V7dvCB49YT2yWydnIfFja20Fd97jxCESIqGWdhxhg61j728D8x6FEc 2KOQ== X-Gm-Message-State: AOAM5332ycx+w9ITkEUvGTy4S8Ds2mBSN5kCDWfEra/tSCuEILQWCDMh jL6M8L2qVInRUdQxv4nuu6dBjk4z4IkJmw== X-Received: by 2002:a05:600c:2f17:: with SMTP id r23mr4755081wmn.39.1626093178962; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm14570769wrv.64.2021.07.12.05.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 392701FFAC; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 22/40] tests/docker: expand ubuntu2004 package list Date: Mon, 12 Jul 2021 13:26:35 +0100 Message-Id: <20210712122653.11354-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-15-berrange@redhat.com> Message-Id: <20210709143005.1554-23-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473111 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2911995jao; Mon, 12 Jul 2021 05:55:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGlmAGuENq8PbrnJLYrDmFCc4ldbm2zJ5v+q5HFd+CnsYJzzNedacLhcashtjmh6cHzoN+ X-Received: by 2002:a67:fc0f:: with SMTP id o15mr46533061vsq.36.1626094500209; Mon, 12 Jul 2021 05:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094500; cv=none; d=google.com; s=arc-20160816; b=HSO2Is7TUW76rJbeKvktaCMycwaElII+M+YtSDyzbPv0qbhkQPBRm0GVD+E/Wus/Bu QH4AYIu4HYws1pBGA4R/G7ZyOWXDl3/U7yDHGCFe6eiUTjzyNlMi0QfpmNqcuaakgS62 TtlNa43OCbXmrBTFnXUDo97eE/AQClKbjlbp0uMkMo3NawWFf/egfefWNScSPPOrTEFZ AO1B2Hd35VDviUHWsPxw1psotOnVMMH62AN+S0YSBwWAnfdhtFBjNri7IVGryzZsT8yE CnbxjLoRmUT85Ruqo2NSocLMT9yUzqVudX4xbEZgsM0+tEMbXaWXJnxa/lpG25e+SeCJ ty8g== 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=8Kc/AtnrUFUSMDCa/D5pKIGcs4TC9hfXWUXk1KzQyfo=; b=D1v7WfHxRRUF14F9ADDmbDZH1xnKY6nOOstg6arQ1z3mS2CeTNHW5cniJNsAmI6bDm iYo7R3ApRV4jfIWirBU4JgVn7GOklyarsOa4UkgFO8B7Yz2gz5a85eWUoydBnqyFjQRi Bd1nYihDQHFlk31g4O+hhTQPvwwkftpZv4vyPkfoUTv5TEzy0P/uiT6ndCKtcdKcNUuA P3JSa+sXXmAS3drL+KzM20jsRVrgY8WwbibDvQ6NxWQ/5SwBSe5MXG+Xk1dC9AYjsPfF 2c8hZNz6Lr7NuBEUrAd9uzZCT/n6CcdjEj1xpGuQ/DZJucDNY8BhEGUrbsOTnp6SPuqN vv8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cW+llawb; 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 g18si12004851vsq.185.2021.07.12.05.55.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:55:00 -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=cW+llawb; 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]:36624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vSd-0004RU-CO for patch@linaro.org; Mon, 12 Jul 2021 08:54:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0004ik-4F for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:57 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7H-0002JK-Hu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: by mail-wr1-x435.google.com with SMTP id p8so25388809wrr.1 for ; Mon, 12 Jul 2021 05:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Kc/AtnrUFUSMDCa/D5pKIGcs4TC9hfXWUXk1KzQyfo=; b=cW+llawbtEl0xG2YlpH+kTjbfnezk6wsHu7LmTDH+XlwXNqDISZxq2urRN94HjYp/3 0sH2xKRK8u/EMg4M7pDAXbuDKSIe9vYMS9iTi1r47f448vOk/HUwyb5Sn33uJcyQfl1G xUja1ZnwBFcTuA4oiCmfDw88Dq4HwuUMY0MR+N3tBl24jGZuFTS6MX+h65WdEmcM+3vK YDkIp+65EFkurTQSTplwuI4tP2wWNzMGon1up9w9OleP9M9keOwJid5U4/kkxwAjrzfQ LkwxK8sn41M6ZA7269697RBIwDJetCFNNOYQ3bqOixQLTGFDp6V36dxQtatIrj/m1t54 azuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Kc/AtnrUFUSMDCa/D5pKIGcs4TC9hfXWUXk1KzQyfo=; b=ltEMGWsKNtjvG+h6qu6/tAKkCnvpkst9CXk2/JMBx69lJj6cj8S+ib1LyyF2VJ+C9l TB5KTCx+GxdvzMDHZ86nwhajVOZmsINUZwSp2LoXuksqMsCYy1Ecq12NG1IXTH7N4o2X urefYD6Q0FzrvLa9x0SA/SHpTeaq7Gvc9kxYrfBes2kxJjtAX3RKcXzKIdEMlg4XMSir JsqIKHaENLj97Dn3TC6ktxBGaySWD6v2K/nwm29rK1nEdc2DkAQi7vIZguXDKYD5BLfz YWe2qGw9P8c4qcZspdHgkZNFCXBEizJJGhKk7BzcJcD5WRIZ/L0jeIZp8wOHCYEvIlBu H0aw== X-Gm-Message-State: AOAM531UA3D+DCHQL+gpqdJVvBZ1g7Eftqa3m3Ak4g8H6X0lADveZaUq fIjAW5P4IAdjbjsga98Qs+VvPg== X-Received: by 2002:a5d:408a:: with SMTP id o10mr19915613wrp.272.1626093174229; Mon, 12 Jul 2021 05:32:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n7sm19225626wmq.37.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5132A1FF7E; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 23/40] tests/docker: expand opensuse-leap package list Date: Mon, 12 Jul 2021 13:26:36 +0100 Message-Id: <20210712122653.11354-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-16-berrange@redhat.com> Message-Id: <20210709143005.1554-24-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473108 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2910397jao; Mon, 12 Jul 2021 05:52:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQ1EAu0CY6z8Y2BhDUl75v3IgVUYY/rK7j83g1ydf+1rHPaDaxrjeTsbN/u6Sm3U+vAYz/ X-Received: by 2002:ab0:2391:: with SMTP id b17mr47810980uan.28.1626094368700; Mon, 12 Jul 2021 05:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094368; cv=none; d=google.com; s=arc-20160816; b=Fp+zJDtEYhi4Z6OdPwHs0CgbFw1/piTKh5bpCS/gn84m15q8V2MCdEgiXtWDoc2x7m x4WYcnK8v6kc/dzKxj5EwDZezb6OBjEE+SAk7PPIPikeW0YDdWIxEhAqfRCBVOIaN89b ZSy1k3NDRZK8YuAs/1pcjcO41a8iQTkn4G5o5wYPa74jOqN+2kI3V7SKw/3+XZW56uP7 vk2Y1GfR73iyeW5BsdsoCoFVR4of0gI35NadBUfBPghZ4lG+Quc8YjQ+uPT88QqaaM9u nXAp5CtFbK6TqcKi+g39tftVrjNy/IYnFuyNNJ2qIRrAn9BSEF9of9HSnxOBOIdlbF3k lzGA== 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=QQsPUcmmvCXpidPMt9LFIQWrpqM/fEvzdVYo5rHypHA=; b=jWixDQeYYgijuq0HEBETLm6Fb/nG5adaIXC5ptsgJG2n6MPTBH9lSL3oVL4a2Tye1q SL+MeIWIBbKz9FmNFp1yPPaBohZXLeaD5BQru6fCeTKUeS5DzZodB5fcWJk29ToQn/C1 3wd8GNY1RyCFa/rPBh4irfCdL7k/BIVl3KAZvRu+Vi2eiYCmSb5sIxVuVaawE2cMOKXh CqphUxVs7Qv9WmTwkFEVrisrwqWEKMccW0wznDLAdUEh73XR9jXP1WZ9sV6pMX3IdJoI Cp67XcGFC5f0HiG/R3MiFM9gLVwboYwneYTLs8uRS1TL92Ki8ARhRhGtN8gJeYCIJzDd FblQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CD3iw/9O"; 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 m36si12163050uad.50.2021.07.12.05.52.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:52:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CD3iw/9O"; 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]:56098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vQW-0006lM-2F for patch@linaro.org; Mon, 12 Jul 2021 08:52:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0004bv-A1 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7E-0002IH-HC for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:54 -0400 Received: by mail-wm1-x329.google.com with SMTP id w13so11300971wmc.3 for ; Mon, 12 Jul 2021 05:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QQsPUcmmvCXpidPMt9LFIQWrpqM/fEvzdVYo5rHypHA=; b=CD3iw/9Oi/7wgkSHFA+2iBd4bfx6W0J2pVs5SFN8uUliToVq2TXWr5oWgHpGNFcbx4 Zh/doZPz8JUvYAR2ud0G1gGNq1boh+dgtcUlQ1Rca441Uvrsztfk26jwtbY4MaarBoPG shpQBZRA9l4E2zR1jn5q33/+2xomM2u5a2t7eej8m5X7uWVoQm4kZZo9HVx4xmGw6Djd a+y1y5qchxFx7SlXLY6v8Qpl1U34sdM7vlF+YTmuYQZ4CEft8gga0mR+bkX+hNW3PEoD QH6MU1SPrTUtUPHdiOWhNlC8CR3rHQvxwces0s79lQXWEofdN85N38Zbb0PS3jg3E0hP 8NAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QQsPUcmmvCXpidPMt9LFIQWrpqM/fEvzdVYo5rHypHA=; b=DhKOZljM0NPSi/ilBsylFwyrzm73ASEz5j2pcmbl+SPWTBk4IlNNUC3xmq3jLbcUQi X24D2FDrLhl47o/M9HnXDq++eaWfzvMfWKjUyX/bzZlpoh65CIycnfeCxUvfhUzZK+7F CIfSnSt69J0Cdo90QICYpvoovawdjHtfQo/z6ZNh/dN2JBKhgR4EkcBhjGkPcJhJuP0L OsFTj358bXU/RksY8ghfgLAUpAt18RNzIN+Hyz/dvG7FvYAtewb3XQCrRC/75AC43hLT Qi3PeZCtcVceAhNKeB7+rclisuaVJhjyW4uvD1mCqLtIKEES+xD8G9E374tBrNulHSLr HRoA== X-Gm-Message-State: AOAM533ZLWFd3oROi02uF03MJBs+F+AdFSDY9MdsWIu7PSWS2Lm8MvT9 8UqlGgAbN7/At8EQgjO01GSEBQ== X-Received: by 2002:a7b:cf29:: with SMTP id m9mr7059726wmg.13.1626093171192; Mon, 12 Jul 2021 05:32:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j12sm14775142wrq.83.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 68B9B1FFAE; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/40] tests/vm: update NetBSD to 9.2 Date: Mon, 12 Jul 2021 13:26:37 +0100 Message-Id: <20210712122653.11354-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Kamil Rytarowski , Reinoud Zandijk , Gerd Hoffmann , Ryo ONODERA , =?utf-8?q?Alex_Benn=C3=A9e?= , Brad Smith Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Brad Smith tests/vm: update NetBSD to 9.2 Signed-off-by: Brad Smith Signed-off-by: Alex Bennée Tested-by: Gerd Hoffmann Reviewed-by: Wainer dos Santos Moschetta Acked-by: Philippe Mathieu-Daudé Message-Id: Message-Id: <20210709143005.1554-25-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473101 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2904980jao; Mon, 12 Jul 2021 05:45:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwswPVi4Pa/2JzCVStmjA2I2XcQsNWvWmc5otLn2MPanxu1m3CRGJlkj1sEQhw/HCC+FjVa X-Received: by 2002:a5d:47ac:: with SMTP id 12mr6822761wrb.76.1626093903690; Mon, 12 Jul 2021 05:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093903; cv=none; d=google.com; s=arc-20160816; b=HDIUR7CMvYuGxC0yIiGIX49+A5TjJk/vk8/thFAC6tESAQW3qzpOC2qTFTDxwJ6rX/ 4MIGcYf+tVwf6Ac+KjGJ3Cd0UFSDONHol/yBdymigvIWQdk2G7iyhg+MAWxFNPPo4U3h Z9K4C/mSdmPdyX1XPFh2fYVwQ/bz4KE0Bs+lRenqPAMckCHLHyaYM55eIwFdigJz7VRD IboeidneZG286Byv2QR3gVMHH+/BXZgWxlcCG0JX5RexO3kE7RW4SHmhci+soqigIGfK WnBE4EKpd0m7n5lf7RG7tymZalgJLSpN3j1tyfm2+v8uUiGbb1CwJGbAqYLTarq/UB41 GB7w== 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=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=ivywJC73CjPHB8h9KL3mpMyyGFvB7N7/VyWJLuF4q6dItL3wQVeYxdS0yMpFLwhsPj rvO57EvFBgXG1m64gS8sB5QvnxZ8POGuqeHirv2ttxIFgYdkJJXpxejM6MFGby4JdcYg lFIFohXflTnuYgc9H3JY0VX5Z0rRJpDK/qn2gmd+cti27+msUUsXsEHJEeq+R2Ga8yU7 rBN4LjlyizcVeCY3N/X+2G1mArl3r0r7jlgYhFgbOyLzQ3KJT/JCvvU8WcN74hfjXrMq nxjRpkw4SGKMBHN5UG0mYw7B6A6lxffuIZry+6xzI+RxtoyNHaV6ijCd9qu5VOYnMJ+3 YFYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Le6DTuwL; 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 95si19832638wrm.394.2021.07.12.05.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Le6DTuwL; 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]:35450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vJ0-0000hi-PB for patch@linaro.org; Mon, 12 Jul 2021 08:45:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vH0-0007Pt-IV for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGy-0006GM-S8 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:58 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f17so25434084wrt.6 for ; Mon, 12 Jul 2021 05:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=Le6DTuwL8LYqBzAkOnz/5DpTsoLqG995HvVJdmpsAtYi29w550wwwAoT/vXGUJEIyP fK6kAho4WyHJAlb8xXGJVslBPgbBPz/8j7hcpn7RMZpbdz1ADmrcKQTyKCE5duViELoM V/R5WdtTyKqRMVtk6eF6bhG+LbWX4o4yze50Ezb5UDQnhsQe9s/XUkDmKwChB+FsTr5Y mLLOeLSVccjB/GLyVYGPIV8Bw09qjvWma9ps5yFNq9QzDtvjKdPxmtfyMx0w1+w1Gmku MjaqvfGa+ewrLYcMwZR4yAVHvJZp1KxASJOaI5wEwIJqLv6UT9uXVmhs7OQx0Fr6scZ4 iMDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=unGPfTy2hj9dtYjmlItckCUqiwB7iu5rzg4W/M22gaTQSxQPaDF3Lw93ZFNKOIhjk1 qpH6Xuy1Q1d9wOtM1PZoBz6tUhy7DsdA5x557p0wd8RdYVxXL1q0TZz3qApqQaNQfdxL wUIoITpTNRPkd7YAI5QXa6R1mNbmUbyI/SYqUjGJxkcBH1tkW4T7k5Ex3Pu7BAejJQaK W12WEvLRJKX+8r/Bf0XGt3eg3KpVD/22y8NHy1X3zB1EdNR+yWfwwAZuEaa05b5djz/Q 3C6+rh+553hxuskwREalwoX9u1NYths5XoF04f+2BGDMUu3C0T128IsVixsVYBxegaei NwxQ== X-Gm-Message-State: AOAM532o7wbuVJpj8ZhLXAI3vJIDP/OhOzjlOfwlFB7ojitxmHsFa7mC fuVKd1kE7BpD8giOth1qoIXeXQ== X-Received: by 2002:adf:82f1:: with SMTP id 104mr58743960wrc.306.1626093775625; Mon, 12 Jul 2021 05:42:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r9sm12685546wmq.25.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 81E861FFAF; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 25/40] tests/vm: update openbsd to release 6.9 Date: Mon, 12 Jul 2021 13:26:38 +0100 Message-Id: <20210712122653.11354-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= , 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 Signed-off-by: Alex Bennée Tested-by: Gerd Hoffmann Acked-by: Philippe Mathieu-Daudé Message-Id: Message-Id: <20210709143005.1554-26-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26: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: 473097 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2903128jao; Mon, 12 Jul 2021 05:42:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkfeatAa6Wf1Z+F0lTiaEzEisV3rdAVELWzwQNw4AWC16GQQKIZ+FQJArix6adZGJYpZQs X-Received: by 2002:a17:907:1c01:: with SMTP id nc1mr50977102ejc.504.1626093748823; Mon, 12 Jul 2021 05:42:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093748; cv=none; d=google.com; s=arc-20160816; b=wGv4kUfVbybKwQCtSSSWwvPlCy8hQ4/E0nPxYdYIvNj5hIbuGoLvnSepz+PpoQAYsC JOTf7X3f0Lu0H7d5WIn/v5fHrWwO2jy2QrJXL24PxCgsPItkn/3Bp/QKksZYoF85+zLw TE7yJC0rruoopvIn40DUjWjxag4m8TQ1lTdtpvsYgM/1XK9J4nKUiTiGKahScycssSgN FhCmACRAaFSFYeCiMJsL1OZXZ1CXdsIM6ZOLYyvoQXWfkmm9PsumbeA/D1x2vAZGr0UQ kJNiQ1nsjJZLiXRh59DCq7ek60xMbnMkoVEpy7Jt+dHI+ErbB4Mg8wh1QjHTGbm8SWWg 4wZw== 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=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=gXo5igQgFuWzdQyjtN/M7ROy3E+tzlPyAU6+qjTfpkf4ZW4H9XYZ0u+vSPZYQHjAIJ 7pwX2AP5ZeRpFQvsHJx8bZQQucWuVwElp5QNMKlRZ1R1YuPaKoerBfEH9jRWOsMvAtxb ihVJyQ/P9bbD2GSYTkUHQVGwsiX0ppxN5FgsMmj9aoj8N/LyApHRUGa0YOjbjzjtPdB3 tvvxV13QMEUOKrZRLpZqxUQtXf3wl93zZrT4mUaOPS7smUUqMhFdYnRSzDRzu8upXuwi oW9u2cXOtOocxjIAgmpHk31HVSPxKBxANzI30JLkOaiSfQ8595Qkkq8+b6olC6yOx3Io E6Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u6HTZ5YE; 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 my47si12036612ejc.645.2021.07.12.05.42.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:42:28 -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=u6HTZ5YE; 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]:54448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vGV-0002jL-LZ for patch@linaro.org; Mon, 12 Jul 2021 08:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7I-0004hQ-On for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7G-0002Im-Lt for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:56 -0400 Received: by mail-wr1-x430.google.com with SMTP id d2so25437909wrn.0 for ; Mon, 12 Jul 2021 05:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=u6HTZ5YExTncGSR+Zpwn6zpVJmQy38nueXIkpCEA76swjBzDJBEp1bS6/knghXdO9J 3FFb7eP26acStmSIgygKXQHoAEcbddvnK0EKclbR/z0VDMRJXcGOAVtEjbnWrj9/Mg3x kFqPzAPEXApQXa+OaFsHmm+Esbn1N/YprCB1VzsaRj74QeUcJsA2+5iUUug+ZegUwOFi CMOHuvuiQBPrwj38KZ53ZPmbtdnHY0YzlWdMgIWrPp1EIFPGzckXPiBU+RPO1k/mkd+Q fFraGK22psvkS2n974iBC1JZcamEIZ/Lt/NpXxdCeamAi07ou8rBKPq+33uDgeFnqVbA dd7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=m5ZzicgwsuOArFj1WHvurgrxFqruKjT0JQ5jv7sQnCJM9XRtMKqokZMIIoM/5OGk2b Tsqybv0O6J6ly6pFjJF+kqcDpAnMoUY287wE1xuiGda5/RDlt+eCjbBpt5EgN0phN708 wbsZwCyL3CBXYGiNo2DjZ9fIQFjLlzguNMC/8SwE6r3fvaMCX8HeEWLBpAx7/Qvf+GwJ tMsNdnK2Gd8Rlp2IIp114s2Ouxtg0a685BC2yi1X2qbOtH5rkhpGeAl2w38tTQpxSYrT oEv0waY3DX/g/47CBIKYTJjvzGzJlEaKbqSn/NbLvygZmRA9xeFL9wiunj6IS73dRtuu nsbA== X-Gm-Message-State: AOAM532FtM70fLMW5zo+2gxxryDuaEeWV4DDaXvoIiU7IITs7neWCUiv XWrQ3INHuxTEXdiU5jbaWp+SAA== X-Received: by 2002:adf:c44d:: with SMTP id a13mr40391139wrg.65.1626093173327; Mon, 12 Jul 2021 05:32:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v2sm4343790wro.48.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9C0DD1FFB1; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 26/40] tests/tcg: make test-mmap a little less aggressive Date: Mon, 12 Jul 2021 13:26:39 +0100 Message-Id: <20210712122653.11354-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Taylor Simpson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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. While we are at it clean-up the white space and style issues from the legacy code. As we no longer do quite so much needless memory access we can also remove the hexagon timeout hack. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Taylor Simpson Message-Id: <20210709143005.1554-27-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c index 11d0e777b1..96257f8ebe 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -49,64 +49,62 @@ size_t test_fsize; void check_aligned_anonymous_unfixed_mmaps(void) { - void *p1; - void *p2; - void *p3; - void *p4; - void *p5; - uintptr_t p; - int i; - - fprintf(stdout, "%s", __func__); - for (i = 0; i < 0x1fff; i++) - { - size_t len; - - len = pagesize + (pagesize * i & 7); - p1 = mmap(NULL, len, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p2 = mmap(NULL, len, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p3 = mmap(NULL, len, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p4 = mmap(NULL, len, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - p5 = mmap(NULL, len, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - /* Make sure we get pages aligned with the pagesize. The - target expects this. */ - fail_unless (p1 != MAP_FAILED); - fail_unless (p2 != MAP_FAILED); - fail_unless (p3 != MAP_FAILED); - fail_unless (p4 != MAP_FAILED); - fail_unless (p5 != MAP_FAILED); - p = (uintptr_t) p1; - D(printf ("p=%x\n", p)); - fail_unless ((p & pagemask) == 0); - p = (uintptr_t) p2; - fail_unless ((p & pagemask) == 0); - p = (uintptr_t) p3; - fail_unless ((p & pagemask) == 0); - p = (uintptr_t) p4; - fail_unless ((p & pagemask) == 0); - p = (uintptr_t) p5; - fail_unless ((p & pagemask) == 0); - - /* Make sure we can read from the entire area. */ - memcpy (dummybuf, p1, pagesize); - memcpy (dummybuf, p2, pagesize); - memcpy (dummybuf, p3, pagesize); - memcpy (dummybuf, p4, pagesize); - memcpy (dummybuf, p5, pagesize); - - munmap (p1, len); - munmap (p2, len); - munmap (p3, len); - munmap (p4, len); - munmap (p5, len); - } - fprintf(stdout, " passed\n"); + void *p1; + void *p2; + void *p3; + void *p4; + void *p5; + uintptr_t p; + int i; + fprintf(stdout, "%s", __func__); + for (i = 0; i < 8; i++) { + size_t len; + len = pagesize + (pagesize * i); + p1 = mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p2 = mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p3 = mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p4 = mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + p5 = mmap(NULL, len, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + /* + * Make sure we get pages aligned with the pagesize. The + * target expects this. + */ + fail_unless(p1 != MAP_FAILED); + fail_unless(p2 != MAP_FAILED); + fail_unless(p3 != MAP_FAILED); + fail_unless(p4 != MAP_FAILED); + fail_unless(p5 != MAP_FAILED); + p = (uintptr_t) p1; + D(printf("p=%x\n", p)); + fail_unless((p & pagemask) == 0); + p = (uintptr_t) p2; + fail_unless((p & pagemask) == 0); + p = (uintptr_t) p3; + fail_unless((p & pagemask) == 0); + p = (uintptr_t) p4; + fail_unless((p & pagemask) == 0); + p = (uintptr_t) p5; + fail_unless((p & pagemask) == 0); + + /* Make sure we can read from the entire area. */ + memcpy(dummybuf, p1, pagesize); + memcpy(dummybuf, p2, pagesize); + memcpy(dummybuf, p3, pagesize); + memcpy(dummybuf, p4, pagesize); + memcpy(dummybuf, p5, pagesize); + munmap(p1, len); + munmap(p2, len); + munmap(p3, len); + munmap(p4, len); + munmap(p5, len); + } + fprintf(stdout, " passed\n"); } void check_large_anonymous_unfixed_mmap(void) @@ -135,52 +133,54 @@ void check_large_anonymous_unfixed_mmap(void) void check_aligned_anonymous_unfixed_colliding_mmaps(void) { - char *p1; - char *p2; - char *p3; - uintptr_t p; - int i; - - fprintf(stdout, "%s", __func__); - for (i = 0; i < 0x2fff; i++) - { - int nlen; - p1 = mmap(NULL, pagesize, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p1 != MAP_FAILED); - p = (uintptr_t) p1; - fail_unless ((p & pagemask) == 0); - memcpy (dummybuf, p1, pagesize); - - p2 = mmap(NULL, pagesize, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p2 != MAP_FAILED); - p = (uintptr_t) p2; - fail_unless ((p & pagemask) == 0); - memcpy (dummybuf, p2, pagesize); - - - munmap (p1, pagesize); - nlen = pagesize * 8; - p3 = mmap(NULL, nlen, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fail_unless (p3 != MAP_FAILED); - - /* Check if the mmaped areas collide. */ - if (p3 < p2 - && (p3 + nlen) > p2) - fail_unless (0); - - memcpy (dummybuf, p3, pagesize); - - /* Make sure we get pages aligned with the pagesize. The - target expects this. */ - p = (uintptr_t) p3; - fail_unless ((p & pagemask) == 0); - munmap (p2, pagesize); - munmap (p3, nlen); - } - fprintf(stdout, " passed\n"); + char *p1; + char *p2; + char *p3; + uintptr_t p; + int i; + + fprintf(stdout, "%s", __func__); + for (i = 0; i < 2; i++) { + int nlen; + p1 = mmap(NULL, pagesize, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p1 != MAP_FAILED); + p = (uintptr_t) p1; + fail_unless((p & pagemask) == 0); + memcpy(dummybuf, p1, pagesize); + + p2 = mmap(NULL, pagesize, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p2 != MAP_FAILED); + p = (uintptr_t) p2; + fail_unless((p & pagemask) == 0); + memcpy(dummybuf, p2, pagesize); + + + munmap(p1, pagesize); + nlen = pagesize * 8; + p3 = mmap(NULL, nlen, PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + fail_unless(p3 != MAP_FAILED); + + /* Check if the mmaped areas collide. */ + if (p3 < p2 + && (p3 + nlen) > p2) { + fail_unless(0); + } + + memcpy(dummybuf, p3, pagesize); + + /* + * Make sure we get pages aligned with the pagesize. The + * target expects this. + */ + p = (uintptr_t) p3; + fail_unless((p & pagemask) == 0); + munmap(p2, pagesize); + munmap(p3, nlen); + } + fprintf(stdout, " passed\n"); } void check_aligned_anonymous_fixed_mmaps(void) diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile.target index 0992787d50..050cd61c1a 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -18,15 +18,6 @@ # Hexagon doesn't support gdb, so skip the EXTRA_RUNS EXTRA_RUNS = -# Hexagon has 64K pages, so increase the timeout to keep -# test-mmap from timing out -ifeq ($(CONFIG_DEBUG_TCG),y) -TIMEOUT=800 -else -TIMEOUT=500 -endif - - CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal CFLAGS += -fno-unroll-loops From patchwork Mon Jul 12 12:26: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: 473102 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2906358jao; Mon, 12 Jul 2021 05:46:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJqnJ02PKQOry8LPusdG4no4DgZKYdv6LWLf4pNsx+z0N113UDTGt+uKDmClO2MqbdcHlZ X-Received: by 2002:a5d:6482:: with SMTP id o2mr2162447wri.367.1626094016085; Mon, 12 Jul 2021 05:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094016; cv=none; d=google.com; s=arc-20160816; b=p4zVDCwhhl2UT1QD3Pyfp6tko6KhaWAtGMtJW6e02m5h1ysKbLZo1ghs9UqJTRn72f zztAvemlbY0gGvtGALAq1VZq7e6Zj9ishcxmaaEI+JdvlMBKO5JIS0gX/sPCMS32Z6T4 mMlyzmQ8PChKWZUyNoJyIYMiswaJ2fIC08KJwaQmps6ym2cCiM+l67Mz0EvW6s+9NJd/ gtEBG6ULuGHeGScnxV0dBosDZTq04rRTiVimms/PqgQ2hje+l6harfC4JgqbT6sht4qY qIvAgHZbt8xlAu8aKtLjjgM9itf329Glir5axyao4HiUUcZ4K5cTghM/T+FdiUBzCYnV prMg== 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=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=KDU1dA84ST4Z9cAZHhMtgn0r/KKxhR8Y4SfDCrAkFktIShpY165mX90EoVM1kKzBAE XApuYjvHMPLBb0o2Ta6x4S0SWHfiDA4SEKyI99U9vEo58hlkW7YclIF6uJ5Qh5ELWEMn WIdQEIDFUyvA7T5pNfGCxdQo5zSUa0EE42rfyHuvSTv89dXv/tu+75SqVxORVOJf8azL F6bDsLzCaH2wFGnsOy3T5pNoF3VskzNf//76wCyZLQMmD71I4thznrFd4XjXbg3g/trZ shWCcgGPzLceWfPxwYsMd4qxNNTLkhrQW8zYMjRznS3UAd6Xmfzrz/i1Dx6fN2SynMkN CFyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="xIr/u/hD"; 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 m9si13766868wml.209.2021.07.12.05.46.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:46: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="xIr/u/hD"; 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]:38618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vKp-0002yp-3P for patch@linaro.org; Mon, 12 Jul 2021 08:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1t-0004RQ-Op for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:22 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0008E5-8F for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:21 -0400 Received: by mail-wr1-x436.google.com with SMTP id i94so25337439wri.4 for ; Mon, 12 Jul 2021 05:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=xIr/u/hDJxP5B/JgezcRz07IiklTl7wtn7qrIbP6dMJD9cgT2a0j2k/lXTVij1wMzP BXj07fYG8I1WX4i3YCvIzp3msymoYCprBd4K67pkUyszkfl1QRqR7X1wLbsUg3Gg6nJi ZbY9I7MBzVdJBkxxxRRGZDEA1KnfVZxTz+LvN1aq7AJb/tl9NMIKz71drvtJiMycm3Xc +6JReQgenl/HtTZ9Sjygn+eZRFPni+WMK7Hoa625bYT6/PHNuwHIiCzsU1Eo37Qtc7OQ 7+H0aFPZvHoaB00Fo2WksP10VTM4pJffro+f/JItop/AY/RtbLcySQmjWaTgEq3T0CrD LI/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=Ijn7Min1VuAvbpg+QziLzniqt3GXT87NnsxwS+ZaC4S0qRQL1SkqFcM8KNxzmgLnsG sOuj5KCXViMtZdtzoAbzP6zwrR1A7rANL6QCHZS6A4ehHWS2em9EaqXbyMtDd/1tq/ZB jXccFXh9YR3DZR0BnB54dqPXWp0wKftQa5XtoRusGxmKaFijU7m9F3Vi4IUvk1mMfvIb GzYzibN5mzXoU+nseGUwekFc0nu47c9/nJwxlEEOKdhvhmaEjXKkqTF6xSXm29pW7wxs e+DOsUXyeUbEUb97of/WsPgJtEigPTlLGwbc9rSEvLwBf1EfWWuVR/qCXjI4FHB34ymd ULDw== X-Gm-Message-State: AOAM533dW3s4bTIDjiE00zI6h0UL2aivaANbV6eHpo0GVoQW/gk6gYfY zeK74mfOQhKG/gwOr7Zj0RuBuQ== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr22363333wrx.114.1626092838547; Mon, 12 Jul 2021 05:27:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm14587472wru.6.2021.07.12.05.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B4EB21FFB3; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Date: Mon, 12 Jul 2021 13:26:40 +0100 Message-Id: <20210712122653.11354-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , qemu-devel@nongnu.org, Paolo Bonzini , Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-28-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h index b36def27d7..0f59226727 100644 --- a/include/qemu/plugin-memory.h +++ b/include/qemu/plugin-memory.h @@ -18,7 +18,7 @@ struct qemu_plugin_hwaddr { hwaddr offset; } io; struct { - uint64_t hostaddr; + void *hostaddr; } ram; } v; }; diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index b6d5fc6326..b4e15b6aad 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1728,7 +1728,7 @@ bool tlb_plugin_lookup(CPUState *cpu, target_ulong addr, int mmu_idx, data->v.io.offset = (iotlbentry->addr & TARGET_PAGE_MASK) + addr; } else { data->is_io = false; - data->v.ram.hostaddr = addr + tlbe->addend; + data->v.ram.hostaddr = (void *)((uintptr_t)addr + tlbe->addend); } return true; } else { diff --git a/plugins/api.c b/plugins/api.c index 332e2c60e2..78b563c5c5 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -308,11 +308,11 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) if (!haddr->is_io) { RAMBlock *block; ram_addr_t offset; - void *hostaddr = (void *) haddr->v.ram.hostaddr; + void *hostaddr = haddr->v.ram.hostaddr; block = qemu_ram_block_from_host(hostaddr, false, &offset); if (!block) { - error_report("Bad ram pointer %"PRIx64"", haddr->v.ram.hostaddr); + error_report("Bad host ram pointer %p", haddr->v.ram.hostaddr); abort(); } From patchwork Mon Jul 12 12:26: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: 473118 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2925196jao; Mon, 12 Jul 2021 06:08:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmiw9ixXtYpkVI6P88pbqJVfIvGVenKHyGs1gtX65GKYtnWXbNKGNpj6j6LViShiObELWk X-Received: by 2002:a50:ee98:: with SMTP id f24mr40327715edr.72.1626095329842; Mon, 12 Jul 2021 06:08:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626095329; cv=none; d=google.com; s=arc-20160816; b=zrS7qz1G7FOJR654UlM6YGV6Z2BOSvIm9i2JzIT6zMq/KJ6P7gtp/F/25OIkiURcTp 3wbBzJcYjsHqQ6IDquyAYM6dvstbLPPIC+QjoDsD2CGHAzoA0caHyqG4cYzx5McN+cqx lGfoMBm+E7UieAC7ncmSgitBkn0oznKi7lSTyk3X1cPnnG2QuSCmMVtEEatvWNzzqo54 4vZK5PrTlFJPOYKE7kQy3tm7uTKhlVemGOlOgPkk6qq2LI6aZ4sq3o6KiQ7wb1I7P9Gj HKaCSeqWXkFPh4W/9GLh/yq0KnIaKs8rE0quN0VqS3ShmqI2fZjYUeHJklG3E/i4C4sT o6PA== 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=8bCBhKBxzb/qFxkz11jaikGPG2zqXOY5uZnEdjQKerk=; b=OEiFeoa6ySmekE0iiFoMPMdBuI0AQ/jsTv+FYM4BA4W3P3nFiKvYUCd2sGFw4ViiV/ aRmAdLWdS2PmJIVBl3A0f0q4D4stKoGW/GgqbajirdmgQ99UMKn7NyS4/jGld+w+rAVR +MIqw4pfD62+FeONT2oOgOEVscfbPP/p6M/jci76GrFpAst4yil4ZgCwjBp11qPWPEFf Ww1VEYtzqsLsW7PKefHs1t9giWZ6ym1a7slnNLPm0kUvLPxZkdUsb/9Z5FcsBCA8ZJEL D+IBNCp55CdD/H7Az+GQF2qVdlrDC9qofIiAZQbvyh1iwHFUY2WTAYY+jWihB71qCc/3 DwXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nixLLqER; 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 d12si19257586ejj.50.2021.07.12.06.08.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:08: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=nixLLqER; 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]:60824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vg0-0007Qz-Qu for patch@linaro.org; Mon, 12 Jul 2021 09:08:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGy-0007JD-HP for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50946) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGx-0006G4-1A for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:56 -0400 Received: by mail-wm1-x331.google.com with SMTP id l6so3028148wmq.0 for ; Mon, 12 Jul 2021 05:42:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8bCBhKBxzb/qFxkz11jaikGPG2zqXOY5uZnEdjQKerk=; b=nixLLqER5kBtTMoZ/nYDOsTXNFXYUDhbGRq27rBTfOLJ+C7lk663jQM8eDiQkJd83O H27sYPf8AZqrSmj2JhGOV3rOmSRKtmG3wGSzX+eTlkYFjvjsG1N8/Qg2s2zomCG6M9pQ Pc9LJgDiKBl0+rmWxjO3NanFKcmejlucriYAjD2C5+91/eQXkC+eFlMKTGLXJHUairtv QzLJqEZW4kMf7kXP73EMMg48STtZJtQSy+ZLKiRspApQnbqSOTHU0FD57pCCAgQqGv16 9nuc7ObOtis3TksPOealaqwiKJxl1nbdI9JFWZ+EPOzS26Tl5BwVZSgCq86e5tySqYzc /h5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8bCBhKBxzb/qFxkz11jaikGPG2zqXOY5uZnEdjQKerk=; b=JKL3GV1omcWMSB3Okk2xIKknJv/2YQ/mIq/6ssAsLpmDsgAve04WSAvJ/NFcY69EEa GImcwtsG2v6IxU5x6zBLTCd4VGDgOzSI6km3EbCQQVoBP0FOByEKHpodNocxFUob54gJ U2/58SQ8VWIGddJmBRztLyEDGl4PLTQXzPme2HcqB2ZfM+g7iwgdiiCdBHJyUcVbsmE5 ULNpzi2qyrnidLtLkCzsrtNOZRFg2KlefPDRXMqPnV8SGz9hgELXgqlcbNZtwQrPjrMW pJTIGOVrZp8SE4WMrsUdIZ9aBh49X2uGqP2k033z+f9JUvR9L6CMPowFhTb9Twr6VtS6 X9Vg== X-Gm-Message-State: AOAM530YQg9PdhyVm0T2g5qCS6MQk/6k5hF4S7Fust1GNZ66YRu4tEAh NN5nLDIKQ8QFB+sgGTDNW3SlAg== X-Received: by 2002:a1c:ed08:: with SMTP id l8mr53883589wmh.38.1626093773649; Mon, 12 Jul 2021 05:42:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f15sm5896610wmj.15.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CEAA11FFB4; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 28/40] meson.build: move TCG plugin summary output Date: Mon, 12 Jul 2021 13:26:41 +0100 Message-Id: <20210712122653.11354-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-29-alex.bennee@linaro.org> -- 2.20.1 diff --git a/meson.build b/meson.build index cea8196e53..ef0d54bb75 100644 --- a/meson.build +++ b/meson.build @@ -2740,7 +2740,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']} @@ -2856,6 +2855,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 Mon Jul 12 12:26:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473089 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2898071jao; Mon, 12 Jul 2021 05:35:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk4MpAbafCAy1pCiTxO/eZXXu+S6qI2InpoYP4Zg0lCAAFAgpbXTEg6/snKoGcKhm6usa8 X-Received: by 2002:a05:6402:10c7:: with SMTP id p7mr47783629edu.159.1626093348682; Mon, 12 Jul 2021 05:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093348; cv=none; d=google.com; s=arc-20160816; b=TR/eQbUMaRjamxE2G5N4GIq5MzCtg+2cGoTkjOMK5Yk76uscyuRHHZAW4J9ldqhtve 0H+Eqk3gNQagwqc8OJ10dZK23uDxHs6/EnYTnP/wnwdWV1Y+9y39gCfatzOKFvK4IbAp 1klCA37YeJdECpO1WKKX10XMCTr9QH7gMmbcn6AnytbUh9bQCj2RmyOEr/0b0GS2O1kN TVYH4HiuIwxMtYqddjlcf+Iwb5mN2gOBB3te/oU/Ya04umzWK+sx1p7/vAAcIF2oKd8H 3AbLtd6uyxmSnD8oaAOjD0fzYJDV5W4HR9h3msnbXBzMW1nJ0EQUnNF5/1AuumhU6svg xZ5Q== 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=tuIitrhF9ibjgdg1Td3JXbbYjhXcUV2FAxUCzTDO08g=; b=b12N0/BowfHP1Mo/07lKJCDWw7Cvs5Zs0DVVugZ5KxO3VAcAFRL/b0qtFM5MIjuBUN H/mun21VXa2eGgud7TJycy9O74PJ5e5O9AaQZRG45pZoSrFviNYQxwCXMbh6MfruGY5V Y1tr1xsWCtI35Q2DFtaHILpdEkwEQJPdMJiREHzAsBhKv2684Sto76UtJudlzjrX1XYX cBpCFWwTJ2vnJFrlQddvwdceNAtJAYuj02tXlEeh8d65dfBgjXa9ktlxcbvW8F8IZ+vg FlysYbYP+5jhqCfMRa9BY90QI1Wm0VtXZOBqbFB3IwAyASDMHkUOThc+FkyUljXPjKP2 HXew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Mx+xxXsZ; 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 12si17820850eja.320.2021.07.12.05.35.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:35:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Mx+xxXsZ; 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]:37052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vA3-0007ba-NL for patch@linaro.org; Mon, 12 Jul 2021 08:35:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1x-0004Tp-Eb for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:26 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1t-0008F7-Ic for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:24 -0400 Received: by mail-wr1-x431.google.com with SMTP id m2so14328550wrq.2 for ; Mon, 12 Jul 2021 05:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tuIitrhF9ibjgdg1Td3JXbbYjhXcUV2FAxUCzTDO08g=; b=Mx+xxXsZo465t0kFDUsxnEwG/whdGYyTOonjmXYY9iDeCJT7LzGtN7UWe3pLjM5rPk R5ft2LJAwu5aeUjzjsaw5mi4gOPzfCJlz1u0sDWitbnxtwG7HU77r7b0GQHQzl0YIqhw O1R+dK8IrRKqc+upzCB1vp17aIEPBpOjAKNfmTHSNFc6YAYYJRp/D9JQlwgRqCoux3YD M6eMS0+xe0mK/pGRxeyxzLiJwNCJWC2Bgu0XKwLdmNOpAuIeVqZM+2DOY2+V07cr9uxA OxkW+PMYW51qseEvdy8LF5hHXj9ohn74Xgl0Rm616MgV6WdhvtsMI+Lf3vK4Bt6vz3nk Je3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tuIitrhF9ibjgdg1Td3JXbbYjhXcUV2FAxUCzTDO08g=; b=QjAcqWJm22pAQYWk5BLMgwMbmO1M4pgyXjQtnIJRE3IFGb9NSYYIpZMzX0t4MzfIbm rmaqclm/9jFnVrVABJASopcOB6pT4AzFjIAWUPmDh4QGjDghYeb9fypgm+vpswRXjGhk O+K3bDWiZZyLBriq3kHmUVkvl1rSPI3ISfqBtFphqFE8VeBeB1/Wc7h/Qa4Z3SCF6qFd JLZCNf7+zAoOp4qd25XpL1zlOE0LKvIlhJ7NABX7NfrghLMTPM3hKKZ9Akne7v82+7Va Nn0yQ7mYdn1mNNfMr4HdB46lEObuyRXCVaABzkRgISH1TvmwSaqPYBYrbV7TNAhnr1Vd joUw== X-Gm-Message-State: AOAM530iDX7s04ox8SlJu8ojdKRLeprM2m79EpauvhrZkjGTolJiAD20 A9OYAXvGhP9dT6LtUuFRpMaZL1oH1l8bKg== X-Received: by 2002:adf:a1c2:: with SMTP id v2mr34699273wrv.155.1626092840208; Mon, 12 Jul 2021 05:27:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o28sm15202121wra.71.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E43EA1FFB5; Mon, 12 Jul 2021 13:26:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 29/40] configure: don't allow plugins to be enabled for a non-TCG build Date: Mon, 12 Jul 2021 13:26:42 +0100 Message-Id: <20210712122653.11354-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-30-alex.bennee@linaro.org> -- 2.20.1 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 Mon Jul 12 12:26:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473112 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2913127jao; Mon, 12 Jul 2021 05:56:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy70BDktDx2Tia6qwkky6xEnlJFp+HnL8jCjS4EnOFAIalEDTEimfw3aKg0rw+K1yO3UXk1 X-Received: by 2002:ab0:204d:: with SMTP id g13mr50339081ual.65.1626094596018; Mon, 12 Jul 2021 05:56:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094596; cv=none; d=google.com; s=arc-20160816; b=Enrl5k1JX0trgKfO1M1YFVl342f/j9KexHGanCxApF3AHMgxSwkSi7abKp9jrbpCaG mVAHBJjAwEP6cv4Sy+iQkXmqBVatbyL++KDtQ5dcWg/4o+CiuUYRkm+97cM7bu9IGMAm NvP2wtl51xJY5LM9QR51jussvlaqKSNXI1fj3sKy/XtkEzRZZWjgC3ZdDxI9drba+i+m G5VKhDsfm02Yp3w10Ry3reCMpphI7RAm0/pwgRFLHJQJebULgWv1eddRftv6ajoEwNGc sBAet59Qj+Oq5msxLmTi0YdeGSWTr7dfT7nLBRoRCPnBFmusigaw8K8WuIwh/SXHSNHz R8dQ== 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=roEQiiqn4/d7JzDwl79ddq61d39aQG0jRwujhTpjOXc=; b=NP16oDjPpizuswevWhur5E95W9RLcNLpdt5SVJI1ng38leUgk8HyGXcJJtZHh9KsrY bhNGG6ABw0v2Cxn8TiVxMbgvvrdFBmAxh7n4C6KjFSMbqXXko7Jx7XXdV5HpfTD+uAS9 khgbJHB9cb+Nq9/x7cQV39p0d9UqVoItJhs63otee000y9vOxYTN2HMuXhflKZPUKxsp YsAUwSS6BntX7151Kqfq1AWTaXwqto8TQ+oi9xfLuDiRmgE0fdIJSztgP05g6j7zKFDF YwbT+v+a23vD219l5S+RrTEK+Wzi31nry6odn8LH9smsb58B2KHp+9mgnvSwPPjn1EmA qRIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=A2TAQ44B; 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 u3si4824528vsh.198.2021.07.12.05.56.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:56: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=A2TAQ44B; 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]:38018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vUB-0005Tk-8a for patch@linaro.org; Mon, 12 Jul 2021 08:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7T-00051B-61 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:07 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:44884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7R-0002MT-Fm for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:06 -0400 Received: by mail-wm1-x336.google.com with SMTP id i2-20020a05600c3542b02902058529ea07so11396666wmq.3 for ; Mon, 12 Jul 2021 05:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=roEQiiqn4/d7JzDwl79ddq61d39aQG0jRwujhTpjOXc=; b=A2TAQ44BTbm/i4+ic38gekCWPvmnnnQGfyw9LQJ9lHvW/lEhR9anZv7h6rDgrFaq8g QEj7fF2jHU1uG0Hl1RfxGITYWue5OQb/s6pqx9m52gGpQDF33+5425zcAJrCY/DAh+5K viMJZ2cKep00+VS8+CTPUg+dGQ1iroga2o2o/CheRN9N5z/ZD6e4K4KWi1659od0fP9F C86Wo4C3jYh/6gAE+8I7UyGUzExRUQMv6NnVnNHC+rGy4KNWH2MFRprFoD1ZBJLtAz2U SmYAyOTh/Gv5IwEKgus+S3h5edyGjcE9TtYf/KD/JZEGApyq5fKMBX3V7vBwjxf/C/Mg M2xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=roEQiiqn4/d7JzDwl79ddq61d39aQG0jRwujhTpjOXc=; b=fOfUpSVqWx0yVl3C62wn9DW2Ovg628BClHq78auYUcig2ydgT2IKfjzdbyXsVRXUwd Y/bBi+7zPC/7Z0K3bqJYH1GSjIO/w+uTTB33mebCYLUNEJoy80w7DjFqvSy2mdtJmn1u QBFK6zb1gXgsA/DYITQkNpOZVH3wzuwFDlbSXqvYhH/nUneUdlvZ09HyZvVx3ZK/JrJe BA0kzHK0p5QBWDEyGnyvle1TMSIvr+Yzo4cczGAIMxQj9nNPhQmBMiMPeyJdd3MWsnjR xb/QnXw1s4EbtfXzlz7jp9Zu5GqcnSxFlzHxBzmFkQ+7QM6d9k/mWnK0ffhEXXgEPAdH 8n0Q== X-Gm-Message-State: AOAM533D/+0QbNbZeoE5PSybmQedTTX4ypm1/6s2Dqtm2RuHq9hih2hd cqqZZAJkH10odK7ehofxEbIqgw== X-Received: by 2002:a7b:ce8b:: with SMTP id q11mr12804461wmj.80.1626093184282; Mon, 12 Jul 2021 05:33:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm13994059wrs.4.2021.07.12.05.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 064B71FFB7; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 30/40] configure: add an explicit static and plugins check Date: Mon, 12 Jul 2021 13:26:43 +0100 Message-Id: <20210712122653.11354-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Moving this check earlier will make the later re-factor for enabling by default a bit neater. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20210709143005.1554-31-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 7f906be68d..2c9c6ab870 100755 --- a/configure +++ b/configure @@ -2184,11 +2184,14 @@ if test "$modules" = "no" && test "$module_upgrades" = "yes" ; then error_exit "Can't enable module-upgrades as Modules are not enabled" fi -# Static linking is not possible with modules or PIE +# Static linking is not possible with plugins, modules or PIE if test "$static" = "yes" ; then if test "$modules" = "yes" ; then error_exit "static and modules are mutually incompatible" fi + if test "$plugins" = "yes"; then + error_exit "static and plugins are mutually incompatible" + fi fi # Unconditional check for compiler __thread support @@ -3979,7 +3982,7 @@ if test "$plugins" = "yes" && "Plugin support requires dynamic linking and specifying a set of symbols " \ "that are exported to plugins. Unfortunately your linker doesn't " \ "support the flag (--dynamic-list or -exported_symbols_list) used " \ - "for this purpose. You can't build with --static." + "for this purpose." fi ######################################## From patchwork Mon Jul 12 12:26:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473093 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2899785jao; Mon, 12 Jul 2021 05:38:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyBLkkESZSX5yHOzVWL2t1lfuIn6p5bYDTxa3UzoUPLLv9NaXj6Twe/6qUd6BsA3Uq0zE/ X-Received: by 2002:a05:6402:7cc:: with SMTP id u12mr43517348edy.156.1626093485785; Mon, 12 Jul 2021 05:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093485; cv=none; d=google.com; s=arc-20160816; b=09/c8wRr1VB3qjDSj3Wlkz0P2hARys87OxZ6bB3GG2YMOen8pwX7EzYyK2BWjbbZfk xv3NVjETysa2izBu5lnU4PPaByNgWoShxLvKCjxXX1G7ZmEf43iGYB/3Y4WUHLQTE08H vPY1scFQQIqfq87P7qKyKRCTZ4ju3nxtBTgTCepR/ltg5ctbM8x+l3DYIdYDrsUjiD0u 4EHbXJ62uCcb6HOUWIkzmIl1xF5ZcMCOuyX0G/s0p00p+S7Px9gePCrEEpK5ce+BTO+b OiYfEeQ2+MvJY4iHasBgoMmWzetGDidcumNGC8szgtcZNxkPWgG9OwmpRJD51SYUwdgS CWig== 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=/EqKRf54i8gl3hRcUpVK1o+1fj8ip12CroRx4jiNsRI=; b=HNtH8YEaGhfrPGzLQLceS501QVvjFxOhIXbeCiV45Md+LJMNxltCmztjxzBoHHFLGO XDKqnIj//4IG94l8sDbTp5PhFG+q0KgXct/mUv8xKReZzYwtYIEjH+MD3EkpswSO4AwR IgglrrNbVoCpcaPSqjqf65FUvjB+sSZwt4WCaJh1EaW+A13VVMbuCVlltk6P0UFnvVFs zP0xL5CuEXY9PXd9NoH6S1T8LcJGn3N4RW1Oa5FOePhErGh4M0ZlbCzCipOv2cEtrUkU HprgLcJARbLF5UXkcobRV+maBk+Ti4P7QDvqimq5vvYayeH/ovfdmSQSlvPlWULk6SPx ODsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GzfZ4Ypg; 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 p13si16352867edr.88.2021.07.12.05.38.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:38:05 -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=GzfZ4Ypg; 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]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vCG-0005W0-R5 for patch@linaro.org; Mon, 12 Jul 2021 08:38:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0004R9-Df for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1n-0008Cz-3V for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:16 -0400 Received: by mail-wr1-x42c.google.com with SMTP id d12so24725203wre.13 for ; Mon, 12 Jul 2021 05:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/EqKRf54i8gl3hRcUpVK1o+1fj8ip12CroRx4jiNsRI=; b=GzfZ4Ypg6eJEUgXwucyKeZeTkOkkE2BvFv2O274ZsadIa3s6rz837pN4/88MAs9uCo ITNpus1lqL8qERrg76FId9SXRrU59p1V5LzFeb9GYoMjaGEZTwbid+PL4sFGSaZUYO2h PGPzMcDozTewfWQXbeVdG0Y+dXiC9Xm7Q2LBUSc9VMX9MvBG1MeEuvi4NZy6nI9Yl6vG KXFQEJqXk/vzvpDbMUQGy2JArg09po+hfIj9RFRRAYzC0bzQP9jg+CFSaN0wXc1fh1Hj aVZ+zPLKk+OjkAMoxaqiAKoXwlUTgPSx+/nglbepcTuCGCbbrenkdx/Anq8rVDq7hGOQ xAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/EqKRf54i8gl3hRcUpVK1o+1fj8ip12CroRx4jiNsRI=; b=Ql79j5akh4fZbSeSSMwx5ZdGcSAN0nkW8RBxHFYIzQ3evUXGeyw/cLuLiP2k8d9EEi p6u4Jr6oEw5Ee5nCLmlC1ghCAO0e2QY/KL9ge4wY09+BfPd5UVnWrM4RIsymVTkjWP70 wYJXOH5w3U6fT+TGXC7teSwnDt0IXzw54wURPj+q7E24xqbq1YP9Ip3zmaf6FSmGVKg+ gELiEd9aT/VmMOhi7V5Rd/EosCDFiI+yqe/SgRqPFfCYmz8PvHH7/K6YyfLEAkCHMOya Q0FxYxGldoCTFCX/J6uNO3JaLbP8mYxllrh98j6LlXLJF/u+72rpqoTqMK69foPxC+3y GWpg== X-Gm-Message-State: AOAM530ZqO2+nEKFUgzy3XvMnFavTCNiwBmKzJ24PhZYMEad2/HlpTDC 3EF8D5+JvJdNEGXynhQ/WXa+qw== X-Received: by 2002:adf:e488:: with SMTP id i8mr58753537wrm.285.1626092833785; Mon, 12 Jul 2021 05:27:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y66sm12813532wmy.39.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D0CE1FFB8; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 31/40] configure: stop user enabling plugins on Windows for now Date: Mon, 12 Jul 2021 13:26:44 +0100 Message-Id: <20210712122653.11354-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Yonggang Luo , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Richard Henderson Cc: Yonggang Luo Message-Id: <20210709143005.1554-32-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 2c9c6ab870..97ea6e6629 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 test "$mingw32" = "yes"; then + error_exit "TCG plugins not currently supported on Windows platforms" + else + plugins="yes" + fi ;; --disable-plugins) plugins="no" ;; From patchwork Mon Jul 12 12:26:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473092 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2898498jao; Mon, 12 Jul 2021 05:36:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9NJ2A3QAg9gBaI7ezOy3JAozUCs0AOkJCpRAWkX7nZiIRTEbSZN+WwePYKrShadLFY/TY X-Received: by 2002:aa7:c3d0:: with SMTP id l16mr18625027edr.225.1626093378339; Mon, 12 Jul 2021 05:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093378; cv=none; d=google.com; s=arc-20160816; b=SYw38yOixZFjk9hHxKweI2eziJjp6rUWjkfj6iUMTdjq2uiJk8vvaHCz2iyCEhpRRZ BDAJ+r4sN2v/H8nLWosYzDIAP/RLCYrQKewMtBUQSRc7rYcgqZgMO9lOCEGOOfJlad3S n5fjguAIvAmxM8gWVWVtLJTiO7qgqDV0zSCFDFl+rlPefJLP4xOzVbnIU4GXIS6bscAZ JuUvrzxOWf7A4YmYDegVpX+VVENKAc2L+857fD2ei7SJw8avorExtLxiBilazweHynut WM5M5Xi2w+/vFQPs/IF6ddDkNZquf1q5L3A0SKmZb+q2Dgq1g4cW7KLVf4VMRQJ6VeQi zjLQ== 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=QLGV3nOOa57cJf2gO1fpwVSEwaIR/mViJx+0lBSJNTo=; b=YwXC7x3Ec+FeXeldciMHLBwk35dWfCCqfZRkrF9JFTUzo//XJpBjrfxrGOWmH2FXEp 8Yr9AWmDV4+Ev51JxsRt9fGzUM+aF4T45h/6DL6IEbpDa4Dxsjx0UuRCVcWJXZpeLZZe QyL4gv7xc1XUj9VN9/ex8zDQHeHDQsfGVhcLakKA9A6KopBaHNOpFT55UHfRaeY/k8si CwJj11dZHdXqaVFmxRNNFgTfQuFdJaFH7JfqgiVEgE0tKF70xJAgo8sNBy46JCSlLfbZ 5WqMfTLv7embBNqrywvrHM+LPEF/KuX4yfsVo233+e4tKRMmaWEnmgrNhC316v42momB pJaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eTPCjvlV; 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 j23si7785827edr.110.2021.07.12.05.36.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:36:18 -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=eTPCjvlV; 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]:38472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vAX-00005u-38 for patch@linaro.org; Mon, 12 Jul 2021 08:36:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0004n9-BG for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:00 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:55231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0002K9-MI for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:32:59 -0400 Received: by mail-wm1-x330.google.com with SMTP id k32so8086420wms.4 for ; Mon, 12 Jul 2021 05:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QLGV3nOOa57cJf2gO1fpwVSEwaIR/mViJx+0lBSJNTo=; b=eTPCjvlV52H42iacsU5RvA5u2TFdNpdBgRlk7l8zAIA01agwz60m6gAXMtMjOepBvS AX6wcqInb0S+aQzMpM9l4GwxKK6C5zWFOBezc9dL/GxAatOaoqqioUuOU9h0RIwflVIg em7Lf6fviKsQzmxrFmTDFrJfd9uW0LA7EL53cufQZ6tRISTByh8AXUj8mCZrCMvgl3rT cvWmycOsXrSvhriVUxdEjADCwYVnBB8CSWi/wSYUb9UQj7U6pgNf6EOow03WnYQQ6Zd6 CouiV++FRcd/YGsqWiW3aNJ7TcqJvTNdHy8bvNa5BYqSL8/VXhIIxUnB+RTkEJZWx8wy OZFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QLGV3nOOa57cJf2gO1fpwVSEwaIR/mViJx+0lBSJNTo=; b=RTXRIKegoVjSQlVEaHzADsiTWLq2/0Nv1yfZ7d+Wj8fssuRQOwH0eM96GiVA2cQqfj vx/oYMGAQUif1mHFCDg6VyUg+XvSyynUR05QuQSMtWzIbVlW/ZVzkk5WalMjWx5ul0I1 D9sh9bnCMDmnU9eKV+pjjZNiiLY7ZXULVYCDsi9falqmZ78kNbKUkzHU5CK0lJqjXinG Aa4s9+pBYUn2HSTVW+DivZ1djyJaQeBXwoHRXbTtqjVOKjxh4K0uupNEIAyjkr5WWPLI L0qXFpAz4yubX9j5i0XU3o8PwW/wRZ3Db6QSdrtKVoMdWeAilVNx3FhJmg8MpfqlOBI5 RxWg== X-Gm-Message-State: AOAM533Z0DCHwZNQVo8KH412aoOoE0RNGOqZzi44SNt/4bcHNlU4cUzO HG5M1HUtJGqSPSplzYc+tK7Duw== X-Received: by 2002:a7b:c108:: with SMTP id w8mr25685291wmi.99.1626093176380; Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c125sm18783135wme.36.2021.07.12.05.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 380F81FFBA; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 32/40] tcg/plugins: enable by default for most TCG builds Date: Mon, 12 Jul 2021 13:26:45 +0100 Message-Id: <20210712122653.11354-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , Alexandre Iooss , Paolo Bonzini , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= 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. We need to move our linker testing earlier so we can be sure we can enable the loader module required. As we have ruled out static & plugins in an earlier patch we can also reduce the indent a little. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Cc: Paolo Bonzini Message-Id: <20210709143005.1554-33-alex.bennee@linaro.org> -- 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 97ea6e6629..60358529fd 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" @@ -2196,6 +2196,8 @@ if test "$static" = "yes" ; then fi if test "$plugins" = "yes"; then error_exit "static and plugins are mutually incompatible" + else + plugins="no" fi fi @@ -3089,6 +3091,69 @@ 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" + 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 + + ######################################### + # See if -exported_symbols_list is supported by the linker + + ld_exported_symbols_list="no" + cat > $TMPTXT < $TMPTXT < $TMPC < -void foo(void); - -void foo(void) -{ - printf("foo\n"); -} - -int main(void) -{ - foo(); - return 0; -} -EOF - - if compile_prog "" "-Wl,--dynamic-list=$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: 473096 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2901823jao; Mon, 12 Jul 2021 05:41:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjWUEE1QjbLHrocFoym6iXhryAmk4cMhNFeXBt18ktKYXCSRMbB36w/E1xu/RCxFHx/mdD X-Received: by 2002:a67:ebd9:: with SMTP id y25mr17984444vso.55.1626093660075; Mon, 12 Jul 2021 05:41:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093660; cv=none; d=google.com; s=arc-20160816; b=Ei/M12f3HlPiBERGp36ZkY9RcHPn1fxRUW5rKEe66UET1ufgz4mGVR3PaHFQIJvrjb oWTc+zuleEK36CGm/3uQuAQEfQRt+sKVUWlMLBTJgqyAxEn4TMJNt/SfjqrW8AehMdCS aDRmQq0RAhmqDfE8E8lEd/dMRAYOtfXFGfze4g6+lzxwWigpNJItb87FcUWsodlg0Wxt qN3Ke0mZmUZS7+e2/L1OMLv8FD5wCtpXuwzRGrzBzvxXwBQyV+LamDQ98mOeZYAJz5ph 69Ka8Vkm3CVkdw50xhM6l6ATvwM4V84OWpdQKBybfgSIEnJ6zyVuw7YfJAD0UJq2LWbu G7DQ== 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=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=hKhmxzTYk1FOnxR5AT59It6+Piv0XMVARYDI8gMR1sD0oW3YGIHe6mtaW1kovqhwri vhosdVbW/R94JCLoQ2duFmodnbh3weohttLzxYCRUsKRbms0uFxTsWYjU5phVDjUkIjV cUw9M44dXBBhzb1Tv2jAEfXM1mISodM0/pp0ulRzZzhemuYn44mFYDqSMKh39Z4yj7iw eJZAu9tVlLTSqUFyqz11tr/HsKMS20YnngxkZNfNDl9LNsqAsHpEfPy+idB82W1dTwUV ZTvtEkEwnQn5AdlCMPpqKVG9ZeBpZcPqabIqPMYadyoiY0Z59U/HNEjGJGyd1nWGbyfJ oLDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qLJ6uCig; 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 y35si11925489uac.77.2021.07.12.05.40.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:41:00 -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=qLJ6uCig; 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]:55032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vF3-00038Q-Sd for patch@linaro.org; Mon, 12 Jul 2021 08:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1z-0004VA-Mu for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1w-0008Ia-Dz for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:27 -0400 Received: by mail-wm1-x335.google.com with SMTP id l6so2996294wmq.0 for ; Mon, 12 Jul 2021 05:27:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=qLJ6uCig4bym35vyKp/twqzW3HESa/Ri591f3yFejsD654FNqeOU0UqLxn1Xd1zHIB bBRvyoD8w9Vem+jRpN5ihKH+re/zrLYRsF/5AFGbpAUWWhF2CYDSkqifbK6/b/BnYy5+ s3wNz/w/udcfYsvZK0ukrthh397dGNwVd5RHhyDBBaGkX9jDDsc/ney6BtSsKrieddib k9Ws25SlIcD/8q0RrcvkjocHCtxXSU9unEZMKYrSryHB2TgGBKQjZWe0qbRgsstTnvkv tthev7jvASY6j/pzhnSvBQkjYzSikLCFoVjkiIB7FLWk7IsSYcUyO3q/QWwjY/Rwqdek zVzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=am5F7hKQMbjAxUxC/rg0c4FouKglUWWtD2I0ZQOS3yKQB5BMqwfMF7HDhZ8c1k7VBO cxKmGh4Zl0Y49jCMFMsNuSjQYhUqJntT8dk28kis7vn+PRApomLYTWINc1EdUEZurJE1 KbgjyBfAAcccTEY0VUIVRUH6ECuU70E5sICFoYkMrj/QCQgYbck47t5rsj7YJDXsNbuS jz8xlEMY2ydi1YOGqnzWoI/S3Z1bdn16c6tgq9zQnuEcBE5dzHVfCAQJQZ4WzGket2sI jdv4cID0vM8aeM7irOVF+y5fRoz3Wih8JeOq4vuJhw+5765kSOLzzYasUA5suehr21xd 6fCg== X-Gm-Message-State: AOAM5312ZIXtfmeo38sGTTcIimws1ZCYxQdTePtnNEXFw0h5f8kjb75Y lDIIvhumCo+62kK5TVxwmyZ03Q== X-Received: by 2002:a05:600c:4f53:: with SMTP id m19mr52936321wmq.176.1626092842376; Mon, 12 Jul 2021 05:27:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a8sm10337396wrt.61.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4FCA41FFBB; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 33/40] contrib/plugins: enable -Wall for building plugins Date: Mon, 12 Jul 2021 13:26:46 +0100 Message-Id: <20210712122653.11354-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson , qemu-devel@nongnu.org, Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Lets spot the obvious errors. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20210709143005.1554-34-alex.bennee@linaro.org> -- 2.20.1 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 Mon Jul 12 12:26:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473094 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2899908jao; Mon, 12 Jul 2021 05:38:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwq/xhZnfL5WuIW1vh7o7KjWRUgpxwo+AEHmcLnXfLJ4m5z6eiRQ1Rrb6/UxOSY1KsWIVxn X-Received: by 2002:a17:907:214c:: with SMTP id rk12mr1168898ejb.70.1626093495553; Mon, 12 Jul 2021 05:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093495; cv=none; d=google.com; s=arc-20160816; b=H+G2yUd0cFDL2YkBOlhmFEVYz9Qu1HvXbKpfuOcyrHfBSZmKGMv6AoPNQCEx7Q56KK cNTt/0hWz7CMy2F0lEw6IBQndZnEsEkyuBJF40//KCiWsYryYesE2qilLfLLmixWPWts iuZ/mcCdkyBGwQ7T4jsGgCjBO7V27Q6HH9vzoIpKp+6mok2mr8oaRQoFdQQ8uqHPmp4O buzVEJeaLQBh+M+EoyPeKlVszBxLrcENxV0b817999k4PDPhxsAiYMRhd8927PIufOxg 1JXYHBl5yP//2+lGheNk/GPC1ovyk8VQufY+t1Zqzs4B8i6JoqqJSDqhxZdnPdNLipNl gP6Q== 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=XvvAfutC3LYsNNeDs/S59h7kOZpMUoub8RYnuaoGrPM=; b=WAVzJhw5QzMrUxEq83clLFmUqxSC3tct0KfOgu+vKqqgS+Y3yUmslo3l4QL/uiTANS cOfMsPJOmVcizmhuSiWinTdrsh+cYM1YDYFbk1GYmRtj2HZ7yv1slrShWRBmwTuQRANl xnPwjqAv1nxAmnHJrv9EXTdeFn0Yrhl5RdsXL/L7NqY6sfLm1cNFWsOrQ4b0pCIG29IO 0lZmqXisOGewIZhubmIVKk+T2C7SLSynMb0h5yW0NL4Rc3vcsOd/J7RWdsBgozxDu4/K 5njrN5gLDr4EBiRurUIqdyVLyjldnUxJxqv/gdjbnwYPrLcyBLbGrBzIt3OdtzIs6F7p QUcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pnx0py5N; 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 de54si17045310ejc.99.2021.07.12.05.38.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:38: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=pnx0py5N; 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]:47230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vCQ-0006CV-EE for patch@linaro.org; Mon, 12 Jul 2021 08:38:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7M-0004nY-JM for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7J-0002Jq-Ef for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:00 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f9so19714763wrq.11 for ; Mon, 12 Jul 2021 05:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XvvAfutC3LYsNNeDs/S59h7kOZpMUoub8RYnuaoGrPM=; b=pnx0py5NHOdmQhI4Z0I4c2zQzH6dWbSEVZr56/qF6qV4Es+NCrpcmY1+j304niRMkA Zr7nSy9Ge/QNbPxxJH0oipdtZzbsERwNVXjHj8dKmp0lWxKfSwjf/A/fOSDbnU8+kagf /DEC+lD5GUgdYY6rjABI1zY7CZJvWelo2SfEmmbOpXQbEz5A3rrFdBWO83hHfj6zA2i4 6Nhbr+h3Owycg1ckZrEMvSZBIs+Jm1dtC+SMnT+qbYn/X8GRqVuabuadlBj9rG77p+2B fOrmGvXimbeRNd460e+gXCiPZrrt2Gw8tQg4fl3fQtr8CyF4qvQiWMuIeYJadg93VReX lKdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XvvAfutC3LYsNNeDs/S59h7kOZpMUoub8RYnuaoGrPM=; b=Rgg2s/A9T7d22w4WLiGZs8Tm/GyubpFqPdmhZ7jLcOKQmDJ2OOSLQnpG0YrPPS9wYJ HFLvRRvVGNA4l9dP7Eh50IExw0DP9vVsmiTvYXQruSItptCYTf9l/94stydweGxpoemM 31exW1P2mASadiiZMzepQj7X9D+5fswLeOvHDP+hhC6NDvMwyP168sU+/BzXMEEVVcQ2 gKlKzyd1UApxY0iRDKw9mLOZn6xxNPW8OjJ+iLLgDoDXIdlXZCPIgJ6458dzDHtWUDMS mvUfNJVcjQpmDQiSWYSfimz9DUtiiAZAWKUyaE7c/8bQf7EmDrxTPZysNpyIV3FR70Qp cIEQ== X-Gm-Message-State: AOAM533i3Mju4+rTwuUB4EbblHhEOCIejfS0mIwraS8uyFK/klh/iGYe a0yOCPFihrMtXzBcRscDwe/EDQ== X-Received: by 2002:adf:de84:: with SMTP id w4mr27509972wrl.104.1626093176222; Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o17sm11255782wms.32.2021.07.12.05.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B0571FFBC; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 34/40] contrib/plugins: add execlog to log instruction execution and memory access Date: Mon, 12 Jul 2021 13:26:47 +0100 Message-Id: <20210712122653.11354-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Signed-off-by: Alex Bennée Reviewed-by: Alex Bennée Message-Id: <20210702081307.1653644-2-erdnaxe@crans.org> Message-Id: <20210709143005.1554-35-alex.bennee@linaro.org> -- 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 40d095dbbd..97ad270762 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3018,6 +3018,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 Mon Jul 12 12:26:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473105 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2907165jao; Mon, 12 Jul 2021 05:48:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfnFHuUg3SMazlGhanMVYAvNQ+Kbf+Q79PuLxOy510jLpCRY1mEXcrYDUhlKZ4Loz++0Qf X-Received: by 2002:a17:907:3f9c:: with SMTP id hr28mr38973156ejc.436.1626094084263; Mon, 12 Jul 2021 05:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094084; cv=none; d=google.com; s=arc-20160816; b=S40se26jz4OvQNfYDMsd5oH0jj3tIRODzWCGCgmJ0pnV0vZVP/huioT6Mfc5jBAq1p OIOqiKj5eumsxlRN0FYtWiiyI7/nw8Sn1CzCdaTDSDuzhMYBZJwx/8PVxvmWffcui+gl 7lfVUBp4gXQZtNhnHyh2oazkDMkHoWRivBGo4toVg2XNmd0q9JAj44Zvn4Z6odNUdZ4b qXKakgq9cU1rr2fD8L0NN/YWOwZPK0UGSsB8T+NCJldnWTTVt+skAYKlPfCnL8O5gZQp S4InZBblLxZ3eLH665sig8D61wKn6Z2ivg/VpO/396lJ+yVUQGf3eljEti1QZGQRvzoV qUbA== 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+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=wQHFgtkhTSiKu40Hbj/U9bDWFLjQPr8pQHMzAQuJfcnGYQ7JMq59y2hiJHfqcTIgfn ALfrgzta72BRH+SWcGu94lGbW8O3j+jjFeICrUpuZgP7J1Kp/hSy2B8wEzgp8WNNpVqL xrY4FwziDbYlItUYuZP0zn1c5V6OzL9ch7wgB90kwk1Q1YKp3Pzoa6nhRGC9abgdB+zj 9yDH0TmWGfWx8JaiO3OuygseAPkw4paBfNOMvlrKjNfintCcAJcNYAhKXHs9Lq/oI0Bj CJACtI95Y/nIdcaIXK66Y8v3woLVjWEnw/x1ekqfKar6oZROPS9UpFzvcOK4hDIMIxSU eyKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VmnFS1ZC; 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 ji4si15160916ejc.469.2021.07.12.05.48.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:48: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=VmnFS1ZC; 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]:44128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vLv-0006tM-96 for patch@linaro.org; Mon, 12 Jul 2021 08:48:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v23-0004VJ-Jt for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:31 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1z-00004v-0k for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:28 -0400 Received: by mail-wm1-x335.google.com with SMTP id y21-20020a7bc1950000b02902161fccabf1so11117349wmi.2 for ; Mon, 12 Jul 2021 05:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=VmnFS1ZC/+VboiYWrk1c9gULOLJyoXr6mcIcFOeUUwJW/07Rqs/SJjnNTvt7d8Gp01 s26+lw0CYKvVnN4o809oglxvVOcTm03p1vBr8kbRGaB7Q7sV91N1thnE4U0JhdMIKVcL Zn19ncq9azK3zDnnLlbFGGyylUmmDfUGxX/FlFsLpvGePX/8MBcJ0Ub8RGozCUWJJZV+ 94TjH8NrmMco78lPDwSncPo+7VJXKHjUBO3lrKch0akhYK/D+X974bt1quVC03UICUTe 10CC4yKTo8NgW3eH1pUS5z/JndvyuyPo5LvT11pTMNP+sNMURuVxNpzwn1D0Sam8vw7J VQYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=t6LKEHcGa3MheLqTOuOrBBBi03LEjcfNcsvtojF1Bf4VWeCgJB+vuOz8skWb50PN1U 8rWJhYBDXZASJyFdX9o3itkXuMeqhxstRhSPOegOoSsG8QRuFl4DuGtgaSoiX+9Fsuub Q8zT5oWSVL3OnmhU+9cEV8oZW+5m4D/jvPNSKcZr1AwPL1IzZSE8hCOU9j9/Lr5i85ko CueqwMm3E2mmn2pkOpctXVXscQmocVcNTXJvwhNPB3vxkKFZEQbGS6Jmv5riK6o+QpH6 JCeEkDjuQmXRLf0bQ02gq847wJvWqNjNbftArT0aDE5inHdwMozka4J6yeJyVjx/BoRo mnYw== X-Gm-Message-State: AOAM530PrphFisigPOz4S8D+iuZ4j98gJtVAQllIO1lIxoHQFvCatxe9 xLAY1aXvJuGlYqw/dSL8uk7mSA== X-Received: by 2002:a1c:9d16:: with SMTP id g22mr31475840wme.152.1626092845196; Mon, 12 Jul 2021 05:27:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f7sm7393877wru.11.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 817331FFBD; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 35/40] docs/devel: tcg-plugins: add execlog plugin description Date: Mon, 12 Jul 2021 13:26:48 +0100 Message-Id: <20210712122653.11354-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Signed-off-by: Alex Bennée Message-Id: <20210702081307.1653644-3-erdnaxe@crans.org> Message-Id: <20210709143005.1554-36-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473091 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2898172jao; Mon, 12 Jul 2021 05:35:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpZaz5fWbdOdNe6WsPYrOtnqgxHJ/+xignmt9mf2WIvJxmrjsSJIOBn/gXmJpKmEMOV+g7 X-Received: by 2002:a17:906:e10b:: with SMTP id gj11mr33802587ejb.402.1626093356632; Mon, 12 Jul 2021 05:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093356; cv=none; d=google.com; s=arc-20160816; b=ZM13Dx/YeMzv/C/VAFvAeij36pYGjjWotVASn4xCwu0P9de4IKaJoyl7Cg6qzWKDR8 QS5G4wCMebqPurK1QpYSL+S+6v2Q78UFM9NVQpKAjZpNeoBSqK9aw2Zh5TfZ0gk+x7x8 h5DBxgI6E2jKpzKm8r6aRmH5BuVgOiGhorv/t+N2NUbBr0pVC/Ofs6okungfV2bDSDRz U0+NMEypKBu0S+naComzRx9S78saSml78FX3oJzqyTnDpv6OTqwyoK80LygToT7MEsby CfE3kFfAk9/lLE6f2XWmIlXoM1C24BHuygHLMYv5vJm9jQ99eozSnUKmIQS0KcL48PJa CWEw== 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=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=LHTW+okhYIG9XpU01kNmlPWVVl64+utfsW2PABoOfx9M1mHFtCdZDglZFP+gQdedtG 5k3jzHVMwaDI1llWL39MdReHAYJvilEOAes3a+jVpHjtdZ1GmAf+8Zd/lXcWRWVMSiDD nkvzx8wCPWu6PYAsyog//QD2u2sI8FgcaXDu46iepDwA0PB42Dgubt86lF65TY7h/yfH ANcys+0/wdLNbF3/7HiSgS8Yi8g8ZxKenFc3RTQTMPSYxJgCqwMs8kody3NT9QIxzwTb xIzcNt4YN988ZVDY093T5l4u/paLD/lgFrkTlplKawvb7W0nzQMFYaGT1tUIHRznUzyi A3EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="miYu/c9Q"; 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 ds4si4073613ejc.519.2021.07.12.05.35.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:35: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="miYu/c9Q"; 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]:37440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vAB-0007sV-EX for patch@linaro.org; Mon, 12 Jul 2021 08:35:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1s-0004RA-Dg for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:20 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1m-0008Cu-HC for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id m2so14328035wrq.2 for ; Mon, 12 Jul 2021 05:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=miYu/c9QkKwj+n5o44CqHmk5+e6+N9G4B8KDJHMNVnmS2wxDtafCO9u1apU17J4TtO vqsVI10MGtYhDgtcuUdA4Sz8eeSLZ6wU2pirguGT3hftaTcKttQwSo+u0DWR7ueOrE1A yrpGaFeW9krTJJlbSEgWY+jxCIK/M08J3L4MTC9DPjitaifS5V5P1ltmPK3H3VQkBWH3 VuT/kKxpphNZl3oI4/vk9MwcorvKQTj0psPf4pvIliudttBxe6ylobjXg2qKhMGmYaJS 7bh8pqRbkfER6NFti/j6nRaGX+yJ/rkWJ2esIA4sAb/jptGj4VrfEbfNJ8JLmuEKKXBk 9M0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=ov4VjFd5RcfSXmH5Zytw6Qbo/Jh7SfCrl+u+i9kOFUPIu/GV+WtR5N84scVnf+vbf1 N1XPCdWKdhZyVhlA9AXXaRrVqPpnOjrh2ftXmzdAd38qalmJrNgLcf8n1QzpY6H0JsLi jqotz8QUAXSTR4TKDS4CuJRdIlhUeUiZtttIzwp5oUujiirWjPjZyVO2Dbnd02f0UrNG 522WRyT6dCwiyYIRzmxON40CHJSi+uOrddmvpX4IGJ8CJ5crU3qScDT587vkJOKPyN8e qSbRkGq580qowiN/svMCvKMlFDbpwcAMZ3WmUaf7H5dEzL77DaOtIf729MjpzQhOXwFC 9Tbw== X-Gm-Message-State: AOAM533ckt63JfAQ/9pGpjQ8VEUwqUHZGCw7T55PdWKlMjPDPU4CTdW8 W4DZrA//SwyuXcM6Qc4E5OHZlA== X-Received: by 2002:a5d:5913:: with SMTP id v19mr40487256wrd.14.1626092833122; Mon, 12 Jul 2021 05:27:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n12sm14586977wmq.5.2021.07.12.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9CF7C1FFBE; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 36/40] plugins: Added a new cache modelling plugin Date: Mon, 12 Jul 2021 13:26:49 +0100 Message-Id: <20210712122653.11354-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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> Message-Id: <20210709143005.1554-37-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473109 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2910649jao; Mon, 12 Jul 2021 05:53:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLT9pPjh1WUhcVWCJLiDk1a4y0w5tsyKZgpTYAcWJFrLbjxkpYE93dIjbQLBky+0WrZkn+ X-Received: by 2002:ab0:24d3:: with SMTP id k19mr18181757uan.140.1626094386883; Mon, 12 Jul 2021 05:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094386; cv=none; d=google.com; s=arc-20160816; b=pXJ04Be1UE6UzAEDWDGesrf3wYw2wD35ytM0FQ2YgPwANdI6n8etuAlQSJ3T62FdUX 8bjtwTkJ1s+eaAygyUSxSB0GBgxK+b5cRIfbkvDceRow6SOxhMW0/VitzXf3k8HLfb/r FgLnxIETjHoCyF+rf1jdylQQiKClWl38ZmYKQzYnWRKzl7dNNxV7LdXrM446m+VX8T7J 6tZ2yTbF0XWvjp9Q4RJMD79XhP87vyDlZSLvzqc8ch+qQkGUFA8R3UG+UTvyqxA637xs A5saU9UpAQNQjFGVxUY88j9GduRjghGIhzmHqA5TFMPyWw3S+XPxlcWvhbPoYw+zb41s uHwA== 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=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=FpqVYqEu5bHPALnvGb4V6u7oLhNTECJRpJuiwlPLUtpv2wY1X/lsiVcnU4kiQ39SpZ 3yPiGZJObIg2u5dwTsRVayrbvqIZ3HIR3xgFr/hkCZsoSpxT7NPOTp8xoCVmGcLX1bBK XW0yjUpGL8T7dCAjhwh2mPT/RWI1u5My+eZ34KU8oNoEQoBmCAGc9JsYQBTQEh/f7otZ rs+x6x19xnaAuHWXWRfX4NUwNdzzmngYu9Ccok8gZtegXG3V1PmqogvFApNOwJuajV/+ tMrJ9pYamlP7RENs9jJNQNtXRloCPkNl1YqrJwXus4/7UM2clZOenr65Mzn9YjvBxZz6 ZR6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="l5Bl/l8b"; 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 l7si972966vsh.374.2021.07.12.05.53.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:53: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="l5Bl/l8b"; 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]:57456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vQo-0007fY-78 for patch@linaro.org; Mon, 12 Jul 2021 08:53:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7R-0004xb-65 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7O-0002LZ-Km for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:04 -0400 Received: by mail-wm1-x32f.google.com with SMTP id j25-20020a05600c1c19b02902269686f585so1107268wms.0 for ; Mon, 12 Jul 2021 05:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=l5Bl/l8bfm9CtcRNnat71enRKXTOBf4T0RgfBeo9ygzU0EfdVJrx0dK7EBrtMXoPi8 l2nrIbxmmu1TDfwGmCiFbNUl67SLQUay4gZVj25h9Ajl6OmSJ16uBrDiJ7CoC897G2Bb Q6U0lt6tCtYQuVtkzXEtbYsLvCikzEUWPOsC1xoURXCEYM2AuAW4xiIpoQvbkqCoSVlj Vm95ZN1CYv66iQGn8by/ccIHULYzjTvJ4uCz8+3NfDCAJx0VaED3uvmj+FPbiGs2Qw6M e8jDxXvJEfZ7s3i12i7TN5fWjhVcW8dKTR6KYouF5NET/ZYpAeVWRhzSLq2FezJX6JcI rz0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=CiviOy8iPxGYem1qapkohaqsqkLpgUNTWYqxlVL99I5GSwmAcpC7AetcC1UngH59Iq UCVsmYM5QVHy9oz+ziRZYPhG7nBn7WoknSZQETa3Uw8kx5FidPteW8suG08a+qhfPGQ9 vjOfpT4EcrPHT0QDCApHK+ZSIV4oqrOUpWUwdkz1lfTsMNahD++TR5ZYvQdnt5nrn1wH 22TYDL4SwnWj8b/mVJepBkLIpWsB5E3vPpSYY6g9Jy5kpV77TP1j/8vKMqvx499kb3gR IVVgfvBLC9H2ZE8NnXpS6Q+NxzTHZMZvkakjLCKIj26LLkRvl7AaX7rgleVii7qggzOc TbSw== X-Gm-Message-State: AOAM532mHK2vDa07zea4uDAfnGhsHGJXk2gJc6+BKnhKuY4TVmeWajCP yvhs97eE5AzMgqpcyCzhWHdRig== X-Received: by 2002:a7b:c113:: with SMTP id w19mr14345673wmi.44.1626093181392; Mon, 12 Jul 2021 05:33:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j10sm14003254wrt.35.2021.07.12.05.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B25D91FFBF; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 37/40] plugins/cache: Enable cache parameterization Date: Mon, 12 Jul 2021 13:26:50 +0100 Message-Id: <20210712122653.11354-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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> Message-Id: <20210709143005.1554-38-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473115 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2915449jao; Mon, 12 Jul 2021 05:59:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG9QBr78zAyrxSLFjr3OFMMr7eyeQCaXOYHqigC7ukVoTdSzsQdeGYcVxo6MkzbrFQ7Qzt X-Received: by 2002:a1f:2608:: with SMTP id m8mr42711414vkm.17.1626094789236; Mon, 12 Jul 2021 05:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094789; cv=none; d=google.com; s=arc-20160816; b=qapZcRIGlkxUpDzxoYOAz8jJ1A+9VjpQAHB1v/VhUlAd6qKPFsis1ZXWk3IhLLLH1p mSuuKUkI+NkLSbxY1rxFVa4ycOKCH/FkxG+YSkU1vVk/TNAMaL7MZQjR1BnbQ67CYFbj T1nRg45JBMwKzZfYNO86lQXdZkC8hroAAlBlSRcu5kdmJkdPSgIveBKcTaNgSxbgUHEJ 56z3hShlPP3vGk1X/+f0KqbrvalRQugdmzHMTEC2BrTbJQnDL7kx4QMeVVitauWQ2keh Fq8Yzi7q2LfoPtbv+9zFqaIaX1IaUcjrtkrsbnGmSRNqmMcYhvRMv+/a3yZg1UFGwaru d9aA== 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=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=uLggHLfOgTXmAyOcqnyK0pew4zh5f9zRw1xIZDSbaPwEtQX2CpB/AawsM4MpS5U214 bfTfBJFbX1XKzjw2PkXXMD3smAN0cOGZB4VXzRm8df6ku+xhltyrBSPk+o5l9AQs5OaO WhBVBDAPVkjEYThVJemE/r3G3TrKlXh51Iqz65QieqI1rxN820KIFCrMcF543DT2i/Qm 2WbzoH9bgiph/bpUudyt4MziXoBmwiHkGvUZVWj58KeCKJlR7d6u0Yyftu3RCoQugk3q iqJz6WFheCAsChLFp9mZsP15+IKEHAsokcoNo6E1MGi/YenB8dzDOKHYujyWOzbbouFx aqfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wOxid+OP; 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 n16si13134846vsm.240.2021.07.12.05.59.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:59: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=wOxid+OP; 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]:45272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vXI-0002bb-JI for patch@linaro.org; Mon, 12 Jul 2021 08:59:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7W-00056C-B5 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7U-0002Nf-Fq for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i94so25362270wri.4 for ; Mon, 12 Jul 2021 05:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=wOxid+OP4oEO1p1dOJXHcMhrJBAlaNc8ZRtJKz1536+eUpMTlagskqjQKvFGCcul7a OKyKjGOsI94KBmR6nsmN47oqRzq2p+Y4iII80wIkwSrGbhJ9H9AFnlQh08sBWZf78j9Y X3CtJiKCiZ622P/o1KIgbnZdKanrhBmCvJsoZTXQ1g55dZatZtgFToUSfqPfy1/700pY /ymLpUpdCWInzgPk1CasLvsGrK6/w7crUdfI74gD2AfON6ptn8AM4B3HnTz62lXcoI9+ hYIkB0ahzwqc6aJ62ONj7VZofk75roGn6aryURkIPkKOocd89kwla3dYyvSdjyZdy6Wf ptlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=fDh0zWb6Df18RC5WMF6tSkk4b71Ball7szdrT9kolRHBcoyK++VovnLn3EFA38/Qv5 eyNCr1y1MrElkbip84S6BrSJI6hAiqHc5/I+ZhaaqOywotESJqOZ41WKh5FHuFCyaSJV 3l5ptyHS8lWHscvsG3yu62ED4Fl13QwMciKW98AqqGhdKc8mkymPOg1AhOuVM32sYWl/ /2XnV9aJixZrTxIKGmEDHV2XOk924ncQRb66M3MUg5Vn2iLZscTI+vS4sNFY2oibdHVa FjD4fw3IVhPBrB32/qOkm0A1B1O2mTu90UKC3NwF7K1os3+1umO/LRyUWcUR3rYES/oy kCQA== X-Gm-Message-State: AOAM533bH8/+Yty3kLrZCBywshunTmWBrqlAfXlmMuqWIt7VmM6wIdOB +ZwPCYISeFC4oPD7y1l/5nhZTw== X-Received: by 2002:a05:6000:180f:: with SMTP id m15mr58817378wrh.388.1626093187246; Mon, 12 Jul 2021 05:33:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b9sm16929530wrh.81.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CAC131FFC0; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 38/40] plugins/cache: Added FIFO and LRU eviction policies Date: Mon, 12 Jul 2021 13:26:51 +0100 Message-Id: <20210712122653.11354-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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> Message-Id: <20210709143005.1554-39-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473117 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2921419jao; Mon, 12 Jul 2021 06:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhG3E/rMVRBllm7LrEMw7wVRwq5BJf6y0t1jfq1n5J+sljmW69ZTcLQdGGM000XfA6ZAea X-Received: by 2002:a1c:f016:: with SMTP id a22mr56674734wmb.65.1626095100469; Mon, 12 Jul 2021 06:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626095100; cv=none; d=google.com; s=arc-20160816; b=kgaErZLre066HcMn2tiFP7BgAS+mEffyhsruj8MhSqv8TDZMxaYMVi5AXaCRW7o8B6 fFHSZpedWmA02OEulRHPRl/pamS8YEcDr09KnCPyKkc8WVjgttG8hr9SJ1uIrT6kb1jz PrahsE6n+u/jHKo3EILs6AdtvjNKZOpesewyN7/YMpPLNvOU4qYt6s70z3P6gYAES7R3 sfjgvB/nbAc2SMhcQudxPUpTDgsIIVKK64vyB1eyXuUq5uot9SMk7VEL1XYBvkc9Bt2h +bSeArHvSQff4k889+yNEDZNOqQPbAX9F8/xiFqeV8VijhqByOoa/Gh4of3n3ECSnX+F IHGQ== 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=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=AvZsGoebG5ut2tU7PeilLa5UXxXpot0aUJYZiODimqa6G+O1QkhwXgMkLGIveSWRGX OoRzFI0tfwRKIsD1cGRvLLgywlqEIQPCMCPKuz2/GuIvGACLbON5dtXZPJUXawLuyzA6 qrV7CftKCVA+X3u0M6dUruIzpHJ+bzETn77xQ8lITnbYTDslkfOoLPzNKL2xeXhCAEqu QnVZnvaIGSfKbur9R9WzECrvVCmrx2sz38sw/uQnTNkrCdoq/MQFSzh5yZ/yggm9EwFl 0Qil/PTdDUVqJtixMGpJV6vnY9aNuTxUjQ07huH6VraTUSKU04yRcPZTUvRF22G86Nu3 gjcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UnL9Zb9D; 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 ko14si10303773ejc.179.2021.07.12.06.05.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:05:00 -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=UnL9Zb9D; 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]:53344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vcJ-00012Q-F6 for patch@linaro.org; Mon, 12 Jul 2021 09:04:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7W-00056h-R2 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7V-0002Nn-71 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:10 -0400 Received: by mail-wr1-x433.google.com with SMTP id i94so25362315wri.4 for ; Mon, 12 Jul 2021 05:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=UnL9Zb9DvJIxWWdgYGf1XuSawL6V1P1fd6VILrBYxHLzDjwhhiQ0zUCiga6eHR93r+ RJl4o3sopk84qTJN5wIv6UqzRKhqqHkwV3oiVzjW2XRseU7ewcCCEXEnmUzh4DXn/4QP ht9vPUm+Y0Dp6Zkbvsl4uc0W/Q9lBmAPG/FAgSJypn0BiMSh3j5EOlokMAAZQ1nD/ILW d2q0S8cdHcA7CZbV5eQH9MspNJWNyJbaY9dJ3dNIAXqIIEluGJCj/ZzZil3KUuht6HT5 p920U8FqsRMyl28YTYWst9ELgxNofKrH6yGSJj2knDQhNTNV1O6qE8JPnH/bvc3iVz8I 5L1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=rdPXJntqOoI0PgiQ7tqSDswIEHr5jep4VUiu2wPg4cd76WUWGGF4O//AQb+eZxTazA phS5LYVk/E8q8UAD7lYNWhT+pkuxoO2JZg9bx0+it0VcelnMK8OViMCvb2FIsyzwnNNX dutaG+wOEhTc7BUr9zCV9pSA1enn2QE7o8c+a7zeBJ3FOnddInH1T+fgFqKoDfU9uAZ/ v3NBFhUMQC2kypZATsdLPqBTvGLxV1KAk1kNt18XyoB3LkVL51c4+3yrmhw7F3Gwni2d UM8Ju7a1vsm9g9R6/E/15PO5yY0Y1XLewhx0O7bZ2tLE8aHY9UhV2Uva0C5T++Ai3sf5 eB5g== X-Gm-Message-State: AOAM531KGzARkhYQ4+ZB1Oxd0yWBnjkLSSYuQrxdtvwHaUNb5tDDxK3u b/ryw2ZJl56Ck6Q2EITkuAMxCQ== X-Received: by 2002:a05:6000:1375:: with SMTP id q21mr26491382wrz.147.1626093187903; Mon, 12 Jul 2021 05:33:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h15sm14132998wrq.88.2021.07.12.05.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:33:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E26A71FFC1; Mon, 12 Jul 2021 13:26:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 39/40] docs/devel: Added cache plugin to the plugins docs Date: Mon, 12 Jul 2021 13:26:52 +0100 Message-Id: <20210712122653.11354-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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: <20210628053808.17422-1-ma.mandourr@gmail.com> Message-Id: <20210709143005.1554-40-alex.bennee@linaro.org> -- 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 Mon Jul 12 12:26:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 473114 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2914324jao; Mon, 12 Jul 2021 05:58:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXhvZMF392JEBMErlluvAu17mQggYtzm9nMsQ3IYAFpAg7Tn42F0Cn0nwscShBKJWu+Uk9 X-Received: by 2002:a67:2e08:: with SMTP id u8mr46728009vsu.12.1626094698537; Mon, 12 Jul 2021 05:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626094698; cv=none; d=google.com; s=arc-20160816; b=R33zEqJfRupoxMFa6/SZLENLY2aQ+Ho03K4DsXOMiHHWfoY6ulL0krkEaYT/jC6nKC eTElqZoko5BIKYnDkA5LRbMyMzFMFpoSfobR2jaY1T3uhB+rNrszM4R54yJbqoG2s37N P3pgqUQfwlgyy+q6pV3CvpEAsu+a1t4IKzgaRFp+lASM+f53ii9rGLoFKJQQhqkL+0Qy f08FQVVStBnLAA3q3TwxatibGWXhUC/xBchtln5tcNrYL6/7T5jFcvIrV4+McDMaATRD l3FdwcPHTWE9B0/nlOWd2q8P2LL8k9rfICiYvTDdxfz33D0J53dWqZjuyjdD+/LvH2BC 3fJw== 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=6ostg12cD5MaGqrOjfyo2IBJRdLr2Aw7UmUZUCJ1UFE=; b=lYU0gYBbYrRUS5PvAyq5goE0e3/Z2MFxZqqXS2926UiaJIImOXv64PP9TN7+lAH3Ka uVdch1xYevwZSKbw0J2mI0ZKg98hxIR+UdKhX5QAu5t5MpiwhbvgT0czhk1dYuZl68ni v2RiNN/T+HOx7fmAjEIKFkyRDUacHs2ralZSUV8yckf3Nz2tjA8nu3yHJbBORLbMND9N kDz1VjIL51BFl1k6fhaUU6G/pbSUguN9DcllihWmavPJQpjzBUNdxLdlrGAOPI7nspst 1P1JDKc0zVOtIYGyBKJD3KDLfgHtP/GVtflrGw/B7b6uYZrTt/M0xHt8tKeH292elit+ D2Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jQVXrWOw; 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 q7si16885712uaj.166.2021.07.12.05.58.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:58:18 -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=jQVXrWOw; 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]:44236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vVp-0001k4-TJ for patch@linaro.org; Mon, 12 Jul 2021 08:58:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v7N-0004oZ-Id for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:52069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v7L-0002KW-V7 for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:33:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id n4so888092wms.1 for ; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6ostg12cD5MaGqrOjfyo2IBJRdLr2Aw7UmUZUCJ1UFE=; b=jQVXrWOw4NrpQ0U4Ea35l5qqnI3T1pMAsthDfYUJNcVE9QiAsZKz3KBgvwlAaO5tML HPYVbKeOsS9COeGnDZByEOvT6GiL4EOIY5mPhTqaayRRs0PIk6txqi/CPtZ8vyTFIV4W GW0IMxHRR2+Sh9M4hJFnwwmGQAolay0NJjbN2wsW/pysmy5DuS+csHhem3UZbQvNA/VQ VqxK2RSrvybvuUoVRygJehEWKswwnx62tGJEekS5Wvl2P8+CWeblqcm8qAHj+CmSqsc/ cUzsVPXg7fmY0bjSfeGtxu/MRcDvq7gZaGa5PfUMZ6F0WksqLkT+Z6cELY1W6acHInWb zJOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6ostg12cD5MaGqrOjfyo2IBJRdLr2Aw7UmUZUCJ1UFE=; b=CoJynn4oCaxHYfj98scLWK/Zjs+8nfvjqs80/WBcP3QfZJ+CT/RBXNC9jPx/g3Jlof c8rSv2gX3NZLn+3sN7pskBcqZ26V/3SRXIQwLpjWIlrf1raM7toddQ3kug6KSQeTFvrj eIVMMhWfmHHZPhc7kyEmKbiwiryUNa/drPEG1bxwd6WqbpruIETYmNiyO1vskY1t1IND TisF5QjAoKr3Fj0isltxbsPbeOobx2kOAE4oVMif73F77nE+ltpNr4zlQcBE8QUj6uU1 Egdz8T8D2MSx9eexFLkZN7HdVFG9K6KeBAXHc+ij2ikaQV2+oqcQ7eGHZgRfFiT0FBrD nxww== X-Gm-Message-State: AOAM5328AUA4szALsJDRxALvhh1gPQtxjNLQBub6+g6Ctjhj/1+VURMv Sl9QuG1p924/iP4Cjibz5r2JSA== X-Received: by 2002:a7b:c5c8:: with SMTP id n8mr14317188wmk.124.1626093178045; Mon, 12 Jul 2021 05:32:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k20sm13143774wrd.70.2021.07.12.05.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:32:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 02DAF1FFC2; Mon, 12 Jul 2021 13:26:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Date: Mon, 12 Jul 2021 13:26:53 +0100 Message-Id: <20210712122653.11354-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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> Message-Id: <20210709143005.1554-41-alex.bennee@linaro.org> -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 97ad270762..af7764e04a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3019,6 +3019,7 @@ F: include/tcg/ TCG Plugins M: Alex Bennée R: Alexandre Iooss +R: Mahmoud Mandour S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/