From patchwork Wed Jul 14 14:59: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: 476748 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp651503jao; Wed, 14 Jul 2021 08:02:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6AOFQIN1DDCjG3MZtWzQJPPYVQP2jVkP3NaCwCtbkDxJMb1F+8J97OKVGqxg/LWwq8LP8 X-Received: by 2002:a5d:4c52:: with SMTP id n18mr13722375wrt.295.1626274974601; Wed, 14 Jul 2021 08:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626274974; cv=none; d=google.com; s=arc-20160816; b=BXxYIIXLz9k3ay36c9ywAKoa7uTDnVx7tgKY/67msHdao/OqmmRG90TCMOedCc6hKp 4BqIzbsgRfp/F5McRlcKTdhC6qr0IUPQsqbsgqvPkaM1U75HqVZBGsjztbO0jddEkTbG MuvGVW6Fnomce5do+riqKKiuVuHtiyVe5GeiaSDfRrHIpmG+DnprmoQlAhXIiuPQZNwm Gpz8Y5DraFGmCnEAqFMOqqxP+ZaT+3zkgCplphaXsscnDhUxKUIVF190kJHPxb2M9wfg n9MkkcUOLsC9DkJIxI3RqKj+trRqY7Vh34xtbEqIXxqM2sHXSBQlconzmz63VFr6lcx8 iQgg== 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=ZaFzUXmMyFrsEvHj9goisVPKPdSkTlsqME6vVUknvZ0=; b=05ZpHJr/tIkBXsDY17HvOCvSAqFOdC5Tg4Z8Vfjgjz1k3fSrnfP0kG6H6qxMidrHSF bytRJrr/GhJeR6iiRekwSmh83PatrRqr/MWxqGdieMegK+RoMBSLRPX//KPCaphcq+gg 87GOK9ns3qHcWiNTuAE3ptvxui7kHRFOZPn6xKmF8WSZfu3xgTRBfQs5CeOmEad5bkdC zJ0OHYGnzAPXWxylRVcTkAsQXoY0TxBSGbyzQcJAWkJcmps7+Uumzb12CAnEbFuYkXDY 8/n+J9QNZAbubjH1OraW3PmT5wbnzJZ5MOZSZ+m9qxNg9hn/qjnipSNvInFjFE8Jsl6a 3NnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Vmtd/FeQ"; 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 l5si9773062wmi.171.2021.07.14.08.02.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:02:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Vmtd/FeQ"; 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]:49412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gPV-000202-8I for patch@linaro.org; Wed, 14 Jul 2021 11:02:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNU-00073m-5L for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:48 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:35547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNN-0007Od-Px for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:47 -0400 Received: by mail-wr1-x42f.google.com with SMTP id m2so3644615wrq.2 for ; Wed, 14 Jul 2021 08:00:41 -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=ZaFzUXmMyFrsEvHj9goisVPKPdSkTlsqME6vVUknvZ0=; b=Vmtd/FeQ5c4bKTe35tZoyipmBtwnJF0YBLlwmUZhxCaXoU15bWI56G/+e6q2ALigIT eaoL95hr4exVqhvmi8KiUvGgym2e69Ni8hzUXjYUm/IwUN4Vp8HNxl1F5A4cuXqykwOu nqmyt68w/uwH76/VJCbsEXvL8z3Rjsxdj7FRqHXuXqe6EOVWnhxhACzOAgKIdwnFOwR3 64Ns5QKNIIVFV6+5KqFHufkzQHQQoF5KUGC3X8ojRejkk8gSHnegQ7osixKyjsgFrCpY e2wwUcUbsJ8QEuukU1RLaMsnCtKrhFmUIUxZm6nXjY9BW4laotBEuFIppr15kHi2ITzY ff8g== 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=ZaFzUXmMyFrsEvHj9goisVPKPdSkTlsqME6vVUknvZ0=; b=FtfKv9NSSqBjVduZC+O4XJwzYCH7Ip1JfG+StVg3NiY4wnh1E3MbMG0zLnZkOnsJsG ZBJeRxMIVuVoynh8QnhZxdQs4kSgmE15KDEqWMFxnN1sEBCSWaPBdHpP8AcCFvnv9NPE GkUrLeK3p/S8rGbrqnXOIAvo3DyVMewoL2/lP6djnE98R2Nzb41JLyvehVJ7GWVTxqGc 2SSq97HraeWWhIzZmNDTf9qKuF5TKPonskUlx5PlMtulKggd3ehJMgl4swc1DFwOk+gq +qzkZ9pABQEfQBc3qml9TookFZjzlN/6n2rJHJFTmxWw7Ygqx6Ln+T9oBkbnF83PkLh8 jcZw== X-Gm-Message-State: AOAM530AZslOxOJHdVT38gKLFBaHKk5a5AfyhttyUBp3n2xFU+YxTAAt IP4E9cyRA1ecCDq6Hthva2Zfcg== X-Received: by 2002:a5d:4ac6:: with SMTP id y6mr13492997wrs.347.1626274839747; Wed, 14 Jul 2021 08:00:39 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l20sm2632725wmq.3.2021.07.14.08.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C73541FF87; Wed, 14 Jul 2021 16:00:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 01/44] Jobs based on custom runners: documentation and configuration placeholder Date: Wed, 14 Jul 2021 15:59:53 +0100 Message-Id: <20210714150036.21060-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 , 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 ba90badbbd..40a7e2ee6f 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 Wed Jul 14 14:59:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476750 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp652503jao; Wed, 14 Jul 2021 08:03:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaGJOO1qGdsFS9K6y4AOrISG8wl6vCfUnmg8N377CJgDWEABTW6Qr7zx5i7FbxRUrdscmc X-Received: by 2002:ab0:1362:: with SMTP id h31mr14669511uae.24.1626275035294; Wed, 14 Jul 2021 08:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275035; cv=none; d=google.com; s=arc-20160816; b=AfaeMpStkEmR8YcH6fSwfz7vxV9PLwvkBaCRnvmPw5YCxqVB5kiDBh2VGDX+LghK0C 75rapz98gumXcDBUSC/q+oTXhP3kyZ5zbvpO/Rj3ynt/cRoNMvjKajDAttsq87R+/V+q zDs1b90+YVZqShz6yHcV0g42zjosONjKNsEMyshLiOV4zZNGkB0dfkxBReD5cZfYMljk 7n5NRj/7LgPxw2o3GvbSExDMcJlSyCjdg0G1ZL2/oYwh93MrIcCqQEyRBEkPJUMIHlrt c4dOLSLr3IsidUIMFhH0P43CTjpoRK6LU16icRVCPWCJpN4Vn+yPfSe9hPQrD1uRFMRg LuPw== 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=nuuJhBl5DttsQJoSWeOS4A8yGve9zFpgY3O9aW/aE+CKO/mpikXlZ2u+vqTshbaCp2 TR6gmAXe2baBIsn++H6DlTB++GNGLUrImDrQqPqvsorNwEfta9SmJHLBX6NTddkLWkZH iveWF5Nj+UaL52c9M79YMRU2n+N8kM7HSgsflcPqb09vsGBmF8oOFt3f2sn/DLEW2kJX z8EZEdjOfiBlZN1CUsfpZ0RMC5iBRiU/yvhEEubvnxUW8VoMA7dzNNKZ93OwL9US5xyV S5oLg2/o0/jS/ywo8neDwwib6zkvnSwBJnogkbjpHPNd/7nzXcGRkYXLSLWLjxZr8Xv4 3n7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Vd/QJ76g"; 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 x12si3398517vse.398.2021.07.14.08.03.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:03: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="Vd/QJ76g"; 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]:53256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gQU-0004Wl-IK for patch@linaro.org; Wed, 14 Jul 2021 11:03:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNY-0007Ax-Nd for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:52 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:46809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNT-0007Qo-6Y for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:52 -0400 Received: by mail-wm1-x32a.google.com with SMTP id o30-20020a05600c511eb029022e0571d1a0so1622687wms.5 for ; Wed, 14 Jul 2021 08:00:43 -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=Vd/QJ76gAjAARYxJqMY1pYTVfWlFFNAp0+rY51MZrZinVAri9uxBVY0gvrSH85q1OL lEOoOITTeZFLeN9SMDnhpTvyLzOn9eY7E2oGeQZwehuczVsCB83/YzZyqFeZK8SLdQnV Qw4IuZzLdDixeQbrHaU8hikZm/6SrS5gAH0FkiNz7Pql+2wGgjdZqXfQns1o5zhMaPfy 1d8S9v+j66GOx5aDSUpsV4rTmVTboOQsyIQNDQwXCTyAvjW+NAaEQsJjFDWpD9I40jdJ L2wYPUQHyUFz1HrADDp471YfKevj2OlQ0+OKWJKAarFHbO0dv8cdzH9/kzSLOSH3qpgQ 5zyg== 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=mvwEle93Zy6Q0p/wzxC0BhJ1p3cZy+tnR0N27h1/GIoclRl4tXdi9y0gIbALdRNRBr 9GAkEhcewZykgfaMKMSc22fPs/S7+ui2EGA+ZszpplBHtuJ/rXyzSkdII2TFDLQlxw0K lDRZxuna8b5NUxzzH/BuIaeJ2VEfwhPhK1UOovRGJ2kOcnVEcIFsxJGxYmNNFkKbp3hI QtLyl1zlJzG5q/UtqTIq56Kog5A7b9ZuabP45gwQ97WssX5PcYmaUp9AptTMq9eh0DWa R7SvXhPzhux74EH4Gn8NoEggG1ryHni1858gapL+VXqLpeblela7duf1maVZ2LyWuIGp NWoQ== X-Gm-Message-State: AOAM531rARTDD8/zgbotiY9v7TJ4Fides4bIJb72xygoGz1wCipLQTm8 2hUtqaRFeFYnoCP42UUTIXrgaQ== X-Received: by 2002:a7b:ce82:: with SMTP id q2mr4538381wmj.60.1626274842563; Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p16sm2943239wrs.52.2021.07.14.08.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E67D61FF8C; Wed, 14 Jul 2021 16:00:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 02/44] Jobs based on custom runners: build environment docs and playbook Date: Wed, 14 Jul 2021 15:59:54 +0100 Message-Id: <20210714150036.21060-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?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 Wed Jul 14 14:59:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476746 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp649993jao; Wed, 14 Jul 2021 08:01:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYfdEQFpt92qjtuWMxCtXom7f3UCgu5WrKvajHpDTDflHNhCKawZeMbYdhyGTFXg5uKMF4 X-Received: by 2002:a5d:6506:: with SMTP id x6mr13288181wru.86.1626274900240; Wed, 14 Jul 2021 08:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626274900; cv=none; d=google.com; s=arc-20160816; b=m1svwe02FzRSsaZQHW0jBzG/SqkKGK130U8CKuCr/M/GBgd9TZzM+yH98cfUCG6wTH eb5JWca4PergbDhLMKcnTLD5Fj76HWvDBZ5JU/TzTe3zwijd8u0Rd+2yHzA0XeTzRgH6 zJI3mcx6MuZGEuNoA3zzy4MzyoeJeH8hjfhElEqr04wmhuVN95EY3OU9630YhUmKI2TP 5BX8lLdu2KrUkhRLHk0gQrBoAZabJyeaKeyqV/2a8ExIGExPWUk+dyNtozholELEuf4g aMoPFHS6PFOFWb5jh+bFnBumJATVORAgmwzWsPoKypW3ClHVH6K0tGK7q/eaLBMNgkMJ dRFw== 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=ZwTSB5pDPXRdwbzI5ELPntLoeTN3ZWA36lD5vow5A4h/pAmTOlw1Q/AX9h+neTgVNj b4NNO9MmqjrEuGOgBq5oDTEBOdhDQPXDTKiSYOVYlu+ODGJI1SGE+d1xMjDa6SmBj0fr xa/7FwDzDSDf/yjeQDwLWUrclRDU7knL5xckx/xo8nGlsU0n4Fl9dAIrbr1JpzIBSoYd hyGzrnQg04K0FEc3UpLLbsKrnVdayyvysM6xpFMdapcPEQ7Hr7Iu1Bm/wYOcU7pGKesU waNHHlxnxyqqUtMQiE5q5pBmM186O3ouFzVfoHSBBkTP/VYZsLMKIn9bYbY6asiYJWsj lLJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hVZVZdDz; 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 l1si3387908wru.317.2021.07.14.08.01.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:01:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hVZVZdDz; 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]:44640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gOJ-0007AY-4t for patch@linaro.org; Wed, 14 Jul 2021 11:01:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNW-00076R-Hq for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:50 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:42926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNT-0007SB-4X for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:50 -0400 Received: by mail-wr1-x42a.google.com with SMTP id r11so3592560wro.9 for ; Wed, 14 Jul 2021 08:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tx0LVkEeNkiisbZ/NNlmcCoTtxFb5VF+oTFhCuDdy2I=; b=hVZVZdDzVJiRM+pEOPCHh8Lv5FrkkZlean3l8+4rMrQcNzdVoAHP9pSXKrIpY1URMg Jc+HY/t474giwnMRHdChPgdseRq299RBDTkfkI5HqgHToOIo7oJAkq9KYZJtlcQktxO1 ofhNiD8MTJ1739jngyqyj1D96/aRkTn0eJEbwKHpK8BdBC/fN57MO6Z1yiXE3Lc+j5Be GsHnfJeIkHrWz5OM7KHPZXFsMEmoA66+bSj4ovkna5hhzqUSFRDSux/EwDyxGNBLJEVH P1C9vcNuTzZjUad50QLnT0sEVBtWDN2wS3kPQyPeEm7Lo5gi+vMTqdhYbxVe/sxARbnd FM1g== 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=kqU14kQtVYQU8eKzmnFLSuthR7vE3B3bZWDlHWK/VdCD1KtPFmGuCcaeLqk63K5w5h u5RCKXKO2ZYxGONHsR/QbbO4ormlKR0tocJuQO0rmtKNJOqpoXF8I+qhQmiU+YYJ6wd9 djACCPn0Vv1dumDxWssM98qH58TRFI+viuBieuhjN1eMgas4NkNfFxQOFD1hXM5Eb0ca HwDx+r0NFb/wU1jwBEQFmTAqkSzg2E0/saTZxGEwrV09bh6nGqPzRTiCW0iOUhr/4QVk vX7K4B6mr+dZgC9CiksE7IeoWI5WMvSSsehHrjWTKrJDZaciQ2gp6LcqdrG8utQ7VCZo YKaQ== X-Gm-Message-State: AOAM532UWSOuuZiF/4tBlq28L2XgtAge3utso42M1bmRvLtirlwb98gi 963QmI215GJS9LNjJctziG/9cQ== X-Received: by 2002:adf:d4c7:: with SMTP id w7mr14181477wrk.198.1626274845416; Wed, 14 Jul 2021 08:00:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n20sm2348186wmk.12.2021.07.14.08.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 10D361FF8F; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook Date: Wed, 14 Jul 2021 15:59:55 +0100 Message-Id: <20210714150036.21060-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 Wed Jul 14 14:59:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476751 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp652537jao; Wed, 14 Jul 2021 08:03:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzldtSlY3EXTupq05bgq/XNPDQR4yBjmvyza34ZjDrKpmHuvRcqbbBtH4zhH9WzFW78REUc X-Received: by 2002:ac8:1005:: with SMTP id z5mr1747859qti.255.1626275037132; Wed, 14 Jul 2021 08:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275037; cv=none; d=google.com; s=arc-20160816; b=rJfTMsGb6bR8oWncpIyjHY8w1GbP4Il8VdNtRkvH6X8n1N0UJ6kOCNgCtv6dpLhnT2 4Sgz/FaO9BfmeAqB5UPhfYoClQeyamgur/v3ZW4D3LmOE5qbtBD3sCa5pV+n4aEVNOMX IvBQ9ZSch2aCAIVzTFNiF/toLr401/IzJpvlTPj/dYP+jJ5naGlqj0pdRQQBod4Y08m/ eUe0dzcHIUxk50JE1I8/liUL6Ifq4L1w7TkoNKpvMAKM4HyI2UcIcON0bWxlKlbOpBtf mc38LaVkGETphUSje8DftmfhfrfDlVCHhKxFwCAzw8LJJ1R+mHzRKmnPIUwCPeW+2YmR eM6A== 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=WWmDBlvYlea293ZBSLa0JI9dDF+ozB8sAVBrhEwzMHlNAFH9l0SPUtcBV5JJyr5ZVU 1I4KmuQCgHu24RvVs071i3ej3pulmdBilazeQzc3toJTyNJ5FL2AjHh3xOC04S6JDxCf UoA5xbCJ7AuyxSB9w4/QyMXs68F3XY90bXtA3NnsFY8ECTRGBccK1ou8Vt0/eexnjSIW K+UXijRRMXWo0rbVBrJAjh17h5w+z+p1/lc8523st5zAeV+D7xno6ztjOmqlKXvsozsK cSM1Lfvl1FQ2KYfzg4mqFzJ+XOjjJpRWtTpiw3OkGr1GMfzjLTlYhS7dEis9aHxf6G/+ 8YMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X6fXpqJh; 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 v7si3093175vsr.224.2021.07.14.08.03.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:03:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X6fXpqJh; 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]:53368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gQV-0004ai-SF for patch@linaro.org; Wed, 14 Jul 2021 11:03:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNX-00076s-2E for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNT-0007Qu-Qm for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:50 -0400 Received: by mail-wr1-x434.google.com with SMTP id v5so3625880wrt.3 for ; Wed, 14 Jul 2021 08:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b6+2YpmRJo+t9z+91U4/97Xqig9ZrIJ/x3b1t8CbEwM=; b=X6fXpqJh3I+uzGY+Gl17TqwrNWMygrdThUOLayTtI/T3jUGOCSCsIWaIO+2N3w5jsq 7lYeNl7oSIKwHnMRROHUgs4Wi04sKwfVqtZoGLKYW5B249yUymfDoG7Zn0mbY/pshk4X sNYvRRRi14T8FbYX8Dd9siicsfwocbsXow8bSepnrPl8xvs9wd4NTE8VrBGYkbR3rrGd 72Zt1gPB0ZkxQfNVLfEbco5PNKrjsZOIJ6TorEuy/u02vf/pQhAG/tlAwZRm+WW5WShE pXite7cKBq6SYWLjFxjDHj99Z6h20FPFyRdw5kogGHBSOt4yGwCTf9QJceWX/L7PytHC OwZw== 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=etOohdB4PPrU9Q7A+JxnxmNutlvnoA7NoncWO1msryZZ/91/gd78nhUgXll9XUOt22 mhxwL9oiM3rZrTkn3R2Ck7VcmDRIHAbmc1QagFE+rGpiG3PHJq2qT3NU39hGgFHLgjeB eW8sgnw31ouvDtUV0UAeaafdBAvRkXVV20X/xiZP2ROn1o3dwHaQWmLc46d68ASQYLGO 2R/cHwbJJ05dTupIzUIaGqPoxasgYp6GhWmxY9W6Zpum7mMeiEYF5X11NJXqgyZJ1VTU Fp3aXAEZi2ekNnIlhm83kNZWkm7o+fg5SN6O//zNO7uc7+hYyeDPTgjdfPIu65FI7LxD XQMw== X-Gm-Message-State: AOAM531svQL0uNxqemE0RC8cj3PzQdwUI3EMIxLLrhhKobZ/ccMiOksk iG3pT/CEZxx9GxhfFIZFbPfpBQG66NZ8Lg== X-Received: by 2002:a5d:4b44:: with SMTP id w4mr13080354wrs.275.1626274843481; Wed, 14 Jul 2021 08:00:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b20sm2704948wmj.7.2021.07.14.08.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 283981FF90; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 04/44] Jobs based on custom runners: add job definitions for QEMU's machines Date: Wed, 14 Jul 2021 15:59:56 +0100 Message-Id: <20210714150036.21060-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: -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 Wed Jul 14 14:59:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476754 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp655590jao; Wed, 14 Jul 2021 08:07:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+rAbejKhLeTdvodSMksGv5+xdX96w1q2Z7JVqnPmjVYJi3ZXoWKOi3dcbkdbnAPMi3Mts X-Received: by 2002:a5d:51c2:: with SMTP id n2mr13373021wrv.273.1626275229780; Wed, 14 Jul 2021 08:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275229; cv=none; d=google.com; s=arc-20160816; b=jshU03xiiFdSYZ91HLOVqAGLTnZCbQUWvRHdC68xYEIMoERlk2q9HoENgOGzffSIjF qmpOcTebAvnAX60/tNSKIBRFO3Vb5UFd3On99IpKKlvLzlgW7HLSeXavvce1WJtrwc+r ZdllI3KzWIIb4SlFHTG92iQQoSTtSrGZ36KMe0byaasZAN12KipeJ8x5QQLmAP32LoWw IIsYXJoPTU+WqauaKUc20g3mSIv5MMrwgZOIkdvQvxF1SfsgzmN2z04m85FbTNSuhB8l QzMxUyqGf/Fg7ZeNmpHuq6yuMbL5v6/pCso7j337FBiwZdSzXLSTrtjgMlOBoiV94sts vUDg== 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=MczHOqcdLoWxElksMGXRkUJuT9DwyDzq8Xjve6uQ6gY=; b=ykrPdRpT9FOz8CvTah84/FDwWpxqOufoX8wsZU52lvILf7rDtFudZWNZUMjZaIV7Fl DtL0qehX06vLOlrcdOvqTOyAXz3hbY8p9VriHvw3X8IfPaQRjM5EaLC2cRf84s9nIEPz 4s6Kns2G2jOOqFqnhTedi9WTpSFTY8fmk2rI3lDJdp8/yJwXstqBtFVSSUonUAZHYTzQ lchFWenKB8GrKz3Lvmcq5CIoGkPdJlEIMuUAjvwhlChv6x496RgESIY/qYmF4XA6Hkn5 nPg4IqV18WNHHKFVmjLJ6Fuka2l0KULMGBVUh5KPyQ/a79J2v3zJU8uty/keobdIACOz JTcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MEG7Iy+j; 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 z3si3437308wmp.179.2021.07.14.08.07.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:07: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=MEG7Iy+j; 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]:33812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gTc-0001zQ-Pi for patch@linaro.org; Wed, 14 Jul 2021 11:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNX-00078f-Pb for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNT-0007SG-R7 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l7so3601860wrv.7 for ; Wed, 14 Jul 2021 08:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MczHOqcdLoWxElksMGXRkUJuT9DwyDzq8Xjve6uQ6gY=; b=MEG7Iy+jNzlLLY9iecTQPOgj7g0EGObODvn/SgdakAChCFmpacxtKHcIbrDvCCNkaT 3pllNYx36idNTdzNY79ZP9XkJ+mXwRM0DrvdAh2h1H3pIpgEdikSV2yOkFEa1XPWJsfp dGGuOxBbO0BLITdD1P7Ix0d4ERa0TQoCZsAFCdmLtGGQGA1ixOsjRHvwygq3t05mgjbL 17b9eu9IuCK2uQl/DtCpe9Cp2eGTw3dmeMBYz/Rz4cbIZHrfIwgnHOi7u6NyH231LmSp Mm7vPW2YpeBdf+L9ec8QkmRe/FNBrvdGaJQFfefIY+udRwEmE0Rro5TKrjGDR8u9vFh5 CrKA== 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=MczHOqcdLoWxElksMGXRkUJuT9DwyDzq8Xjve6uQ6gY=; b=prLvcZ3o8KY8ZtRHNWQ250mpk1DJP+ZWaY/gHyaj/Y5zmWsNuRQysda0D4ubqEi9qR WaVG4dBi2IvAaCl5AYSeeXTC3XX5qJX3bXVecbEkex7AWfO+MoiX0qb+HB6m2C8vaigL yUD+FzPVPcMGU5AGT7lORrGM/3yEwpda60sCYeKy4OKr1Q6IRq/MHnQyfcn0joD9SgFw 8fyzhkWr6fzWy+a7wseLxLmAqUaAypVF2ak7COQPfqo9cfHmApm2zlTjRElwvgO8ZrLO bOfbi+PIfFdhnik1KAjzJNmw3/5K0yaTkKejcftYilSxNd93l1opFiYtVC74u4buYlW+ XrLw== X-Gm-Message-State: AOAM533+ubhIFVMBHjC8BYTc5XdqxF7jy3hftE1T9cvAHTp5RhK5x1/+ RXEFzAoN3EANcARww3KyB5aunw== X-Received: by 2002:adf:90e2:: with SMTP id i89mr14100707wri.338.1626274846277; Wed, 14 Jul 2021 08:00:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z11sm2801852wru.65.2021.07.14.08.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 413A11FF91; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 05/44] tests/tcg: also disable the signals test for plugins Date: Wed, 14 Jul 2021 15:59:57 +0100 Message-Id: <20210714150036.21060-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, Eduardo Habkost , Paolo Bonzini 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/i386/Makefile.target b/tests/tcg/i386/Makefile.target index f7efaab918..b0a2128980 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -65,6 +65,9 @@ run-plugin-%-with-libinsn.so: -d plugin -D $*-with-libinsn.so.pout $*, \ "$* (inline) on $(TARGET_NAME)") +run-plugin-signals-with-libinsn.so: + $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups and vdso support") + # Update TESTS I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS)) TESTS=$(MULTIARCH_TESTS) $(I386_TESTS) 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 Wed Jul 14 14:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476753 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp654685jao; Wed, 14 Jul 2021 08:06:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYxdr7Lx7tUeka7Qwc8pCMTYz93oJtRh+4/bjCwusi6AUgPxjNUbi6RvM3vNi5z6Lv3MFJ X-Received: by 2002:ab0:482c:: with SMTP id b41mr14553135uad.97.1626275170396; Wed, 14 Jul 2021 08:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275170; cv=none; d=google.com; s=arc-20160816; b=03al7u+8oGmyhuBpLyLFoV3bIHX/hrHEQVGGJ1rJQ74NjAHddgzOPbT1wdT3mMKR5j 1bdWSUsZRwv91iv1BeTo8d39UwAcT9FGeviUjmZGBOpNx1Hkb5avUCzMo7o0dCoSVFy3 IegGebqDe9jA1heTKdyJv4MT/x+/DE7cNHlsB6pNobjOZptNP3ncnVopaHQtECIkromO U5xrm8BlyEnI/YSKYa/jAvajbGb76KLDVDzc+T4v5DcAMzrE0nRyTtIJctKeIbzKtiY2 4e8DMJ/1Z5uU3jEOEfsgUhZGlVxif3rC7T494hSjXOS/2YYiiCxnoGeUBwiIWx9eTwvA +/OA== 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=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=0CE9SltvRz/j16I4X5pYEupvtceruM3KBvspMVNMDj6JgRy67U9Pm/q6fqtmr3+SAo zR5gQwQe26IgNLVQL8J/JTt8/kv7kkcYBCVVheB/oryG0FJIIdg2g7mlIvrWgXCu821A qI+D9a8QwBIGmVywwp+OvgNPG7sL94nILDJKB70pbB1+2GmbSvsSTZn4iVmuky3M2tZ0 iSvjBVSWBDUQY/96Fpw6khSH96pwFtU8Pu80ouquypGCYmeQ6fMmsJLF/3hpbllSX24u +kkjxwfsG8xmP0SXEdKTMQ1HxQaqyfCiLZ1nbZMOHDWweORhvRCw3Dkcf/2ZkaGyvuoH qxjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VynwIIa5; 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 j193si3061061vkj.30.2021.07.14.08.06.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VynwIIa5; 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]:58050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gSf-0007f6-AO for patch@linaro.org; Wed, 14 Jul 2021 11:06:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNa-0007CV-16 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNY-0007VI-AH for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id t5so3580821wrw.12 for ; Wed, 14 Jul 2021 08:00: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=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=VynwIIa5ZUGYdHqWJG2iyWY17zq7ytpSsQSoZ2p7zZgosDcEqDqh3tcrrMge0mU5M2 WdUyDlzceBxwUO74ZjFWOlaSNjNonUmICS1XIEzKKXixRfhb/VJx4WfTZcdxih3UgiHX iZ/kMY8YpgJ4n4SVARS7oVyQh2qinq/IdIqsyhKbjnjCJJlYPOMo/yG+Gw2c6RJVcl6k eGt09hoXOThH3rHOmgHLxQjpuR2TmeU6/Wxf38KJUU8nZk21SETNX6KLUSEZiBIkywr3 UxTS7Owu3ewsQ5HG5NNVemg2oAjE121YnF9bbRwAmM+bS+Dk647GHTCd6CAy5cKaT/BK F80Q== 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=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=ZCveyLWOWGFvsSOEL8CgATml0aTcCn8arEjFXRcHJmG4Vr9GJ/8N1vvI/hf9c6/zMT bldgJKHBNcQS03rOYyfeW0EVGkX/WCSXqaaEavwA33JrCBA1hYXaLatqnbDFF1TXiRDj vSg0jr3OyPLPToXmAYFiLL0LnuFgG9jpbC1fQhJpHWHfs+sMvSHYW9+5xu08DocQwh2o B/8HgzFeeZHM2+Cwz56sTdkh4E2k/dLY81Lnowotu9D0JugZBsQLdS4dduaLqa5Sa9tI FgHxyByKt3MRTJs3CpwtkKegL53w+ZwKQre4NSmYBqcOxouPgcj2HUUsWOZ3HCrjGeGc cGPA== X-Gm-Message-State: AOAM532Z8qvEWIzRlOT7RdhggTrAku9dL3n2bwwm8FXXsXNPUxQD9UmP N9oo7YJXKzII5wXuyYtygmG9eA== X-Received: by 2002:adf:f305:: with SMTP id i5mr13622221wro.122.1626274850939; Wed, 14 Jul 2021 08:00:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p11sm2756104wro.78.2021.07.14.08.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 569141FF92; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 06/44] meson: fix condition for io_uring stubs Date: Wed, 14 Jul 2021 15:59:58 +0100 Message-Id: <20210714150036.21060-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini CONFIG_LINUX_IO_URING is not included in config-host.mak and therefore is not usable in "when" clauses. Check the availability of the library, which matches the condition for the non-stubbed version block/io_uring.c. At this point, the difference between libraries that have config-host.mak entries and those that do not is quite confusing. The remaining ~dozen should be converted in 6.2. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210712151810.508249-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/stubs/meson.build b/stubs/meson.build index 2e79ff9f4d..d3fa8646b3 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -15,7 +15,9 @@ stub_ss.add(files('fdset.c')) stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) -stub_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('io_uring.c')) +if linux_io_uring.found() + stub_ss.add(files('io_uring.c')) +endif stub_ss.add(files('iothread-lock.c')) stub_ss.add(files('isa-bus.c')) stub_ss.add(files('is-daemonized.c')) From patchwork Wed Jul 14 14:59:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476752 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp653271jao; Wed, 14 Jul 2021 08:04:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEb4Kt7q4B8Zx7+ssEGph1gQAAywSRoojj63gtzkBQH1vbSENjYwgIqpuSWjrSKcGVOaXR X-Received: by 2002:a05:6102:22ca:: with SMTP id a10mr14473172vsh.3.1626275081340; Wed, 14 Jul 2021 08:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275081; cv=none; d=google.com; s=arc-20160816; b=jwBK1pbSU/tV0cu+Quv/X7HOuQ+n8LCyfEgrCmZZ+ut5zL8UGPcSweBzeXZpRwTqmP cEn4sFedtgRvS8xuY/ujXhOGiySdiQnQ2oB4pcvKJgSTMf0hX2OOLzWDchW3U6xMRHd1 r4K3DIwUgD/fJLyN5xMa5k8NX4+qb8uM0WrQcSNQyTb9U9vsF2ptF84JUMIAE9jhnEnC zmWhAy5jr3oxMC4k9jIxBlLLeC3kiqUs1AVCsJISv6t9MccLBrn6jP/EB8lqHpsRcRWQ RbDxlrxNyxbo8+8dJ7VsArNO2F3711L0LqoB8p3qpUcsv7r7pXBldHil+ZMw20S6cNrp 4KoA== 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=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=isN5jAxqWxYEHFxGzwT+XFzahKC9pbZwZ+vaKajZIO+36B7+qD3Q9Vv3q64CsezICQ LEs8q8WKGWjt3zGLX4HUIssRNEUe4rjKTTpYI+KegBz83fGt2iUBz3d9E9GH7PXQWx8d pBx412GLSkGGdX8C3FLfvOTt1LjAuSfTRgph3OCRPmNUn/RafG17lf9SDIhASP+kKoGB Sf9wdNGs0BRm5klWSGMD2inpgtvR9usHiMLtsWJFU5bav48Hyz+QzzHlAxu2O14cQnBO OIG4iEMpvEFIWL+rLWWs5Cc3nQ5fAum74k/W9MpQQonr1OlA0V1gl/zipUt9f/zhl67L e7zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tiGNv0CR; 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 d1si3308780uam.215.2021.07.14.08.04.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:04: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=tiGNv0CR; 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]:55740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gRE-00069w-JQ for patch@linaro.org; Wed, 14 Jul 2021 11:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNY-00079s-8j for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:52 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNW-0007UV-Cs for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l4-20020a05600c4f04b0290220f8455631so1642247wmq.1 for ; Wed, 14 Jul 2021 08:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=tiGNv0CRuJcAGEFuEJtYQEigvp2UlYc59hBbf1Pg8ON8z6x38/jUnvQEgWOiJvIENW CtECJK751xJsHNJPz+A5h61avDQson7y/nCXUkbVhFUA+s77DaGxFvK3AabNvQH8kkEm OJeQ2JlCat2FGUbqrsdf7KXZwGrt9v7LUJHn3f3MUA64S9nuDY+5PbQPuMEfSQuiK0ZD x8gjvbr+lZZDZ4OtRNqMlF/8dFm9UKMrJpQouPKJk7rX4VDqzjsj7bdl4oCM74CkRyFy BJdwPwPzV2XAggL1wQfUqXrf0h4LZA7xPl3xcrXEHT0W8Btt3Vb4y55Yk6ASkrtGQQ3x URrw== 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=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=GAbGITNySZ7MkZ5GyzIJQ/GRpPOrHjRG+rJP3dm1jEAHSRXb0gzn+DCWSTHr+iZJY4 fL0AI8Mqiox4AD9vt3vKtR69sgy1d4V9ozwtHNn6U3/DdNu7cgTX6B51RSnmb2v19yhM jz5ekOC5jYrEjudnvAB/7VdqRznD81JFmtuOm/3vAmIpGqKmA3Rt+PNV1c/3B1RA1fnL axTuuguLWMjrIcsisAiBxN0KWg3wdeKq95n1ut6cE8by++JtMnHXI3bPEwiaGB/pu+JV k3f5iQb8cD2narpjCmIpkjo8Xdwn6iTzrKuAqWvW019qEIaAxFJeMroA5L8BUYfnuvIA ENbQ== X-Gm-Message-State: AOAM531Q4Tv7B1okJteTPY7TG7lR5tYYvc+vZ85HfRdbYCvVImw9qosj 34V5Cfo08JH5mCWMaEfyAqS4nQ== X-Received: by 2002:a1c:1bd0:: with SMTP id b199mr11521091wmb.108.1626274849072; Wed, 14 Jul 2021 08:00:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm3555423wrt.45.2021.07.14.08.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D0F81FF93; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 07/44] disable modular TCG on Darwin Date: Wed, 14 Jul 2021 15:59:59 +0100 Message-Id: <20210714150036.21060-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?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: Paolo Bonzini Accelerator modularity does not work on Darwin: ld: illegal thread local variable reference to regular symbol _current_cpu for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) Fix by avoiding modular TCG builds. Signed-off-by: Paolo Bonzini Message-Id: <20210712122208.456264-1-pbonzini@redhat.com> [AJB: manually merged typo fix] Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/meson.build b/meson.build index b0e2b9a8a0..512ee2e926 100644 --- a/meson.build +++ b/meson.build @@ -92,7 +92,11 @@ if cpu in ['x86', 'x86_64'] } endif -modular_tcg = ['i386-softmmu', 'x86_64-softmmu'] +modular_tcg = [] +# Darwin does not support references to thread-local variables in modules +if targetos != 'darwin' + modular_tcg = ['i386-softmmu', 'x86_64-softmmu'] +endif edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] install_edk2_blobs = false From patchwork Wed Jul 14 15:00:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476749 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp651540jao; Wed, 14 Jul 2021 08:02:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh/r/iXfiAM5VswJw/zJj5XtiqSuFmuwYw0Q/D6VdNI1DDbys8btY2f5cddsljoXOSsNk7 X-Received: by 2002:ab0:377a:: with SMTP id o26mr14460692uat.103.1626274977056; Wed, 14 Jul 2021 08:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626274977; cv=none; d=google.com; s=arc-20160816; b=HMjDJimIAjwwXQxp4sRtz4AO/QNRHZr/wJVgw8At1D6uHLrk0QSOiDLx1RHAxA+WJp 0u1WjQQyKRTPnxGZJow7DCBkOsSOxqtTSywJ2MSM0BnPzRqa5vyX3CaDuONMe2k3yzZf /Z2Sr7voYeLlabVZOM1ykI1ZBAFcH2WssgriXgAlvQ3xqq8eJxfJBHTzTh2uu4mBfzt+ TwtKuONtcYwQp6dp68Xyzy2gJYr+uduKWwxDRBXn7DcG+dmmaOzTtVEQ4YODI8GxStnQ aSBwdhee+Acet/yDs/lIiiBa45fWssSbc0lLhGhC2DpKUVkLotNS5PEnmILoxkdI8FRl SwsQ== 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=f5eU90RHoit+tKKWWo0rk9BGq4kZjn+oIHBSezhYgfs=; b=vFjnMptKEah2xCDa8ZtLDFhn/vajfUyfJL+cby+tV0ZpuOVNo4MrfmDVEJmBZL+BYu CXZdVWakqRzE3NFpSAzaUZU8iKOWgX9LKikrXT7qMD2/xqKRsl/+ycXAgOW6199JU7BF WKNsi8vfjwHiVry40KpdvkP557IxfDjzBrGjI2yoiYPXe4wwKF8Bxu/iV8fKVgt8yae2 N9Bf1uc/XWbNYWChnNx50N3tUvpE9W6D0ksSahu4r05bSfH0v2gvuYw9Ea010exVq95B L8+8UJMJLfCsAe6NKuntpdCCk1FeqOEz+p7jILplj3e8XVQxN5nSJcE+4OTO9bZDgyu3 ltLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Bg1/SDkb"; 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 az13si3980970uab.192.2021.07.14.08.02.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:02:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Bg1/SDkb"; 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]:47188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gPY-0000Wb-B5 for patch@linaro.org; Wed, 14 Jul 2021 11:02:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNY-000799-13 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:52 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:40859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNW-0007Tx-74 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: by mail-wm1-x32a.google.com with SMTP id f8-20020a1c1f080000b029022d4c6cfc37so2796078wmf.5 for ; Wed, 14 Jul 2021 08:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f5eU90RHoit+tKKWWo0rk9BGq4kZjn+oIHBSezhYgfs=; b=Bg1/SDkbjehOECDO/t5PfYKJDvz6NSQMEpjfuwUbTq0jQvGfCaUlCTeR8pjk3boPKy ZdzprR1rxcbTVdcP4DhDpA/79bdZ1iVn4B0KWLgTo/+b610BoLxoaRHuL/wgRL9idM+i PzrFR1Z/WotdbtnTuISt2PjFABGxdoUgQywA1SscVgG/0x45TItZBZ8VtPpGi/yCJpWg G7Vst/QcJVVkJ90YJmsJ4SXLjKaWAO26CsyXIQSxxD1XdO7CeuzsnEEVhnule6d/D61b ZaUjhXjzitRlmVLaw21BxW6sLHQReeSSUrKxUROjcok2s2xd0Qd7UjGy0YBBqetTXOCQ cdUw== 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=f5eU90RHoit+tKKWWo0rk9BGq4kZjn+oIHBSezhYgfs=; b=jq+SrziW4r3hEIXf2Xnek3vY3aFwTEJYTXI1uXRmA9u6S8MeSoWpvCU4TLAs25ws9E PpQR1qNezMds1/cY1GLtaIACrKf5UCK2Az2VQP8m3p45MyiBBopeTLJfEJpIQmttFloV a3BEWlMUHB7hcJ+CFwVLrnFG9QoIpzSuMNZbLNtpDFbmj8umS1xIZsiLvleUp+d1Y7i0 URwu21G4fputrcXHrxPjIOwrFMd3iOWP1vqkz+u99hq2FYQL0kjK725/4R7gJP4IlQHZ geQMMuQhAcF6MD+eVm7FgarYNbSmVSrF5x3OA7G2q9J5d92P/0kLx8+0jVSaMYZ6EYQm 4oPA== X-Gm-Message-State: AOAM532pSn5AANypU8dsWJPMyvKp2911SGW+ukEmD7zU/uSi8xXat9zY SZxBZBCCqyL/NwKJ5ZkJmpr8GA== X-Received: by 2002:a05:600c:3644:: with SMTP id y4mr4726941wmq.85.1626274848197; Wed, 14 Jul 2021 08:00:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p3sm5427019wmq.17.2021.07.14.08.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 82AE61FF96; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 08/44] build: validate that system capstone works before using it Date: Wed, 14 Jul 2021 16:00:00 +0100 Message-Id: <20210714150036.21060-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 512ee2e926..89c09ed7ea 100644 --- a/meson.build +++ b/meson.build @@ -1657,6 +1657,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 Wed Jul 14 15:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476760 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp658446jao; Wed, 14 Jul 2021 08:10:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMDgmffYloED+vsKnjTKNd/XcvfT9jLSd9s2xMnaNpaaXEgF/dnmSezzQFkXOvyt4wjuTq X-Received: by 2002:a05:6102:949:: with SMTP id a9mr14524464vsi.54.1626275418342; Wed, 14 Jul 2021 08:10:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275418; cv=none; d=google.com; s=arc-20160816; b=x8wGVQ5l8Vr+mC1zmHBXcUtaWPl895g8gOYbLkujn81gyVcPrBLpYCvy/U5dpT1VC+ poj2i+rky9ipLbW+2KfPCd2E8mk9DVxb/jx0KfuhjnOnmJ9QOYopAy7hCvcOSipSrSBZ dW03gP7MeNQTa36OKKCzaTIBdG7ekKuEtgc0Y0qS3n8pQ7KsMRJI3zkju8XvCtWYSFTp RBFHiosxhdc8yk/OG5QehnlX3S2erViKLDRLtHzOqG6GgfbZpXrwWuEGWX0ZeDrvtEtC fpablOBdsFcNoEJvLI91F+cRnW1qKTYHmIDPe4nLm8CAMhoJ53LDC9kKzcbLxO7mFHEY AhLg== 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=FUdT6OvlcF6+BKrpWvST33RTn8QyVsCinVT9QUy15ho=; b=rC1MkNWBz2Ly/0yYoZ9bpTTpw+Q5L0up2k8OkzS4eUMNVTTQ2xeC1OGaI8uDN+F/34 asrhSfXptzU5Qauum645rzVyF6KcLK7vpu4s61huhaMahhVvl0jLyvUiiQlgkpWbEtAE 60LeHswxouxxLdRcuh0E6aJ0ecBfVR+eytUa+GuG/Bqd1BkJC/IqwuQjDUcG0XHirnzr 6wYKlrXUF1juv3AJOqfkrXa6sggcNTn5rdXL4EDAfGOjfd3/fZX3dsi6UxX+vEFSJPcv GELLNbLtGHv2CsRjTLgo9AUPbBEODBfuXQ4CVX3wNjNMPEjEG3WmHRh8c2VgMAzGTgqs wg9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HWldLJVo; 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 p22si3400019vsj.182.2021.07.14.08.10.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:10: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=HWldLJVo; 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]:45792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gWf-0001Rh-Ja for patch@linaro.org; Wed, 14 Jul 2021 11:10:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNe-0007IX-Bh for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:46816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNb-0007Xn-GY for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id o30-20020a05600c511eb029022e0571d1a0so1623147wms.5 for ; Wed, 14 Jul 2021 08:00: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=FUdT6OvlcF6+BKrpWvST33RTn8QyVsCinVT9QUy15ho=; b=HWldLJVoTOm0K1p7A1MUoT05f2DB1VMjIK8RDe0tddxhKVNfKngclBxJVgvRZisz4N gvjH5mMUehsj3XDlBC3c9bKpYcGLEy2AcOWkQP+ix+h5st0yyCAB8q5sMpwUWYlH7OK8 +Zxtw4EQBCXNlB52rNOB+/4N9xcJa5sDPlAOoF4ol/Rk9EBrQ1GFMyK0vqiBbeIcmHIm p47C0oJkK0yz3wV0K8slp84Tqh/7uYWs5B/ZZxJbcMtW+RebQdFoYi3aEkzQobN8Rgnk K1oZiUq3antQZm8IwNXISxc9YCRLOnJNkBCKb0aBXwPPPNc5hmQOaA0fia3FXlJZFGRs yihw== 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=FUdT6OvlcF6+BKrpWvST33RTn8QyVsCinVT9QUy15ho=; b=rhGMKkEXWtA+JoFViWI5Yj2dlOGVmxTiKP+/JoYv/rL3A/yyY53nvdqJO6n+Im3VzS g3dWOvHB0tfU1BnxkJejCYA4p4WbzK0Itl0hN+guXOdjlsvI4JS/Cu2NTQtP9B54AoLw g8Le/wt+BxqP9niMEv2VwzJ2rHzzwfp1a3WwlWa/BUEzXDhT+BhLybLzgNkE8g+JXXma s2LwbTQPkSAKSDcUgo0S4XvGua3wJmmKtmanpT9m2jSXrCuG041xYGT20VNogG1H/FGN QV4UtErMqfWtN5q6GGhhl/PW9SVbX1z9T0CwpbCb8AKA0VLOLbKtC2HgeoSPADvrNZIe 3dMA== X-Gm-Message-State: AOAM530KpbI7cHqqL9cZ4fXhuKPWyooru3ax6hKdbedJET4Btv7NHYDO r7lHyaZsNe125Z1A6XJgefBfRg== X-Received: by 2002:a7b:ca50:: with SMTP id m16mr4617324wml.140.1626274853741; Wed, 14 Jul 2021 08:00:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y66sm2398795wmy.39.2021.07.14.08.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A76331FF98; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Date: Wed, 14 Jul 2021 16:00:01 +0100 Message-Id: <20210714150036.21060-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: -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?= , 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, s/py37/py38/] 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..2099b21354 --- /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.8' +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 py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-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..323fe806d5 --- /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.8' +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 py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-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 Wed Jul 14 15:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476758 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp657348jao; Wed, 14 Jul 2021 08:09:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzclHf2ZpliyzhlL3LUhFX5ONAoRi12lSV8awDggohPnXC3POhntmQUivdJexShxuan5Dg1 X-Received: by 2002:a1f:9993:: with SMTP id b141mr12661322vke.5.1626275346844; Wed, 14 Jul 2021 08:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275346; cv=none; d=google.com; s=arc-20160816; b=PWRkA/PYTNawdcahqWryleqZ5ZLKq1c4gd/N/m/OsFHMOTYxdAcHRKezknWkwF5xRU bOKcxXzESQjcTGKcnyl00ujqvevv8VN3y3oZvP8SNLA9XxZ1l4RjSswV/bFWJPdhSl+f TV+6phUCQjzTKjPKnkuvGznPwsqtJPAkObkCaV3f4akhy1gla5tnlgCWLEahZkpkPMI3 sl1WEecp1c+KeLdzQ/Npc1I1mcVcXBm0dMtq2/noC5XrjqWJdqg9amuiN/iYxlhSxVc4 +zxddG9HPFxSg1m0BZXqx20ZaYQ5gyaN2/z904lCa6dSdX/oG8N3s93GfAVYymsemVHw k0Hg== 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=zOZZnoOsuj9UPd5q0qG0fBaL7sOcZqnZh2L7eD7kzDVvrLOCot8l/Xc1gIe9ZDQS22 PLhEyxELlREa3Wjh/8R6hoC4bETb98g1jhnPqqDRnuWATtD71f0qrdL1r/cG3xZbuGjn c+QGVorgWOzzN0Rzat3KgECik6pO1ZCWkClsxWHbbxhkY0k4dlGmFui/JDh49Faa6UMx YCjGoEpQoMbnqhX7e54nmNtUYlXPoHercJeG8QIDmphTjpn10NZG/+tRdn/D91s+KCbv 3s4x5RkgMHjmFQeSQ66ZCsz09FvFeGsTwmlvVeRHqzYTZ7L6pj7oYnbKCzUiPndT+ZjP D9+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TzheEzIT; 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 ay41si3148367vkb.75.2021.07.14.08.09.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:09: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=TzheEzIT; 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]:41154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gVW-0006pl-60 for patch@linaro.org; Wed, 14 Jul 2021 11:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNi-0007M4-1T for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:03 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:33602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNe-0007a3-0B for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:01 -0400 Received: by mail-wm1-x32c.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso3614804wme.0 for ; Wed, 14 Jul 2021 08:00: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=Gya0rhZdDHpqfN5h59vk9zddDbflAcf+45r7VgBsyyE=; b=TzheEzITjchtbCE5o49Ofy9YcG/tSiW8wyLlGvT8MiFC8C1IDwBYb1uuPZwVb0SVSb a7JBLqgIWk1Zr2W+S5QX5sCnSyVdWxGrSRQ4cd6V0wqumh4fdY5KVU7N2SnUG+9bz7FJ SNIPo4JjJJyw2/Ui8UZKxMDU4t91SPPpeEGP173/FT0Jaoeet2QDwV6TXbmaiZT6UGLG l2IT1L+PhbgXPk4pZNw7U8cc8ObT192zSl7kw+sjtopt7R+VCJefhttOS2jLthlvM+uG VDQLYJnnqnZpbNMkN1X/IBViEBawk2jiFl98m65zmqBxtyZzr363bhtIO+1ZDk6n+msw Wsxw== 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=jq2+9GZmJMTbwErBCuMaHVECUyem8HKwl4zW17fZQ2Sp0Ca5eu/bWGMXK8d7ww/ddX u++Hqe6KEohfNo+x5DsdmdwHVYwOI3THmMl/ej91/oDQ+ecflGc0+rwfn+bMj4mPmZ1U adUz6wLfAr2uSOwIIM/Ak2BLLpitgS5fwpsRvmCe9IGWVg6Dxhcgj0SNDGws/znAPawa AjDL95fuZwgITMyA5+AJKjSwFai4w0b2F5kdwKN22aEQqqiQu0RoikkOxeSZR92GTIFU A9kxeccfC/7G8tIrcDVCTLSVegFPt2sApVQFqR6nOLPjBweLaGPc1nvng7pjHn9AhnS2 ylOQ== X-Gm-Message-State: AOAM532gvbAS6u43fVjbfsvyHym5ZCQE4RhDqUeSBpzar07THTEvNFen nVIILQnKI5IhGUV3SvFm1NCbAw== X-Received: by 2002:a1c:a903:: with SMTP id s3mr4609535wme.58.1626274856203; Wed, 14 Jul 2021 08:00:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm2904719wrw.56.2021.07.14.08.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF9231FF99; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 10/44] cirrus: delete FreeBSD and macOS jobs Date: Wed, 14 Jul 2021 16:00:02 +0100 Message-Id: <20210714150036.21060-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476756 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp656149jao; Wed, 14 Jul 2021 08:07:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzki8dQsc2hdgCcBHQyfSpZOCmSwKvJCgplgpatA1GspbOa4c1CVnTl4Yk3xSF9IEQ6lXDC X-Received: by 2002:a5d:5257:: with SMTP id k23mr13868156wrc.50.1626275267648; Wed, 14 Jul 2021 08:07:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275267; cv=none; d=google.com; s=arc-20160816; b=hrOPMeMqibGRRHkBVJ0tsH02FSX4KN7UNYJj0wI21ACr4rYJOryOrBn48/S9HeEJja 1+SQODpP7twpLQIF7GkJb2aIemvCRJ1hE4pnRYqi3k0sf8BtYOHKp/E/4OdNDWKuN94Z rE4JfmLxJ4iVbF4HAgkdE2sV/xBEmxSXsmr1dHanWQb+Xx9TXq6f++6oBHhMoVtvNvoj rW55+0yapEFZi4O11YwI9VaOi6Di55E2pRK/BC96d3aR8Fq0Lc6lts64mgLt0q0pBhRN Wfe005JqqQSNsaKyQ4bbpWcHifsFmJULZuM+f8r8PuipimVLeOfyGmjuznWnfJn/n/46 5tZw== 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=FwXH9Tf2pIP8AQ9LqqixuRYEC3ehMkwgkboQDlLLbZNxnfhrJHNnCYcJLE5OJz82mx 3rqiJQ9sJ24ViHjUkFCQL+FOamL/yr3gAY5gAIboqbqp5U7w/HeS6yWOtHMq2UlC3ZLt h4nlJ72zbWljF3YmN3Q8pL9CCzEIHnc4lQ9hKhdIeICW9PU/yayRYJ6TiXbVw5LxFw+P U/cG1YNoZK1VVjAuEoJ9iFhYhwsd6xuICHDtXPW3vlGdgh5FwtT3DRk7YT51LPBQVy33 BgRzGnOxRpYf5ckhlQBQLVKSj4l0FjKaOFtGEgZHPyV6Rs197S/Yvzu01kEKF8QUKodU hrPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i8kNILAU; 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 d16si3690089wrw.157.2021.07.14.08.07.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:07: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=i8kNILAU; 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]:37792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gUE-0004aP-HQ for patch@linaro.org; Wed, 14 Jul 2021 11:07:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNc-0007H9-LB for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:57 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:52125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNa-0007XU-FJ for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:56 -0400 Received: by mail-wm1-x336.google.com with SMTP id n4so1798741wms.1 for ; Wed, 14 Jul 2021 08:00: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=fh/p0r7wN5Zugi8eSuKUIwB1x6po8kSVMsGhQEyjfVI=; b=i8kNILAUXbm8E8LZAN/8sMkhZ+NYOnerJd5YuOH5Yvg8QV4oV2pdhTQrdD0FWwlrrZ xLsDPQZZ/Ccwd/UCgTL/J9pItwzc1GKR5KmwNrbx/kvE+6MmiqbmvxdaeCX6x/oj9neM lBn2fzIwWqRH/XxuWH55REaTzBUt9uSnKWsIsHhDxavcVkVawcKNKQOS6AzXeAQbLN+R EjEtkb9i/aEulvPZGvPPNn5kFQ6gFL6VrKKt73VugMHivhwuEkn8km8TkJl3O+24qA5B tEI7lUU9z3c6VlEdX4mOo3Klw+P9njxCplgEVFr/3F1l4JM9l9uGn/W+emVS/ZDnHGg+ YraQ== 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=iN3TrtlzqdA1zkoOuN01/r+KADcXuQC0hwCOYEju5gIMppQhWlhJJn84d+IlgpahUr CXIWZe2vzwbxkHXfx3LDt4hFROxolNyr0ic/ut4KgTH7TuEW0ZS0SPv9qBuXIiNJpIo4 dNisE6b/d+LDkrZOU9ItghuBcFt8Kx+HVd0Q+TGL5h2j3LITaT5tzo0RC05LNM8ostFX SIjW1xMP2iB4+7Qx9Rlb7hfVV27+aRt/129fLy2cuJa3Vg+hUroYBi65oQRY6ca0ZAqZ 0aHQlIs0oUwIar3gK4BR9XRpH9IQNJd1CsJZ9Uus2wLz7tb8UDuH4w83dgFbvciIKpTi 9iAw== X-Gm-Message-State: AOAM531CFRxpTfdITEdoyIFEs8duGoZDtGoenjJ7CFiDwuTrnK3pn+/L JCXbgazYLARzNGS77P3I7e3WzA== X-Received: by 2002:a7b:ca43:: with SMTP id m3mr11640078wml.74.1626274852776; Wed, 14 Jul 2021 08:00:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d15sm3030946wri.39.2021.07.14.08.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E30D11FF9A; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 11/44] hw/usb/ccid: remove references to NSS Date: Wed, 14 Jul 2021 16:00:03 +0100 Message-Id: <20210714150036.21060-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?= , 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 Wed Jul 14 15:00:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476773 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp659888jao; Wed, 14 Jul 2021 08:11:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2ogtJJEqgT9fcLU7nn88etXoQRAFTDjAFWQkmDkqay9dg/zrcSE9Y1cKinIUoHWWqieml X-Received: by 2002:a05:6000:108:: with SMTP id o8mr14013989wrx.154.1626275509485; Wed, 14 Jul 2021 08:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275509; cv=none; d=google.com; s=arc-20160816; b=IL9VOlWVcxDU4peQh+KO+/6zpVZTlSkGDP2dU0iZ8R6aJNwFFAZdSIfIsdUtHfiEMM 1tBd46a7Gi/FSpebZ7IOBjwMQi06LuIb8ERgKqnuUmUZZY4yv4yCHPb2yV6Bee2Y1Zsv 8IVC1htnC2WXvYliFVWdmDC9SddboDfPPmYGdZ0h7v+JujTjoZKo5OAXpgRAo/cwm0D2 ppkIQLmpEUZVgpGVtcCQjRHfyRb7Gvn+fEkK6HGrtyqU1HzkSQhfOTXoUSj+7+ap8lHV BQaYl5LSRhZrDGmW+UzeU1aa+kShp3qdfhSLADpYqDVRWyVN1xYsSAQ9Kczrag6gmfee ww/A== 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=uDojvuTQZd4MM86t0JkeuSLT7oVsAcQYLAQ7j+n0l88w+vLtw3iHHoR/yRFXIKD4cx JtBNDsxPHDRd+ppg6ImUswbBzeO0gRA/MPmG8K8zh4ePKhZM/gHopjQmTek+bNVWwIl4 oKXC3PEYqDEZma2CNM6A57agrqxTdYT9xKgEgoERmisA3KJQupvHDSRIHNiMBnGpTVd4 iFjM/uNY5fXszjey1nCtQ3MHLQgtZrt09UeiIMd58iIv64yMk/CNZLaa00154l0rY+hF aSOPtj/gZjoa+uqdrvuJkp4SxoUCGhSP13obPnb5zkY0NIXDAtZTjMNV3dv4y7JfzshQ NCZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kLud9fga; 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 t3si8014479wmj.170.2021.07.14.08.11.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:11: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=kLud9fga; 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]:54574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gY8-0007JI-HO for patch@linaro.org; Wed, 14 Jul 2021 11:11:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNk-0007Nb-04 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:04 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNf-0007aZ-TU for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:03 -0400 Received: by mail-wm1-x32e.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso3614850wme.0 for ; Wed, 14 Jul 2021 08:00: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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=kLud9fgaNjIqCzYxw/YKz7k4UTxFK02hATw+0jUy+KMYFAWPuCFBGwyTx249Kz8TzA K5X2Mj+HQv/o+x/mwpR3AwXD/stqhhCavnxHndRNZXVcWeYpRj1FOPGNAUlQ905X9jTz MUVi+fxFv4+St0Q+eKvvq9W/tA2oj7lpTNy0EZSKT2bBY5TVE2TQ0UETSQLg9BEp9lH9 zRNltqw1N/NQfLLX7Tfdd3v/g4vCPX60UyfTWawBZ+B4Dud6WJrnzK1q1vJMZCYY/DQN 7JsI0fvYi9fu0hRax4exw9mvjhfzFICucqK27jwnDj8eiaSKeKcwyc+IZtlDp+EOglXY qw4w== 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=jaAN8HMyQX27MSPWrYlGfygY1SMsWIdHXjSG4Br7fxPvhDTfjpmNwEq2JXDpIwYs9T ATSJtGTUAiPwxI/o7ien2EXVD4yNp14vkHMRgNI/fjzT8wnMCMxbisGvv7/2W9lDgcNq MwbDQKd8z371QXTyr5BCoHZX75ucflrewxuD7aKXEM03m7m+dIXcgcAv/Ej3hrBAUZK7 jjYgilgp6CxRrkqlSvJQq6EZfP4GtJX5RYs/91Z7DTGwgmYtt0vOOX5rImxmYyN9d011 XdXJaTZZxxj/gQWdR/++GnCmqUCu51fi3ANPAkCxyDXBKWBPhAimeqkjuLFQWQEyE/4X YhRQ== X-Gm-Message-State: AOAM533YU0h+L8n4srUmqoERU+Eb5ANcYRMNuEAsMXl6NxzLs6czPMWN YlPOxyGHBK179y9QemZ0iU25YA== X-Received: by 2002:a05:600c:1c07:: with SMTP id j7mr1423448wms.165.1626274858257; Wed, 14 Jul 2021 08:00:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm2851465wrt.47.2021.07.14.08.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 05D041FF9B; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 12/44] tests/docker: don't use BUILDKIT in GitLab either Date: Wed, 14 Jul 2021 16:00:04 +0100 Message-Id: <20210714150036.21060-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476789 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp672856jao; Wed, 14 Jul 2021 08:26:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbVTKMZMO1RQ0SUoQ0zv8Wj5lMpyKx6fluRghKzHEqHGBodnpwU59Ew0SvvU9SAJGIFso+ X-Received: by 2002:a17:906:3616:: with SMTP id q22mr6726902ejb.276.1626276400829; Wed, 14 Jul 2021 08:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276400; cv=none; d=google.com; s=arc-20160816; b=0vJex7IeBOfxRQIVh8WCyhHSeblgJ0Ta39+2BdOTgPdgX9P4+YR3hX9FGfqTEYHCbK l4T3uWm0hXVgZIsFqFYwdDKL1O7AyE7M21xjVLT5AN6J4pWlr2ZDVEvsyqkJ2Hg83HIH hjmiojl0h8IfZhrTVU/Sc4ZQ24RNFWxytso9ageY4hMMLSnjOl91zbs4nD9iYG5t7Inr ES/wwBbY3ON+dfQtlf0fmv1sQ8Gve4PnZE8Ev0RqnxnTX7RmtehZXGTnEQwFs0WuBFAv GAFgX3IHTprZCxZri89rvbUppgXjsVTiqJUHvwHhchm7L4Vux0/DUY9BZa9xGUHkH/0I qrQw== 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=WxfOLdRUNYDKUOYMlzGvmGMLB0qmwoXIUE0RFD6G1nRY8dhNTyS5CvESHEXdSkuf/9 pyt1SG9MFDZc1zmRe549NfoZtdZuPZy8wr/sJiRkUx6k57ucVwBJLe9q+W1XYuBt05Tc 9UyALciB3yGoSZOzU6eTkUKxLej0Gkm2intakNo3cvCqONGL1xjS+YbczftZZz3rfMTV 6kqf73ZvJsvCdGe3LaLtmZyu7sptJGQD7SYL04Ifw1EmJEAoNgNP+bS3adxp5vCJmb/9 vuVmx+NrCO31k4CIOog2oIECcE4l+cQ5Z9Du44VKgb/uQsQbzvu5uTaH0Gzwfhb6X2bc fTOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JCvksF7h; 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 h6si3052456edw.479.2021.07.14.08.26.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:26:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JCvksF7h; 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]:45864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gmV-0005dJ-KQ for patch@linaro.org; Wed, 14 Jul 2021 11:26:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gea-0005HH-Se for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:28 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geX-0002Ow-Bb for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:28 -0400 Received: by mail-wr1-x430.google.com with SMTP id t5so3654447wrw.12 for ; Wed, 14 Jul 2021 08:18: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=JCvksF7h1F0ZsbuYhcvZt4kJOJgXa1p1hsH2gGYemhjDLs/Ug9ahJnPTuhvmYaBFKS C1Wmcdetw8dGRKsGaWtp6ZjSL0JFa9pYSQ52zHPk/l/NmQhAaH1NQwiJfBpjGRwznVqI zcslpgLP36gUR3X3KVuUuhje+ZLTgA0EEXeHj/EPdddRGbw8sYy3cLrPzaeksoCNCVi7 4WFGvbVjJPQSTwjFzwmU6Cz9MZ2gYaayScoOJ6RPWdtnjWJHp5kUUiY8SuGk/7IPf0y0 8ygPd7cEdTlvVJp9evx01EREksh4HbAMnMTcXoG1T93Nwf5UEV+nTAVfwsEERN0rC5HA ShJg== 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=S/iHqYYwVrP0uXF2YTgx4UJQ3HjDC6hC54I9wH3VJy4p5BQt/+qk1rhQS/xpkrp+Gs BDvUaOX1EURl4ocnHv6dNps75HIb77P7SNLvntW4GMqrn/XnolVfPlKmIbY8xgXzsLts n8+7W8ywprdpaxQaeFisVyneMW3guY9Ol4hG8GkA7ot09mnbXtPqrajQdsgESXsReI4u qV9Iat0tWctrwTxL/mH1hE4SzzpRhtDD2SqepcEIYXCgM1VDNxz3P1d0810vkumZhEWH twtMfJau8ChO3Qd+5BYqIroWApRqUWvWu6VvVpIeT6LNr4MPmHWQhJsbKOJH//oitlAT QGhA== X-Gm-Message-State: AOAM531nT1C8J4k7WzjygZK20cQ6Y/GOKtfR4yVrF1fSN1mtXRs7knOp RrFCu7DfH+iLxP2gQLWvi0JLNA== X-Received: by 2002:a5d:6dac:: with SMTP id u12mr13580371wrs.153.1626275902087; Wed, 14 Jul 2021 08:18:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r67sm5727904wma.6.2021.07.14.08.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 27DD11FF9C; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 13/44] tests/docker: use project specific container registries Date: Wed, 14 Jul 2021 16:00:05 +0100 Message-Id: <20210714150036.21060-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: -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 Wed Jul 14 15:00:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476755 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp655696jao; Wed, 14 Jul 2021 08:07:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhi2urV7GEzlkXYMA2oJn9xAtOvcRe6qO0MsWSHJ5OIr1uG7pvXHXjPjOpXZ4XK0OCvI3l X-Received: by 2002:a7b:c10b:: with SMTP id w11mr12172573wmi.185.1626275236511; Wed, 14 Jul 2021 08:07:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275236; cv=none; d=google.com; s=arc-20160816; b=D8JOkJmqjMTgyloGKTXxjJ1vROFFHkMTAw09p+n/nDlIc8C09iGyTF3zlHbz3dUqOO 1IV4iKvXnZ6ANoxczz9d9nklUz0luh4o5HsLtwbBprHr7iIVaA8oOoVZNf9yDgIGG8eU r9GfAAzkPZUZ+ytZmdfq/sbL7EElxYdDgTPaJIQgDBxR5TES3SFVthG09Rgn7wj+Rvlz 4BHGspMzBYOwvum5VK6kyg2cH217gaxYglTXBjowfqKkBnqpW+BupHVno5+Xu5i3svYw 5SnHf71daosMEqQExGvs3bI1mk0p/6nJOPsLmiRowTU7LnIpfg6+ODzIn3Ij0cokGGkk yfDQ== 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=jDy0s36iCCjLgx8TjlbVEbp6kn6WcVeLgt8GNDpJMH5jOIJRIMCQjzkz/3uIJokZBJ 9a+fRFcG2820axVAt/JrsZYmKLr+33Za8C5USkobl/TbAfLwvVLpTn9ojfYPeVI50MsJ z+KcSL82/QzSHaB8Y+q6KGIS3u1MpjgdWwz+YqxyF42RJ2n9Mo8HRD6lZRg3bfaB3Tx6 +v+oxNppGUYBchsNTpLFmEwK6IrTdNRg7D8RS1LKmDTVkNE01y+zBsQ1mjlwg6gF0slf /FlMJd7VVbqe7pgWnHigpmbqYDmNr6D1Ly7/1sQfHULRWjUifkjEd2xjniBnjTZwDCrz yB+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wqhoKyp0; 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 h9si3597528wrv.298.2021.07.14.08.07.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:07: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=wqhoKyp0; 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]:36662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gTj-0003q0-FB for patch@linaro.org; Wed, 14 Jul 2021 11:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNj-0007My-Tj for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:04 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:45937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNc-0007ZG-Ox for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:02 -0400 Received: by mail-wm1-x32a.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso1625386wmj.4 for ; Wed, 14 Jul 2021 08:00: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=cRpuG5GjYZFaZpFczANpcbFMUqHvtpS+BlaRY7FR9ww=; b=wqhoKyp0d7cPM0zoNv9KmHf40qvKZhrrR4yzNpqYjuH/yOF9qRlkAaTfV2GtHwwE/k mjlz+tmQMgQZD04/smRslGnFanWE9+QiT3BYYau5D3Hlb/u7FRCZjnLZJIQIWCWiBwDF QYMlqvGXPpYRffyUSLL75bz7DOY2c8RdMHRvhf5ox/fF4R+r4rmjFXufW0wu93rrSG/M /pfbGaE6QrZBa69F7zj4xF0bepruWTg06ca7MCNjHPIdPDbSGVtFyVZ4TTHBgm1lCe8a qHAo1ik7uzM+/3fayvAkP3ghjQscIe4orf5KiOvq9lmAQrRpa3foHp/OuPeh6qunLP9O BMZA== 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=jvoKk5GqU/4ZDJMpN9/JrqgPlPNokGvNF1CSab6Al8ZeuhUJTyaRD1cb77OqpYy0kj h04NuXhrhOQm1BnMkE/NGa6ZkmzyzyWR+NcZgjsaVu/WjOJ7fGqAmRN2LV7pJPZBGcSm FO1G8G0sk5oxJ6UUYvkSOURw/9QZcseKAl0sBE4BE04dLpQFGBtPPvSYMm/gzYxRyvLO V8uS39L314Plw8dlAJAlzn5Ni8pbhlKoweuYHivH3F9x8HnWv2jQyk4kUr6/WBOmG3Tg XAgdBP4vh8Rm2ckpwIHMg0lijWT8BnhZgmjdgzuvUd0k920rUmz/Qt0mVeX/9RlzmnMj rMGA== X-Gm-Message-State: AOAM533MxGhkVcGJ54FDN06fabN/jZvEy3nJoFG2B+dAWNPDLX25u/jg I8r8QagBvr1WQrE8n6rH9nhQsg== X-Received: by 2002:a1c:f70d:: with SMTP id v13mr11368698wmh.183.1626274855402; Wed, 14 Jul 2021 08:00:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a12sm3131497wrh.26.2021.07.14.08.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4E1DF1FF9D; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 14/44] tests/docker: use explicit docker.io registry Date: Wed, 14 Jul 2021 16:00:06 +0100 Message-Id: <20210714150036.21060-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?= , =?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 Wed Jul 14 15:00:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476783 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp668645jao; Wed, 14 Jul 2021 08:21:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFmamgnsPgwQ2Az2OYzBp5JNe8R7Ba6G+fS5EaPRrepd4YSc0VnOf4an6k8slEioWHQf7P X-Received: by 2002:a50:fe8d:: with SMTP id d13mr14335243edt.14.1626276088530; Wed, 14 Jul 2021 08:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276088; cv=none; d=google.com; s=arc-20160816; b=FuHkuI6g9/V7FV4V2W66XBQkwpegppnqe9r+qh6lr/4S2FHSmwrJbbDifi/SxpEecy AI83DpVP6vy0ST4ohX+hDRcsah0fMvguN52blQ9fP2j5tEgQPKVBp9IyqrKFRC4Rxx1Z k4mfgYRiXvAuYLcSszfBnZhMcE0/tFz0Tz5DmRrq2xezlvnMv/CVewSqLI1Z+F16oc8z 3wR1w1GH0g/KQyikFtRPUj/HqBsP+8j8N2c1q1RLiDhVFOy8I2LPjDpWEuH+E6wchcQW sXB69Iakeh+QFpb24fkFLIkrU2NXY5wDocNyigKBKwwU3twGwGCG23wFnKbGvkQaem6w dA+Q== 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=Na7mNWMZhO3AyR4H8RYnS/yqAJm1fynu6nXO2PUFlQZpLtpzxQpVyomZeww+PvJnNr 9ySNqfJ3Eg41CMP8M24SR/N2oemu+rcd1I7diwCYstXgKV9TEFfgox9ZaA4yjU67Ecng 6vz0KZ2ME1sglaj/aG39THI+3b2QBTl653ce7NWkQPN3VWSRymNOM/NOuWHiUhP67u+B yffUD+/Zj8GM9tNcnpT3E0LySCiRGLonVO8C9jAASv5TqawvLybW8gYQ24woQzD3I7mJ I50x1ztBI5qP0WZya2u+x+yosW/pNXqcohPqhkihr/thX9DPlfkxlOx1NreUJIVitJ6s EswA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=do8ehKC3; 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 bh4si3573718ejb.358.2021.07.14.08.21.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:21: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=do8ehKC3; 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]:55302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3ghT-0001W4-Ab for patch@linaro.org; Wed, 14 Jul 2021 11:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gV3-0007Kq-6J for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:37 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:36859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gV0-00046e-W6 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:36 -0400 Received: by mail-wm1-x32e.google.com with SMTP id l17-20020a05600c1d11b029021f84fcaf75so4137235wms.1 for ; Wed, 14 Jul 2021 08:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=32upzgWYArkXqNRAuuHhbgidJ0G7HomnDnq8BKCaFQo=; b=do8ehKC3FL/ZDQxlJpVtzeQO+8HdgF4M/zTgsSSoQdNtijznqWQzXGI07Glo0x9WEO wnEpeKU+iR4Bzm7prByWWwgwf2G5aT9ZmCwos+Ho3Jx2mAzA46Q6iM42bgRG3RJ4TNku mtIieEQMYCpBLU9mc+jhgxaJ0vluIjDGz6Ota3Dz8QJ9Gbjw6GRYYKsmyIEw582NqzAL eYbz8rGxMdr4tLXnyPe5uF4aJdmjECwIGJajIe2JyVzJ5eAxtjfz1L/BWtNwVfcl1KtH hwTjR6PlAJsHJ0EALAtQxG9uKKSONQQonQqbTPao198Ljaq1GhrvCpoJyMHioJDcbkfE JjQw== 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=T09NoLj6gvECG9fWHhVp7soE0489Lkq3h6l0LaSwizJuyWk0zH/Q9CNnDftvDd9nl9 039+QojeeKRns4UCUmTg1ILDQTvunr+chJmNp6+K0j9eEbI0PNIVhygZgm4HqTlXbPml IMFBYIMyp8VdAdjlDt7MlBbGWjQYK31tLkIMDxqG16pFiHxBZ+aEOjO/oDempFlYk2xI r+R7uw3WauztNopNwV086KQ9BsNOV0KZafumjDF1BDovCKc2tHAi0ITSPs0UxmyA/oxM Ubfhcgw8o0sZGivMSvW8UT115n/YHWjvR1CnbUlO/Khqg0htFQNv/4HGwZQEvfoHeHf8 9J3Q== X-Gm-Message-State: AOAM533M/aK4dlZAoxq/f8SEWELtHZMrr306wfYdK0RwA41uI6IdkK7Y HW0l0Gqim2B13AKZivOkSyeZlw== X-Received: by 2002:a05:600c:21c8:: with SMTP id x8mr4550416wmj.173.1626275313517; Wed, 14 Jul 2021 08:08:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q7sm2404457wmq.33.2021.07.14.08.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 82B5C1FF9E; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 15/44] tests/docker: remove FEATURES env var from templates Date: Wed, 14 Jul 2021 16:00:07 +0100 Message-Id: <20210714150036.21060-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476810 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp676802jao; Wed, 14 Jul 2021 08:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyam87cgaPDbdEicnHhtjxb/4Swq9dz7Pga0AhMDixqCj2fmVcgTHUX8Ki4aUDrdZN1jjI X-Received: by 2002:a05:6512:691:: with SMTP id t17mr8258181lfe.526.1626276690534; Wed, 14 Jul 2021 08:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276690; cv=none; d=google.com; s=arc-20160816; b=Jeco3cc6DyZIWjuJFaiNB1FGmZje1Y0hxVDSBmV6KGuqMVp82G/lLtRen7ttG5EVmC iHPnioPtLmIHXi1V/Snc+dugFoSyWGyK1OFBhOQuND4HHb0I0Fwo+6YbROAvIIpV9jQs E6NKMSjyPMV68SP54ILNsE5M6kVFyU7Z0+JI5nwYco5ypgI6Ycq/L0xrVUsZbNdLp086 YhEicQz1VEblYyeNJELo8UJWbaWsxOqZIaZbbinSu1sphn6AgCfYYcOUFRO2hYOX7HLv k85GbBqA9e86pmrgVQQ0JWvu0a2i9eEgyaZThhjJXCvDIGhbSie1MEJGI9HXIO+D/vVQ vmMw== 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=W7Jbl8SAOdLf1ZDNQ9X2KanKwEbHddgcUBawfO9y/x4+GdO1jy8l0EDKfKyLcKKUm2 1TRK8rQqp9yTBQgxvWhwCCS0OJkiy6uZkK9ii1APbTGa020yMttzLCQUC2MHmuLftN/g PveHtfemElW35SwLzDhLxdFlGgRUPjCbqsQ8G6rLpwaRUU8NtIjnmnAI+9cpCOwX1XIw y/FREflauxGp+XFJvujfhl1nbL2AgBH1w6LZxGKH5EtJFGLxUunvQ6DD0YKI1Lv5/pvR CGHrqcTKO+55G95+MUmWfuFg8WYuNMNjJobyQfSMAStmdgfRMpMAP4RJzLVqD8IRLwg9 ucug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SnVuM2tT; 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 h12si4833638ljj.187.2021.07.14.08.31.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:31:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SnVuM2tT; 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]:35306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3grB-0000jp-7O for patch@linaro.org; Wed, 14 Jul 2021 11:31:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geO-0004we-DP for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:20 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geL-0002H3-F9 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:16 -0400 Received: by mail-wr1-x42f.google.com with SMTP id t5so3653547wrw.12 for ; Wed, 14 Jul 2021 08:18: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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=SnVuM2tTOoKZl7/8ta0gSp2nA47BqMNLYBL/adjGYTz8k0EpSRZ2/5BPvZOyeMb/ay 1PcSUZg/i72VqRcfkqJur5D/ptE9SzKHMkgHe/IRU3uMsPtVvCbAzVdjDpr1xh/5PaYI 2XTI892QmrMj/dba0xd69O/ibZeYziOR91+hoaXj0BDLjlawz2QtLFhrupOmWlMbO5/N ALXGCiLOfEYR/8CScxWeblPY8D5rN7HzeBYbdQqO6jnZkLiZKHF0nUts8qCrVsdVaw1t EaaTWdItLkExSzyU3UGqJLBVmua/Jnpxut/U6yTgOiGKB0buyL/OPsV7pGAuzjfYQ/U3 yNZg== 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=JtFxGiTMJlBpdFFSXExL2vNUimLZwS1plw/c4k70NxfCCbP48bFUiHeivkXObgn1dT xS0HPJZfZIBfPX2EMjgRMfdsiqTBBiaOWJkSxUI6gYbh31PDPcgALVR7BQowY7chJueo 112BHIt3K9Aqd4+r6gDe1W/v11GKm65327zWZa63eIdz8oMS82Y7P6YUFTAQWJovreJP 6P+35QznGnqMdi9OFaoc1wNDvlsViJe6uwEzlta6PH79z+NeJJrq8r7PMSFa9iiszWwE VPawrG8q5bPng8FmfymP4gvPoDevW5ioPSN4axFWauayC/ZcB+a0lr894SeUsamB0+hh 0h7Q== X-Gm-Message-State: AOAM531nHylV+GlIFDXFs2Zry/UJd8ji+FA0Pc3vtqXB02rmSBt30JoZ SXT0k4xzGtvOeifrGbCp5hcmhQ== X-Received: by 2002:a5d:4e4e:: with SMTP id r14mr14146863wrt.251.1626275889613; Wed, 14 Jul 2021 08:18:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm2162775wmp.34.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A53141FF9F; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 16/44] tests/docker: fix sorting in package lists Date: Wed, 14 Jul 2021 16:00:08 +0100 Message-Id: <20210714150036.21060-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?= , =?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 Wed Jul 14 15:00:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476793 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp674458jao; Wed, 14 Jul 2021 08:28:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoToF5sLP2wKiNgNy84DIs57gYVQbBKWzfSg+8wg8AVShdSvD0CS5EUGvnf1Cs4T2UFnBs X-Received: by 2002:a05:6402:14c7:: with SMTP id f7mr14640211edx.84.1626276520060; Wed, 14 Jul 2021 08:28:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276520; cv=none; d=google.com; s=arc-20160816; b=Xj+kO1NlhCjtdx8Bp7u5qnyP0linkj8x+y3MhWIoelUSs/HRNZb+YRLPgz+nyISCTb /7sk9nzqTYDZAkPxHgSdoff+qnNKaz3Wx1mPFH3tNp/2DWYHsVpw8bx1LxE+NyQW8HzX fu+Y2qESIRsljkuXk0KegK5gwAlFL4+LWqhpq6mNanHw7G5uYu3rEIz2J7x+yu5lVcRW /CUPyfOfBQhZkDbDduqsW4SM6bbauwsd2Fofvvm1KT8d++0rNlvDaiBIO9qF6LVi1+ve b2Jb8rN6e0YHGqua4R7vtkZeAb8zf2Fw1W7YAW03f4PwXNe5u/WG98YwpHZ2PKMCO36d Olig== 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=oQLCJHnRHegOUDCcIissUzDMpw6DSytls8l3DXA3wF+M698d9i/FWBhsnkEaidHEfm TEwL3hB3oukw7UbutkdhcipHaBMirEB0UzDY1DFIrkfX30quuKlhS4KtzOLHDHzZ+y2/ 6JD9wRY/HFEQPPFNGVxqG2su7/jtO6sUvp/9zwv5PdTAM3PLcRQ3xJjAX+JItXIPSFDu AA9uOPV0nkgI8RSDCoBVgbNBdg3NtOtZTFJgI8sg4Vh4NRxOxtbUeA1HZI/3/O/W0p/C Sn19nStNwl8u2+9b0FbkJsQlc174Yp4Ee1cusluWGesqdxZGgK6eloFTjl5B3pwR55hJ Hgvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ao7X4aFn; 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 h93si3670316edd.605.2021.07.14.08.28.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:28:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ao7X4aFn; 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]:56034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3goR-00046d-3L for patch@linaro.org; Wed, 14 Jul 2021 11:28:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geS-0004wi-3M for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:20 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:53951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geL-0002Gb-Je for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:19 -0400 Received: by mail-wm1-x32d.google.com with SMTP id w13so1819248wmc.3 for ; Wed, 14 Jul 2021 08:18:09 -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=Ao7X4aFnvfpm8GaOuAn1cLdSY44kL0YNxlsojzWJVXCuUtzGHqb+YJCDDaJ7T34hUy ZprGaguFtT4gN1UTXHtoInnj4qlDw0pLk3LWIp2IjUgQroOQ6dF3NxxcEf+e7A5/xL8Z lZ+6pBzBl1jwaHDhs0wBlXriwcVDDLChMqloxUTaGJ5KY/Dr775XhgQ3c8TIhjX1YzEq 2xr6lp//XR1EMr/2tjTaeDQxkJpWq1XAVojKXlqV1DkZHhdupAO9A0qzuf1fXDLFInqr FD1e/pz4AchXW21Z9fwCr9gEyyFPZC9hULbn2tV/yrQARxgd1QNhrSKMEwB205dZYYu/ C4OA== 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=Q5ZI4p7VZRKY5T1IAMJk95Sd0pNjp/FcD1ZhRaMBon8YQnn4Ja6tw6oLwnWG8es3V/ MwZLPpOxAJ1btYJQNkHQ2ySzTi6D6CoPWqhJ+ecPoxEhy8zUYX5XJxQmbrPo/pNkb9uc QBNFp8sOHLST8FlGZ0XvW2V4W4A8T14/YHB2kv3OwHZKNYIhoDugKzDCWXUlsVBlbvCp X7f0V/h7K23OexYbSe2uaOwUQBKFBOV5l66JGuZ0T65T9YS+Vd5paccSs6g5Hfm4aMBM 7Zde1nBl7ZZ8BSU+QkRRDF9f9ShW+14U3Bs2xf+YFXjFgyaE2Qv464uYZC9nrWU0yJ5M llfw== X-Gm-Message-State: AOAM5300kb0r7HGNXSxnJUbUCX711maGq+nPfyMDRh0V8mzXvK2eJSNh bjI9VarWo23G2kkHY/AF50Wmfw== X-Received: by 2002:a05:600c:b42:: with SMTP id k2mr4864832wmr.45.1626275888711; Wed, 14 Jul 2021 08:18:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g15sm2331264wmh.44.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC6341FFA5; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 17/44] tests/docker: fix mistakes in centos package lists Date: Wed, 14 Jul 2021 16:00:09 +0100 Message-Id: <20210714150036.21060-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476784 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp668898jao; Wed, 14 Jul 2021 08:21:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy93ndSGi7uUZif2lIo0nfV6fZq4kAcIcAu2KAcUYaNOCDpqyPj8Ke22fZcP0a5R4JGmFhW X-Received: by 2002:a17:906:4a0a:: with SMTP id w10mr12997455eju.371.1626276105265; Wed, 14 Jul 2021 08:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276105; cv=none; d=google.com; s=arc-20160816; b=wM/miGXkA5c4Dzg8JxPKizmq+maDCYoNfzgpBuwBpCJFTlUkbTD1RUHzPlqLdVDSRx 23OZX2uzNfioVD8FSjfoqxUItX0aRsSQHWlGA0shgyL+ora2EjQXQu/+8aqQCpZgQ11C Cl2SPuVKmDdCxl6zsJ7jo4WFJqnjaFgK8zXLh/p4IHhCaYKpOnvIt/RNg2R/RxMQHEYI VMdwcFU8MgtcMHTq3dYxFqvHM+Yth0j/LHHCMcuxo47iJtGIjKrG52HwesDZJpsH/1Ug IcMhRKAoaasY4urqj4LrA6+yVIDyclzYkI/IjRjdweeoR6hdsmO6GrSCtw0CM+53aQFf 36Hg== 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=qv9L5MK4SVZTNl+IqsrEepY9becGqdrAqISINv0+zoQnnrKsAlZiF7irrLKNyntY8j VJ8Z9Ij3nRSL1OYMR6hbfAate6itU0t+1ZSghMOqedwlf+qTSnJgrfxZSq5SydchO2ta qt4vi7gP87H/qQerUBJoOJInxhUKIn8GB6Wt/7NAryzw1HkZEQvSRsSKE919tv1Nksay 8qW6iqV3WCRQ3nAZ+xuU9jv4hVkfZ129CH79ZZ49QNdrQlhBZ+EtLsJ9bc1qwwM9ALqq 3y3xep/P7Rh3FGyHzdDFx3k/EKFoxhLpd5D6tM3HOKe1LqcSvHE0ShiHBgpJuQRdNgm0 0ljw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zp4beF7J; 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 q12si3131478eds.113.2021.07.14.08.21.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:21:45 -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=zp4beF7J; 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]:56930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3ghk-0002cj-9T for patch@linaro.org; Wed, 14 Jul 2021 11:21:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geO-0004wI-7Y for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:19 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:34773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geL-0002J3-Pg for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:15 -0400 Received: by mail-wm1-x332.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso3615795wmc.1 for ; Wed, 14 Jul 2021 08:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CEDjAxXaPZHE20IWlZ0aIK/7kfTArvdaA8AvTGvPrno=; b=zp4beF7JVLpN+OVfMLZ1HlVgWLdvM7IU7EM5DkN8EUKl/ybtxeJY8lYkrEqkfsEF/4 IluOQqVv9i2QK0LYmtz1eMavaXUwrvy1EYj/dCe8JjFU4RDsY5IUeyYI0tpzS0LtalNS ASVTJvXCxorR+umvwwL8MAYIOjzhPz0jIn7muxRnQEijMqOCO53n/v+wtfrqaqi5q3na DbiW0YIsRJoxQ9Qiwm3DN+b+o+MgYgfu9qBXHY2jR8XF2PoQNOKrSUQwsrLiZm1kuEJL x0qEiosiNtvhNDellprhWU9bVsblKVQOtnTYchtemkK/yCMo32Wif+NfuHPtB6rVIPiu NYUQ== 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=rVZwtsBr1meceR/OXMswTiPHgNh4t0pPcAQ8NevFnIF91S4ycBhQNbCalhey50zpYO dU6/M9MYhb6hPsmNUWAAMqwvvoQJzFh7as7pJXsmXCsqWS0JHNIDp1d6xbqtYjNdFYBf qbSLf4cIdWLwGWm44EZ30/llQqxqtT1KjGcTir5B+hIt88YaFdZnHYi1EmpRBtz5Iu7+ Uw3VcGacM8sUbAwKEHJ8B2F9ybBeSdcyE2zbdBKJts5oPG5w2BPuVQhTGgVaMZYD6ABJ tC09Elp4daxS46TTyqxawIgo0v7GQhI1hOBolj4IhLe5AKTvAQKYMTE8FKhto1ZY3DlR d0Hg== X-Gm-Message-State: AOAM530lz5UN/zgznCdkwzHmRSHKlmlpJGXavxrQuBpPAcuzAoSSnrUd Xsu4uI6e40RpifF6hNBOtY4weA== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr12063813wmf.24.1626275892495; Wed, 14 Jul 2021 08:18:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm5465585wmq.31.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D4B051FFA6; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 18/44] tests/docker: fix mistakes in fedora package list Date: Wed, 14 Jul 2021 16:00:10 +0100 Message-Id: <20210714150036.21060-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?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 Wed Jul 14 15:00:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476794 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp675569jao; Wed, 14 Jul 2021 08:30:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5Mq1/OZrTKA1NaYgZEv9HLVPm7f/AS+nKafMyw/UMG8Q454KVmvoi1gQ7XvgRG6PfFOrT X-Received: by 2002:a05:6512:1390:: with SMTP id p16mr8615294lfa.597.1626276608506; Wed, 14 Jul 2021 08:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276608; cv=none; d=google.com; s=arc-20160816; b=vIJ6LLZFU488Cl9laSksW6QSsHm9W6AZ19mlwbAkPFESKnftMCbjdYBCvnETsKst1Y jmI7MnySW4zz2Og7ayiNww8PNh0OGEdJpRmiFs8CR2lYdTkt8w0stMZOVJ0Qo7A70vN6 ah9oDdtb2ubapYLzD+J4O/TCHOiigr7K+KDvPoz0oDzu+AZmnDprw/RORFX6xu1lZOlQ /rn5yuE4xny3TUS95iL1pgP+TYoSBs1QWBQAzdW7/3+nrfS+NPPZUOA0n7UhmQTaKea1 IUEATsBD9HesJk9MdvTgzX/nPEVwB6b99z37uVayHZO51Bs5jJP4g1mTXCF1eSPfncbI 9Jug== 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=CF3dwLosCNU8bVJ837PooU6+2Hqmp1OtjJ/HEHJgDBEtNfJYAD2vK6NoRrg6Zl/a4V Pzs6qO+sk1lu+F9TaWcWj9p6Dr8AdpkMC5IfCuMhOEcI0Qi6555wve4z0qiFkj3AiVOZ KQk9h/OJTenuWUHFMKLrozBeFys8Ei2eRVxIHDuHD9yhjOYGiTqVHl1WpEY7OL33fQIe IF33aQ6Vd43ExqZURswXF9zH9SaCK6C2DA7Mni1vAugSYQoWmmatLRFFopRjZRD8e31J Uc0FQN1m66gKha4x+Bh1pLHtXQxxU6w9qiYIvIp/YsUSC5i358MPFqcN3d/1l5Rkb+Fi xYgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UHi9dzsa; 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 a10si4558503lfh.362.2021.07.14.08.30.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:30:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UHi9dzsa; 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]:60712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gpr-0007HU-8H for patch@linaro.org; Wed, 14 Jul 2021 11:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUw-0006uo-SV for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:30 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:43851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUv-00042Q-6F for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:30 -0400 Received: by mail-wm1-x32d.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so1658350wmc.2 for ; Wed, 14 Jul 2021 08:08:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Es1RG/B2xZon5hl3f2n44IU4fzXdGWAsx08bjdmHm3k=; b=UHi9dzsayB66T//4vMOJ8a6eElxVei9xAY/TkCKd6kGTKjq3nhNquAp/L2ezsK0l2N ISDacm9QlKfxhXvtiMhZloQHQfH6iWZ+AT5N90atO+QGVw2VR0hW8MwQHfHERAr/TIGb bOYVP7uDuiEOx28PPfT3gPugC2zq56DJbLA/+Rbo8MLlaoWrTIfIhH/rbEZtmSU7s3pH WOJ8kz5Ar+AHYB2cZH6CKBsHR6Cw8ZCBJtOrSgiJWVX3XkV4vrEPYusxRKpDFoytXdHE DgHDWv8Acv0/SMM3EckisQwHjtVpnpUBf1A07SIa2teWKYrz7yZPhwY26xWFmo6Z6bdT q3AA== 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=kdkQi3IF80ckrdJxr5q99al30Mg7hoZP6PtEHJASinXUujYq06tGZoUFrsZlcB0qxE +PNe+ZlGgCjPbRqX50zW6UhHP6WgEtgTzSUyXll2w3Y/L3rXE6VAMV6oGxAjEdZKr6ZS D4Lmzbg0PFWn2ruV1eCNGqC49ONRcfTzpYizj521x0Z28f6OExRsq1wHdT1iIah44cfW eMvJhpGYG1zQmxgaYyvDW6O8yg940QWQjZc3OO0IuLsMtmVQzzAi9/n77sdN0zFjX+zJ g0AsOdAjRQbTA2gR3zOr0EL78IDF9jFxJl0WnOL76iFhHM+3ahYz+OVXmlLaDsMSElcM Yczg== X-Gm-Message-State: AOAM532tGznBmZMUPJA6FPqwF1i3sOLSTTsfaq56ALeNnPulFAM++shq DOJe3AjHGB7bN0S4sdCZ2fpIOzkbm9ahLw== X-Received: by 2002:a05:600c:b47:: with SMTP id k7mr11997099wmr.155.1626275307863; Wed, 14 Jul 2021 08:08:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm2956305wrm.5.2021.07.14.08.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ECA691FFA9; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 19/44] tests/docker: fix mistakes in ubuntu package lists Date: Wed, 14 Jul 2021 16:00:11 +0100 Message-Id: <20210714150036.21060-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476792 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp674154jao; Wed, 14 Jul 2021 08:28:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGzShpOFgC+CzX6dzMwnpMSt/U/CFEX0fkItwosoAngBluyNGGRQ3O9r1JLEEUJ92KwgOj X-Received: by 2002:a05:600c:4f96:: with SMTP id n22mr11801620wmq.137.1626276492066; Wed, 14 Jul 2021 08:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276492; cv=none; d=google.com; s=arc-20160816; b=NnUhpbAtXOBueb2tClUvxNgeEJNNRSAezZjssZoQ1Mzll1o3JIwIYQ5vVZrW2NjekL inBbEIcqo7TZAdXsVnltmRKqqJ9yW+eNZflC77lsS39TuUb/xBHB688Kk79N4fr7k9Vl NlnPI5W1GbPRHn9quVpXOpsxqEhD8Q+xfBfhtjBkImN6VNy2krUdbAuP7gZxd1/MjoJp J56K+Ts7Q58rxU1yVICgplBGdDJPrDrTiKtS8UCuebEMdVX6wdUkz61jcXRBbdYDu0gW XXXhBeIcbirQSbuUxVyBT1WhdT5UH1bBLmkYycFSBFUrCL0WLa9lgRVBkM9XrsMxrYdI rMAw== 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=l1N7JP5AiUhkoNYO0FDMog5cQuxYH/dNd5FJ/D6FTCd1zpjIGlpOsNP2GVL/1MC8ke wQEFA1z7aCnxIVFfmJWRjBF4FYfWuewIDpb6Eyn1rbP0V4BSzLmkmFM5pZCRx0WyKV3v POHoQAnNH95F0+9B1VU3ikbXQsAHbn6dqd0IGiun6nJq5ohnEtco7drTheAvJeSSh8tO ss6HTkAllZUm+bvXqORAoWRoc4EcLMXMoTe56LDm8M5l8LRsmTTATlCdJH53ziHcUi+d jf7/nuqwyXMCSM+q5wtU9ri0P1tVuZLfGUBdCAFpNCwe13CDaAF2bVqowm7YRu6Wi2wN UEfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=j9YgceR2; 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 f25si3405336wmj.153.2021.07.14.08.28.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:28: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=j9YgceR2; 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]:52428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gnz-0001g8-1g for patch@linaro.org; Wed, 14 Jul 2021 11:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUq-0006Tw-8M for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:24 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUo-0003y4-MV for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:23 -0400 Received: by mail-wr1-x430.google.com with SMTP id d12so3594512wre.13 for ; Wed, 14 Jul 2021 08:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gwRw1ob/qac5/FqzuOGenSxZqRN/B2GFmh5qC/YLlU8=; b=j9YgceR2vRV1QTeLNxo2f6d6vv0oLvm4Crg4l5MvYk0MWB8c8FnpGCeoM99IoATxCW vr02KkXeTmBWZMjpY8yXH6eRkXNCWhcXxDYxF9sGmOvPT025rEaze8vq33gxmxlhH/uk H6IfkFXKdMOvSuYq77woK3Y4tObiIEjy2l1QEW0GBzYDHnh7RpA/EkTIm0AX/qcUqln2 31Ie/NYyjKlksgIzvCREz+MvUpzMsqUwqXvEdEt28M6F7gYQx8pYhEesWcTe4pUJ4t/M LOr5elP1cVq4BiqFNT/awzTJ8/IyMXdORnaNaZ4QXubP0J15g3S8h5CzMD0dwI+gEy9j E/Dw== 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=XJ/ci1POEZa7v5jCbwpcj4pjrUbGVr8jzEkz7MhF5PDPeCf2gVjXF2jQIIVHSznIfc I4CMkPS9UpCD63jxxH63+9MD62aZIIw6xGHy4ZjG+SQz5U+Z8jxlnyvVXwi9DI/e52rP lbKV6SdVWaC4uQuEp72ycjGY6wT3KFCNWMNC9YHrO5uyc5LcRH3MWQFOTMrDVA2UNtP5 gxJfXfYlEWlFN6AHSypWn6/ySnnGa9mrqVqHwwrGljRnPNq79G06fE0Bw+nw6b2dd9Ai AwSJ1JdWig9jxN/By5wsS4aaZBjNDIWbdsEPFWXcurO2sH5/VJiqmoFBkDFgV/kyzY0y Q0vg== X-Gm-Message-State: AOAM530CbND6YtTGlD6TvrCwtSgVSU1GMOlts7IXPq8qnRcx3DgZUGoi pDlVs3kcBJ2zb2+lBfO05l3STg== X-Received: by 2002:adf:ec07:: with SMTP id x7mr13955776wrn.262.1626275301340; Wed, 14 Jul 2021 08:08:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t3sm5535383wmi.14.2021.07.14.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0F09C1FFAA; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 20/44] tests/docker: remove mingw packages from Fedora Date: Wed, 14 Jul 2021 16:00:12 +0100 Message-Id: <20210714150036.21060-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: 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 Wed Jul 14 15:00:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476781 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp666623jao; Wed, 14 Jul 2021 08:19:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1q0Gsbxj0P0SPwGTJedvgAtN1J/LNHQUKKzEK7x4Sx94lu+WwSuMdKKumoxki86wCcyTt X-Received: by 2002:a05:6402:100e:: with SMTP id c14mr14187774edu.51.1626275945735; Wed, 14 Jul 2021 08:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275945; cv=none; d=google.com; s=arc-20160816; b=JjkrZ6q9BId3NCK7lmLqHiw6PeQ8ecELPhpMuu3o3+lB8cSZG4INobNmb4Bm+YGXJL qBjSf/AXBvU+kHqPWlB3luZlh5K7j0w7rJ6slCEAO+DfIfbFpF4ADY64AaUZ57Tvhb1O tHwUUE94YJeCcAU8JwjVvoTCFY2ozmvm+w12mBRPXegsczvahpBGX4NWXXCpkdZgn+e6 C/DUuWfUkxSvz/esmfYN974uwh3sj/by1mH7lOeSGntXPwwk/2t9mpXgJI46pdvA+pBl cvZkNgTxep26KdJQbSS7dknuGe8th+T/fxwnn/t3yrppARKn3Y4lzwX3gpnWhYuXoFHB cbmQ== 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=h2ouQ3p+Ia1NEFlw4ZR3HgtQN7hrJfrSnZ74BsartZ5xdUKcTtYKjmEK8lo+umRi4U rabOKnQjW1Gp6hEkuh8SNjv1OYLOGNhDtZYMdVXUYNiwsTWr83sKeUulkUkkrEoo3HVx Clmo0X5lR4wPtjcE7HGtQ0IJv81UQzo5SDPfEO0lFY1skPKBLXEYKEsNwJYdxKiAYRJG fbhvoo6aOsw10TAFBQ1sHJJufqn3MpowJdrRh3DGjbe0WubJ2sPtn89/gdmxIGSgg+cJ +3lf/WBPDV1IjVClC0fv0Xgkox5B0thhvInIKZpy95IsGVsr3V2sBY2RM2TxW749rKWY q90w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aat1WqAr; 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 cm16si2858397edb.411.2021.07.14.08.19.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:19: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=aat1WqAr; 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]:46962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gfA-00049f-Ok for patch@linaro.org; Wed, 14 Jul 2021 11:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUz-00077A-OU for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:33 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUx-00044L-U0 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:33 -0400 Received: by mail-wr1-x432.google.com with SMTP id l7so3634400wrv.7 for ; Wed, 14 Jul 2021 08:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qP523ThVXNn/joePqNyuk2xzCec54/sZ7rkgV006rqk=; b=aat1WqAr/mMgvzTQdGwSIAo9nnxezpyTPEor5wx9zxkz1zJjiTl5cJWbrYvWahEQ6n 2APxepFqV01kMv7z+3hNhoVvvVrN63MEE2dcsOIkAB6lgbwzZJJw7JC67VlHXtwWHhch e/loumbdaXUgcXc1jHX/TECGOF/WlxI/s6SPJrtk+jo7e8P4OWElsZnPD+8WyFaYDcbB iQ0n1/VbHGbK1NzfaBORiedbuCT7FRHKC/sqNQen/bYWraK7hR0HK7zXXXJrj+fLH3eX IuzSgVqGcsERg7E51eabx3xqy2KBlv8dtN4cm0CkSvSfytFH+treyPstVPatn2qxSxV0 KORg== 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=gRCR60vVOEhkGTN6h0dHYJd6BdJmpFncN/vHdGtjCkCtSHMWwIu/nW9uELp7nasTTi laT3fUOyqiYxGeJFPHG+BDN1kvdWM1hkhMyst92TYB1pFHwL1qeXB7pzQmni/NIb0CpT 3L3oyKcdH/czW8XubHZIyIYwNEvf0VCM9JLVm5Ty9TzxnG/EkXH7XnaPmEqQyJu5/BJP +93T4k7TlBkAjXzEDbHNmUc6TfMBtE7SQw32u0+Di0gdhzZStByjuMJueQg94ZXXQiRc B90nNS6xDZVSvLQ1mw9VW6yCtSbvyTtqz6O/a2r2zG0U03jDTglMFzHAlypEIm/nZXMx vrdw== X-Gm-Message-State: AOAM531RQHYkLs/JDiFqs4/P87u+4GDfjc3y14WnAgy8iq4dQUs8WxJz bwqfYVOcActDgoVgqpBvVjh+Gg== X-Received: by 2002:a5d:4b88:: with SMTP id b8mr13521151wrt.95.1626275310608; Wed, 14 Jul 2021 08:08:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z16sm3124735wrl.8.2021.07.14.08.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 261CA1FFAB; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 21/44] tests/docker: expand centos8 package list Date: Wed, 14 Jul 2021 16:00:13 +0100 Message-Id: <20210714150036.21060-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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é 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 Wed Jul 14 15:00: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: 476788 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp671754jao; Wed, 14 Jul 2021 08:25:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjAKrGFCuXOfBmk9Of0/WNKNxtFYMl8g1rVtmPkoKhJTpoL1t8W3ufZrswStllZPFhoBxi X-Received: by 2002:a17:907:1b02:: with SMTP id mp2mr12878730ejc.196.1626276316376; Wed, 14 Jul 2021 08:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276316; cv=none; d=google.com; s=arc-20160816; b=DbD4gVYWHecNkI1l3lV6aaXexEQiUB+SvpBC+Kbdb/1v0kTJkAtKWdispqzgZE4ec7 MGTg8OSaiBI93P5xddtyTLUCXRfVLmCmThqDqFn5k7uqUYozl5S9hQ2ks00fKxQ8os0i 8TYI9AwTWeYgq0HWLrju/QQVUVx99BSRMtTyhefXhlDRrow9i+Uqj2XBv9JpFmflRmDZ GUC8077udPetA3uXfplSf81C1YThBur6nC83XcJhtxCiPBtIKlbAA9wwc96f3wlXX6z+ Q5e71lQH6pEhZYQ7LfQZXFGrR2juokixjY0epPCzIZGx/tLZ9zHFWmHVuSjrD6VcOCn1 YgIQ== 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=di/MElm6gABH3oIP3FuohdoXc1IOGec3H7WYU8s25Hyt055XMK6NLKPPQBbwZFckJN kZ3tj2pycyRuD4peoCdguGFWqyujh5JBeKQCrmVGsQfwpNS7D414ZMhLQnoUk9qtunwI rKVaNqP6Zi7PvAO00T7bN/OFW6927fdP5rJVS+MI8eHNJipfFNjXNpnixLQ7Bf9C17H/ hk/Cq6gr9D18K5hUdFs1V1lr6Bt/dknh+qHopsfQBfIl+hr6k3YzR+DTo0iXe2V1HMfj bkJAq4wpVzMrCMLXOKrG/+uwjqSKdPzELDweEd50Op9Y4KK+uglocC6yKU03nSKNHaei yOxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xElSes+w; 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 b17si3052705edu.431.2021.07.14.08.25.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:25: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=xElSes+w; 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]:43924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gl9-0004EF-E4 for patch@linaro.org; Wed, 14 Jul 2021 11:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUm-0006FX-Ui for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:20 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:37535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUi-0003tq-Db for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:20 -0400 Received: by mail-wr1-x42b.google.com with SMTP id i94so3651276wri.4 for ; Wed, 14 Jul 2021 08:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cP7o8wiVJfZhkAdD0nznZLEDoJtABzddO1b/wxyVoMc=; b=xElSes+wdG27JjYs/wYOiMA/a+YlqRIiin1df+7etVgYw/M1Cjg5JOVquXOXKI7JCg WB/dvFwFpvKVWThQ9Hp7Z+IJU/6MtI1HHJsghYZ3UgCSFxzpKHqxy7IH9YNmaIdthuCL Yy7iDNZ1uWZJ3kjk0Z+IA6+hBQ8Zny1Rl43/e/UeTXKPxhlwwGLoIAH9/zuO+6eJkHje 61l/wKLIvPS36WpQjZXxzNLFFcJnD0aJkpJZPv1vfgXlQOr2rJ7t/SG0HZ4Y3aZXDrDf C5pLNgLK1D53oG55wqnzhhL7oukuLCgHMPAqfCOBjb+4trNmHKmGo3T6YPJEw4hk/I05 ZRCA== 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=Ami+UcZtfDkt/wmpwzu1ooPqSWJEE6HpGJZAbrhEmmXGpnxU+Q9JOJSOsnO2xssS+t jEEh62kb5Mh9UkGQ4vZ8RTvjIUmWgUFkVOPtbe+HF9P1boUFaymoekMQlw3gVwBGlH9r SECwxDazvBqV1bEhY6wUg3HSV6yQQWDJlM0lcwhKe3x/EXZhFv0R63w9Bb4Fq0Uxcj1l NRtCOVVpRqDsMCizKICk8GJusLAuz+JkBh8P0WkFTz55QQg8VhehLWj8iGK/Sf5fqhs1 MdaeE3+bCqBGaGVEDCaaW25/EamtyjXjncLmtlv0/EmrFFstNTHIPyHUHzl1Vhada/MW GHEg== X-Gm-Message-State: AOAM532eEcD6KOaEJ55qn/LrrPHVsQNd12bGxPVfCKLmKi/5Y//TAEPI pjMZ6fbzA+iuUy7GNltlr2KLyw== X-Received: by 2002:a05:6000:551:: with SMTP id b17mr13529183wrf.32.1626275294960; Wed, 14 Jul 2021 08:08:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m6sm3834185wrw.9.2021.07.14.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C4A91FFAC; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 22/44] tests/docker: expand fedora package list Date: Wed, 14 Jul 2021 16:00:14 +0100 Message-Id: <20210714150036.21060-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 Wed Jul 14 15:00: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: 476759 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp658000jao; Wed, 14 Jul 2021 08:09:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2Mm4UX7prTp38dC5bWujtDDy0G1GRKQHYcJpISy9lBWCsoepTcDr9Olh858QNujoE6N/N X-Received: by 2002:ab0:6197:: with SMTP id h23mr15020900uan.54.1626275388198; Wed, 14 Jul 2021 08:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275388; cv=none; d=google.com; s=arc-20160816; b=o1xMk8DG4aErAzlF4Db6k/Ogq+O4Q0ccL5SebuCOPJUB8x8gqJBRstQbJB78vTPRgs npPtfG3pfaXGk4cQtZBATMXJwio5slrlqwdwo2tgi3B30CK8cNHNRRGwyCRnI+cxtJEO BUTbt1Fwzdpi0EjXMXkW2nDTSj5AbaI2OAmj3siQp1QFSRD8NyX71YRQxFUfRDkASB17 Sfu7qycyL+GYrjB2c8nMOasb7rB0ILtZytA6bZblDVYfbQKrKptt+OPa1Jz5x+TXbnfB qU1WGvbOaACfV+UjBTljIS9v/Ds+lAc9dMBa3I+x6hBDyUcnKlnV2/q+Y1zhsv2HZsmi 3VLQ== 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=RRPhzaQSkaJJSuluyzjLF7AD5/ZQg6Y1JQ6qR1LkbHUopZVEx7mhkPIgt5ZK+hRcgV ZMpx6oYUzI2upD4XEisyHeHIa6xpuPBTxjrQlOLbjySlKbcCTE4wZu+IXGtP13CKYLZs BsebVPFLhzImyU7rdM/lE/9mIABsOy9awoI0S8yCFzKGTSjYg+AIYdNsClfSSVfDXe5c ldMBpRejqX/UxZwu6JhZ/vm25voAGBAd7IhzZlSKhxvH0jEJvHRd5qU+Yo1pHA2AZc4a nix+Uc5KOUPJS16vfn00wnjyaLoCsaKikYzQJi8vTDuRMkeRZ369WLilq/suM31v0SPX OSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yxbZOlZ0; 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 i17si1282122ual.109.2021.07.14.08.09.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:09: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=yxbZOlZ0; 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]:44198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gWB-0000Pc-F4 for patch@linaro.org; Wed, 14 Jul 2021 11:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNn-0007Ta-Nj for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:09 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:33605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNh-0007c2-Mj for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:07 -0400 Received: by mail-wm1-x32f.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso3614911wme.0 for ; Wed, 14 Jul 2021 08:01: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=SmFE7FnSh3z5LhPSBBcy1LLJxZ6gzWkY9BVFfkjPXgk=; b=yxbZOlZ0Y0rbv0crK9F4+RP7p2yXB873KGrqdj8haYZuGFl+Xo1ZKTQMH2Db4nkVMi p0r4hBBHA748Ub7UEEdyMPDM+E967SaUey3c0ZFxGzHspirkUycgyupqZ7z1qVjXSLQU Ca0e8DBUgTD2dPqiT4MIPda/HPa9hsEdUrm9YoYPwaCmA5ZzeDYyZOYZL3mlNBoV9Q0p F2adJq1ugqOjNbzptFKZrLnLz/tlAsEcZZCNwbDXD7dpVsBO1p25DnedX88iK04eXWhX RAWWJJB8nMDKcLf8JtNFo8IfxPzjKURBuPrvcQsrLskEwD1lQNTpsvz+YCZWdA/h6TXf zqLQ== 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=eotY7I0oFZCZP6kpt0ToyF5ib+hj8gKhe5vv9OqH80OtG8uW/1+FzNFh2/I88yybc1 DFaBGe8OJJo2FZ/PXJ0CQu7E3SGr88ncimxarsDQDcc73lwn1kLAojaa9id1FxPE18fR 9QG/zdUDevgHBC4ZhJ9WIJpajJ2pkixwK9Zqdy4rtFruCoZ7QEoQ1atyCCQwMvxBVXpg T2qR4B5Mq9vC+8Nw/gT47u0bdKziosqZVgET8TtyJnFhudKaH+WnNvGnajxJumnAHW2V VGvTwBTIyWCj7BU+2LVdqde4uT9AVPdBAzji28k9rZKIp2j53OnrgwftHwx9J9Ks08X+ ukGQ== X-Gm-Message-State: AOAM531qzQ/nhk0Duprl6daW6aNaxFJ2cVRDT9sVXeCQrll4FA8vxeen AdNpqPXrUlup4poEwxwsYjTGsTQpfQRU6w== X-Received: by 2002:a1c:f705:: with SMTP id v5mr4624573wmh.69.1626274859968; Wed, 14 Jul 2021 08:00:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o11sm5782968wmc.2.2021.07.14.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 523EC1FFAE; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 23/44] tests/docker: expand ubuntu1804 package list Date: Wed, 14 Jul 2021 16:00:15 +0100 Message-Id: <20210714150036.21060-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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?= , =?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 Wed Jul 14 15:00: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: 476761 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp658598jao; Wed, 14 Jul 2021 08:10:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhNsZ/9/LvALK3QAdSV2caMuku0Ozubb+LKm6c9xK7vMQRHOFp5y2ajKhHfztY+Rz5pVY3 X-Received: by 2002:a1f:3ac8:: with SMTP id h191mr12414801vka.13.1626275425091; Wed, 14 Jul 2021 08:10:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275425; cv=none; d=google.com; s=arc-20160816; b=UcultYu/LsBjRrLZV5VP2CGdVsQxTdA8wjL8+rpE/qb9aqmtaAf4Fe3qWv7KrhdF08 2inYbYXhgeKrUt3e6fIU6OS4/u8bNm2tzKsqYThg2qdPc1JW6hzduFD/rG2FPCnesdip 72zAVDPLMVP6DLEnJVa+SFwi0Dot9fVcAX6Z+E4U4EVOV++MSIJm7n2E6SsAeoBVCXjE X0Taum/zxzvT9rqSnskMxhCPFg3vh/yhbLHyd3QSqjxnF8jHcLQwxn22CXa+mW6kAVZo nBmCNQkHjV/tTLKIm/7CJltG+7kjbw8+r4iejFjofEGVhub1/N4vPLWvc7MirQjL3QEo VKRQ== 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=mPN5k8K4kwaWsQkcPg10eqQ1RFurB9YOjbuHhpACL3h/smUPeyo8UJQcf2HRHTajE6 1gaNT1pZ2Ya/KU9uw06lJy2IW8x5rBlPj2qTnwSZYB2OZFG18n6zTskKJakwinoDdYZ4 wqjl4PFcNWmJ9FLk6CJ1kxE362A8pT1OdUisP/C6oE2Um9RXR64m9FQnPboaCncvX9Zv QjiopP662Jg9HH6qZLIvbsAPdwqWJK5XjtB6CVoP1ylsCW/gDacD3XHa4qBpsqNQyAFA ixbLD8kTfhkcehMdm+uPiUSKiwin3+pIaEXarJU+GWmTnO8yBq3fX68ce2J+9XbqTv+H 2row== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a9pP9xk1; 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 l6si2677351vsp.7.2021.07.14.08.10.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:10:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a9pP9xk1; 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]:48788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gWm-0003Oz-FU for patch@linaro.org; Wed, 14 Jul 2021 11:10:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUh-00064t-Tm for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:15 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:39619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUg-0003rg-66 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:15 -0400 Received: by mail-wm1-x334.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso4118086wmh.4 for ; Wed, 14 Jul 2021 08:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N6g7OEJH6E8yVDlIOcjDja7bxAlnLzWd8G8NXFDS/dM=; b=a9pP9xk1aR+ODQunLJd+WJWrCAKB+cl5Bv7TkR5kAh6R7b1ybAHisE8AzCo2TWhWAw xwgd+bnTfFjLzfOn5VUQ4CSQ3DkrlvtXP4ARMKBBpiBqYTNBl3lFG7co5oNa8ClcFyVM C7aF/z+9BIkeO6cMRrMj5x5nETR5+Mhr/YyykxOeghCgR/2qE59W/8QOHfvzVdos0rH0 QscS0fNlq+um4Hz5Qn1mcjQpvE+VCT5vVEUHCzw9TyCoZY6pC9B0MuzGv3qodOo24sL5 h0IjMzh9XR1pkLCTarwGybparwU7nAlFVxKD5X/OknIczqORRY/0UiqggO5rTxa5/TWQ qJQw== 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=FoBaal/0fM9W/SJHzFudNmjYCZNldccySgHj9Tz3jMsb9qQ1SaR3Vebq3i5SMxTeQq 47a+exXJ+T/NRcGEGdvQeMuzJUkk6GqTsrW+2q2CB1Py7ULb3wm/459zLa6zgxmXgaaF 0elj6gYgZghSmFQRU8/4UPVOI0N51Hr5cqmEXjuU1czJ6vK14MjeQKW01mUkj5hFVd1w tYHG6MVZx9isJiU9fFjcu6645IcfnTUUbRKj16Ka0t+KrFLLy0mwCltFj+PZ4GbEQtTM 6WUfdZxh59cmzGs8wEtOK9zVBlTHz7EAsds8P/3E+DH+iCQlyuIKjiZYDMvMqXET337x Tp3w== X-Gm-Message-State: AOAM530xYbNMp7t14DTefcghWL+BAkKQgcNbe20gtoH3BfXr61j0Cujs dnC9Dj0+L4RLNcO5cAnaS94iNA== X-Received: by 2002:a1c:38c7:: with SMTP id f190mr11847924wma.30.1626275292537; Wed, 14 Jul 2021 08:08:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a207sm6529099wme.27.2021.07.14.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6A0361FFAF; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 24/44] tests/docker: expand ubuntu2004 package list Date: Wed, 14 Jul 2021 16:00:16 +0100 Message-Id: <20210714150036.21060-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00: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: 476790 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp672880jao; Wed, 14 Jul 2021 08:26:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRoCWg38MzyuARUel8wyxI2a2t+O/wgMNh65Gn64Y15VQSUtvddpDHdndVIPd82Pw8oaE2 X-Received: by 2002:a17:906:c148:: with SMTP id dp8mr12512862ejc.507.1626276402544; Wed, 14 Jul 2021 08:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276402; cv=none; d=google.com; s=arc-20160816; b=jmV2D2HPTi8RBGw6FgU4HE6lstmsiektsmU19GadHvvikJszyucLzbA4zmatPq80rk FetRjfhZI6c0BBBNiiLB64BWeZOKr0FkDbvhz6CBRzVcdwB22LZqu1rH3TguYWCHmFWv L+JK0lb8MAb/lOjEko7+z3u/etVrToAHEtEyhtw20teSK1vwoXcAe7O/BQrHMguHQOmN 7zlDY0kBZbbNavkLlEtfCfmaF1GIi2/16niSU4hA/sReviNxwIW4+emcc3j1k9Is+dgn BrL7qlMBfOAgklqaqTvbBcoVH6+bmjWHR/47/Z2RhaujTgTM77/GmbsXAimPdA5pt3CS GjXg== 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=bQJ3H4lrIPhN1a31xQqA3lDWxSHlVB6mTVqbl3HYKCSkQ4e9LSRuAGNRHvdPtxPLjz gEbZZ8KNOFitesLmYrGINv60n+lXIkeNUdyfrSDJOdEGJJbd5VqA7XZlvWAUtyvWoXyZ F65/zFkRMpCTkezVHF59xRxCsuiem4Eo9dqRysQwXNueLMT4tWD48d9oN8TAG2JIcXWU FCXllBkndVHO2YnBpAUlied2D9J1o4O40pc7dH/EOQAchPVEXaC60FjY9ZupInV4SAjO Li/VnzwCzYMV52ll1pLANvOqvlCZhKlOPaPJMpj8hW6EvhSBNqF+QBsz5CL7C15dFDZS V2mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gXxrtNdK; 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 gj24si2955974ejb.343.2021.07.14.08.26.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:26:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gXxrtNdK; 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]:46064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gmX-0005lQ-EK for patch@linaro.org; Wed, 14 Jul 2021 11:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUx-0006xu-HL for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:31 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:33639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUv-00042q-UC for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:31 -0400 Received: by mail-wm1-x333.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso3627408wme.0 for ; Wed, 14 Jul 2021 08:08:29 -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=gXxrtNdK41KWcebkuolUKtcFpA4cQh0oF4JtES2CX6ISPmmRErVzcwxNeEYXAaIX6J DC5ccFPay2nTf0wvxhxw2qUMi752ojDDXs/32ALPMjAvVu9w+eXhftVoH/mpu+QTPO5e UMD5y9RW44iD/TixKM0rBZsZkLz0VYFjEXNN729uWRtch4MPA/IIlYmxd8JFOb2IaPbS suS+hgFIIXLMETC6bcgcKkQwHg8vk08KOVm9JTXco2UInjaIIR0y5hQITxgFQQehf1Cj BJm4s2HgZjlXixvWlDY+ufmRIvCc3fhF/fxK7qRqfyoV0bz2H+GF53iG6w0k3fdsjsp9 mqoA== 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=N+eOZ6SHZyrxmU03Jxfiu69Iq/di5WbAIlyOX+DrIKpKjfhN5mNzExmRUUZlxilTDL aJdi3xfpVuOIO0Jn0rhKti2696YMdSLuSVj3X3wpoCUMwLOn9Hx05HEDj4qkSWNPd4BA JZtSUwuL/SjhT4TeYd3qhw/dFWy9vGfIx66GRjeciSAmdYPKIkwM/3vatQz6iTt009LS xk1k26qBBTBGOqWvPZketYiWr2mSSKiqK6RfrQSZy3+ADT+mET2pW1tyM/qlW5p7Gp+V 6LlTBwdlIY3miJdBx0/Mp4VP1oDjEhrDAWTs/o7dop0rniIWoa2KyQpqvUaNqYc/WJzA hm5A== X-Gm-Message-State: AOAM533a9qXKvUj+mT3y06tr6faQhQePtGGHtJ6zlH1Cagg1/gVQQrIj lDWD5XatXF1txGRRkbXNov+1qQ== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr4654051wmb.27.1626275308519; Wed, 14 Jul 2021 08:08:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k13sm3217728wrp.34.2021.07.14.08.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 837201FFB1; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 25/44] tests/docker: expand opensuse-leap package list Date: Wed, 14 Jul 2021 16:00:17 +0100 Message-Id: <20210714150036.21060-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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-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 Wed Jul 14 15:00: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: 476777 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp662471jao; Wed, 14 Jul 2021 08:14:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyBpu7DyhngTw+I5ymiD05WTPxfdP70agaWbFzfcXpyPeeDHdj3AIbKnXn8ZCucK7V79f5 X-Received: by 2002:a1f:6247:: with SMTP id w68mr12748692vkb.11.1626275667854; Wed, 14 Jul 2021 08:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275667; cv=none; d=google.com; s=arc-20160816; b=sLXCXm/dnwelvacE5W9eYz5fFnh1ukvfUZajfaQF5oUH859SYXGQuNNGzIOAipTGql Zt+alkBDf/4boWqJa8XIjq7FUYIfkWxdXNqEJRGx++ZTTj7xDt1zBHmhwhWsqMgQYKlI SuvRImx5AnXYp6y0e+1aOeGN10Jr9P+Tzd0XQ/GNPClpGY6u0n1+QGvzoXivMLc0cWhk D+X08P6PNSM+8ILRvpjk/h+7G2mw3+qosJeW3i9dt4Q4TPl5Ts0wZDDYFgcdTmnLnIw9 stbppqynFQHj3FwR5Zxvyf2jztnt4ZP1HgSliSMAufO+PatPiksjpKtVD28EGoqFbMbA Sh1g== 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=bftIGtIxhmWC4mNECuHTgGoAbDiOcj1EipwnNkqbgTI+lMboJA9zZSJNC5CCpbq5LD 51Bw/7d/jChKYoYxtFJjIMF6H5bamklAGzj108r4AvB5riuX42bc31CGpIyt9U8ZllJz xTboGA7Bo9JnKOqfb/vtEnAULy9lOwtVafV5r4L+vPxiH7wcB2Rmn3qveQpkBJatWald asmvolMlGNlBE0iWeyxASZsuza5XE+EQtELThwLuj1862yrvLoYQgsQcRI02ZReTOauG ob7xIcqNgLX39mgj8nlYkST7Uu3jFtBm58llcQzCe3sQW29wvY+mS9vKMBNdo7p/QJWb NfxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vC/qjBCR"; 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 b123si3072427vsd.424.2021.07.14.08.14.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:14:27 -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="vC/qjBCR"; 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]:33632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gah-0003fd-7s for patch@linaro.org; Wed, 14 Jul 2021 11:14:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUf-00062I-MI for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:13 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:52159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUc-0003oz-5h for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:12 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n4so1813744wms.1 for ; Wed, 14 Jul 2021 08:08:09 -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=vC/qjBCR71QUe1zkw2uPvqccmvuGHAFUOjP/5VC2Kpxu28+5Of46dOooRaCzxZKP6Q H165S3BLQ3nds2DCMs4+Cl6VB08x/RQ4KgNgvQJYzrAkfSttOFf+FApBQt9oGQYp9boP +e1oQ+xOF/f0Nfi4CPRyOQoriXnWPvp7zc2LXcr+l+kUe0yzuFmBB1f3+6GlpJ22qnoE JEBpO5JIsSEyZSeM5qt8S28qPArHuBOG29wQXq1yQltpr4G8Yspl+xPQfmPT8wYZ9bCQ p6+NfLJj7JgIv7IKpRjz3T8Nm5fLpJ6YWs6f811LuAi4msvnUibmlbfKpesmDiR0egix 0Ctg== 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=M4Of7Kkthj7cmcC+NoOk4YwOxdCSYJC1/Jwo5obW4uwor6GgYnW/kLJEMqb17DV+Uw c7kP1MrtZq2Z1mu+a2Gf0pdVtLiRmQZuEZHa0cS6pb9QRaUEqYzMn1Yj8Ob1mPWRtp1t CEyC9P5PmekyoFDmGxxvF6JF1928h8MFBKlqGXAjzgCG8Q2XMfqCwVQIdlKCUNMSXSb4 rDWi5QYQMkeihr+9VwjzjXvqxNXDRCdGELpRi5ue/uRQ1MxFml+HhwhUOagFBLC5O+7Q QfPPeKcvOzr68J3ZkD7lRwGHdUfGsxcOY9uiSkLVr1SMTiueL6osjZlYxS5Ro9PBD42v hfFQ== X-Gm-Message-State: AOAM532twVQa0wL1I5H94EIUxAHeImpT32TM9t+XbUBi6wZXcUSOAyr7 ryXVzjisMqzCr8/K6VOi4M23aA== X-Received: by 2002:a1c:f705:: with SMTP id v5mr4670350wmh.69.1626275288795; Wed, 14 Jul 2021 08:08:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s24sm3375608wra.33.2021.07.14.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 99D981FFB3; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 26/44] tests/vm: update NetBSD to 9.2 Date: Wed, 14 Jul 2021 16:00:18 +0100 Message-Id: <20210714150036.21060-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: -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 , 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 Wed Jul 14 15:00: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: 476782 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp667245jao; Wed, 14 Jul 2021 08:19:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYXRq6eC9AYRMZYeH2RlFzjOjmKCfF+5sSDHvwIkpr4CONDKQ0FFWGb6/eD8Wn2/mJ0ekZ X-Received: by 2002:a05:6512:3089:: with SMTP id z9mr8612063lfd.220.1626275984986; Wed, 14 Jul 2021 08:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275984; cv=none; d=google.com; s=arc-20160816; b=w5itdUvDAPwpUmGpVGz05Nj8bb04YY0kHxngMdth4F4eMq9sxfE0tozmOlJBsSCr+F PmlkZGkDCh2lTK0Bx4NCJNCyO72VdwZ3Mm/4/c/Biv1G7JrST3G/GeYkKxS64YaVbCd6 KUWDJh5wbK/+LE+e9X9Ge0W6U/M1+wysmRCWdM2nj8acCATk4AQDZb+95t0S9Td/IVAf S0D/zAVCWvw2DV/vHaEQ6QKJS1WEZaFfjikv9EkmMYafGXka8XCovmK1Kn5JfUo1YQPS cXb4pOVaB/71jESTFYOvpTN9lKCTGLYbhF3Qr1T81U9IBwD08AWrVzAMmviAU+Q8MBim eLng== 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=AKMsJ82BabmClOjzYnGE69aIiUrBOHRZanRag9qpUW2WivcLF0HbEZ/hnAZD1mARnK smL8nsSAai+U0Iz55eIuN1wxGBcki12xSjk+hrOBY4xMCcKEKckkIh3dyGs6q7CRfXMn YZXnKQ9A4qYNgDLKbFU0kNBlLm0ZoGHAjagsARhwO3xsTkNuMKG698ZrabfMrCtx1aQ+ i6nJ0IIkmqp0DiXlNGq08tWfjoCE5Us4tymrAOpgOEmuFgVQlaGVVe/UrLwQJc1Fczrg DqG7tGaR2Q622aBskvMb05BPdTeF8LqyBID41xcKQXucw9Ag9m4fcjlxHjy/zP52URVR +oRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PNB5aEGl; 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 g37si331104lfv.326.2021.07.14.08.19.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08: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=PNB5aEGl; 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]:48258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gfn-00050D-O4 for patch@linaro.org; Wed, 14 Jul 2021 11:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geN-0004u0-P5 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:15 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:50856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geL-0002IO-FJ for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:15 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l6so1856925wmq.0 for ; Wed, 14 Jul 2021 08:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q40Rn3JF+d2/b2IrZBQBwjU1N/Ro9qFu5x8Qg9QFHkA=; b=PNB5aEGl/dxqqXalJtDRCHzob6M86G5mWpCuXF+kWkEAEAN9LCSoJu0RhxSTnCRUTI pto0/7tNFFNse600gUIdQ9xGZwkFvYMNaS0zmG30mBWIiR6RrshOHNlHmIvJ9esnfo4I Xhl48gbUImD6J8iHXNCXJZfZivQelKH9CNZR2ccU+MSL+ZPhfL/IC3+I6Vp3z7ghcWZX 7809X+M6La1lLheAXoczhevbQo6SEYpY7W4/K0LZ+HXjoLoigImytfrM8hhkqilC/TPv fXhyegfu+r8Um4KhT5Dz2ZhcN2pY0F6tfMCy4OLJXkGeERyuYe8g5An42hxTAo6ZHeXI +8ZA== 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=BJh1zKumhbG+zvSlCN/uY+govAvDSZJOF0tIfQoAW5VmfySW93oVDVTrouQgiQzu7e r4S345y/vwnA8lYujxJQHORBRPjld5PirhZ3bwaBRIfoRvG9EbZHrd/PELoXLWQs+6Zc PnKym6tCo7lGFAp5snR9b3CRtf+RSd/LjcvkLI6IZvTzkV6BDkiAP8IsQOvikOBX/xCd vY3D89pPOuAiI2Qgsi/gfYkw7iC2zKLq9ccHt8D4dU8OdmgRsLiJ/3HTm4C+9VGJ+3qu rvYRxsmClzoD7GmWj7BX3341T0griaP6boTqVx3oJNmGfi6MJS2cxs8/spHdtxGbZSu/ XIKA== X-Gm-Message-State: AOAM532VJjc/BZolZywiUP0HftREcTaC4Dy0IuXg+M5ndwbA1gYkLh9A yCkk4og6Wx537b0oq+f1uj5Ocg== X-Received: by 2002:a7b:c1ca:: with SMTP id a10mr4907431wmj.0.1626275891646; Wed, 14 Jul 2021 08:18:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p5sm2353954wme.2.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AFDA51FFB4; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 27/44] tests/vm: update openbsd to release 6.9 Date: Wed, 14 Jul 2021 16:00:19 +0100 Message-Id: <20210714150036.21060-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00: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: 476801 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp676473jao; Wed, 14 Jul 2021 08:31:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Uh82N0dCELzxWzzrQUzTmZhenV+T/gvZhoJPcp5OlNGjIJr9PeBuvGaFuqsvos2Yvr5R X-Received: by 2002:a05:6512:308d:: with SMTP id z13mr8263560lfd.47.1626276669853; Wed, 14 Jul 2021 08:31:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276669; cv=none; d=google.com; s=arc-20160816; b=LBljurZdbrVwe/NpibcTDh8TKO8+/ZdNlDgAT5qWS2mm/ncCbJhaOB6PJX8CEW/1La K5ZJQnuUFMl41XvHTX90zXqxXlCrlSCcstuZITOXiCieAbLGvzD7CafebUG38ZLWE2EC b13o9y3UODKERqbGO55ip/81woZ+1t2UPw9FR1D8pw697MOf8YXM0iZmHLsJOmgN8ujG ivOdYI5N09mMMYEgTTZQyAPqjUa+gv9lV1j+mDGmj9PDLYLaZswIRb2hFEoWRMNrndfi dDjnAxceQLtQVCPMnLGcgGRYZgCbMvYwoe1hRhgoDqjaUwe/XsCJXnfBQzfC1YRb8VO6 G0uQ== 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=n8fLxxuR5E+7EBoDwUvAUp8rYy4DNc2mfK6bWltEkXm6u3z39dl1fzExR/4OnapX6Z GGig/JyZERlfgVeKa6RatBWBy1uTksVWLqse3CTWCRaUwBSOzZFbTwtGFDC3QoVse+oj Tjmmgi9KXS5+5ZnGtxJVrntGHc3QtS+37ofIs3PHuL6oSRJaszO2yPL4jVOLz2n0qDVZ JJpXfFnDmWcBQPcKUYjUoTCmkgQx0x6PaQF5FhbhdWaPLkB6ljTAX0LR3++jEGdXOUGr Rr4AZnLZqXBaRwmnRe+CCBEGnuLgNgW8UwQvW4uVdnljd3nQAru9yI+VSCCwG4ESdI6p eQcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VIrK27po; 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 x1si4739063ljp.86.2021.07.14.08.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:31: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=VIrK27po; 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]:36196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gqq-0001Kn-DH for patch@linaro.org; Wed, 14 Jul 2021 11:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geY-00058u-R6 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:26 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geT-0002NP-0d for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:26 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso4138281wmh.4 for ; Wed, 14 Jul 2021 08:18:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c6c/2UKBKcmwZO3rKn9f4u9KmPaZeHBM5vy4ozHzctY=; b=VIrK27poLTtyA7PxTkHxEbmRq22AN/2gBBLNxYEfYLhnBULcQ58C58lYcEafbYBmWO RDv7+CyVAoxwJTEsD5M5xptYRwkUMDt6gHeU6oQWSnAOina/E1psunVR67TolB4we1Zv bLdsjUqcfHkwbFY9i2eLtQ9xvobfj8tVXV4w9on8ZFx2I/B61dmOrJpm3iF9p6awSTUb 9lqwWXeE9IlWKgCnzUN9LxeNp4OGtAwvdUp7zVdiZSaDefluVXS1yNUNwmVgSPtiQn1m Y6+zsQyswdajKRFkXkqhFucSKBs+7JK6kNZ3eBw6jzutSs5J6YDBgvOyUJAFbDD8vFNH AooA== 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=exPvUHHn8FnbMYIEZawPVTNmZ1ryMCC9XQxxa8wspYavuWmKfB0sld+Hw9eDpab4Dq eIDZiSXOi1euJG0vXNZzzAUJgJ1ySrAypbEBDX9D1p2XRbiH2p9yo4b3TCdFhJ19nKoO A5aPnuZccODEsasziRoYpqZMeSpZ8fmGSNY4y50TUqvIphN7/TTMwvv7gXtJ7PiaQ/HH smNAD0H4l/N9KkUnNphnIN5Pq5385rErt645fJ9YiSdMH7j/dHJITjjV+aEslhLBvjob jbE/Ym8x4m3VoP3k2oRFmBeOuEBhOydzDbZJDKz9ZYg3LXBWrYugCf5ghGjpJOid0n02 1hag== X-Gm-Message-State: AOAM533elA/QEBDEVImDZqoeFSqkIiBCo+RmHTYjhKSJEdadFjN1yA9O zGDfP08bITr1dgaBybFPKsBikWRJaiKVHQ== X-Received: by 2002:a05:600c:8a9:: with SMTP id l41mr4818832wmp.152.1626275899616; Wed, 14 Jul 2021 08:18:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t6sm3099249wru.75.2021.07.14.08.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C910B1FFB5; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 28/44] tests/tcg: make test-mmap a little less aggressive Date: Wed, 14 Jul 2021 16:00:20 +0100 Message-Id: <20210714150036.21060-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00: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: 476791 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp674092jao; Wed, 14 Jul 2021 08:28:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRJ8vwbdEIVMcp1lhwNTg21o010U35WrHpGCbfZZDpXZya9jY0VYdN2opSjFlqKBDMN3Oa X-Received: by 2002:adf:f592:: with SMTP id f18mr13550137wro.179.1626276487842; Wed, 14 Jul 2021 08:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276487; cv=none; d=google.com; s=arc-20160816; b=mJ0x+t82iytxpcb97wkhD+nwh5XQtx0G//jkDaMopFrxrosoAQH7kH8w+bBD8pdZqt TpDDfjPfVhxvnqM3LfmCtYUWyMXXkpMtiNedbdMPcyWGi/HZdJ4WENkqjkQIVotITOxh bZGg56Awi0HBXWfLo6KBZ2QZ596Gciw4qT0vdlidnC8iIVUvePgOpNrluaRBAL+Tpkl0 6x7koGCJP+/Iz6JosmLtLuOCugz2ICVTRSfV+NIFMwGrBFouyIVXImEmFY4YEDGrmFTf xGtFc0NP00ONwMlsZ1gDe/Fvv6xGMGPdulsR+iwF0ME9+5bBnwBGDFK74cVYea5if0Jv +DmQ== 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=M4a4hkRuBEQt9TEANpahd3PHF5TviVz8w9QDC7d2mAXx2fznyNGRk/LwUxzj6aMcsG PisWeq5uvg2XE3XJJsfpH88zYiIgum25ommP5hMDGsFuUOlQKqCTt84ZEfPEKkXUh3OC n2brbCZJp0r2fdEYwvIgH4iFPZWLmIT4L4rIwjrYaaHmBO7HeE+gG5zbKjWWQd3p9njr UoD7U65SWohA+gRsTkVVobJposx9vPqdg2/TOa67fFMaUfGmg1inNuDsQ2WAeOo4dq55 xvOFbjQ1aqJYZXlwv/rkGZt4+xsiQ1aD+Lc+c6E3EZV4XOwzpBg1P0135+y+FfgR5VaX Ia/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vb23rUyT; 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 t7si3488178wmq.207.2021.07.14.08.28.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:28:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vb23rUyT; 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]:54428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gnu-000311-SY for patch@linaro.org; Wed, 14 Jul 2021 11:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gV0-0007Af-Gs for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:34 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUy-00045F-TI for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:34 -0400 Received: by mail-wr1-x433.google.com with SMTP id f9so3612011wrq.11 for ; Wed, 14 Jul 2021 08:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NwsUwBTLZFfTsKglJpuTCG7rL3bqmkHOdoMoH79RLik=; b=Vb23rUyThkzOSQ5V7Z0HQuRSFK5Oj1TM2dOqika8Nq0B/+J/DYlGoj/mdfGTexs9g1 Hj5mhyu2KZ4baBQ17k/cqxJ9EVSrX+DTFP3vn4pT36Erpv1A48oKyGpKvTM8SOQ7cIji Xn9B+r+0/rS0zQMONRD40iD2VlfoWFoV1LEdXWepmfa8LfYUKdOvrq789wlQDFX2t28u 5yetS68vB3E5JtdfRrx2zJaMwAqsWhk8K6JjlXa1EHjVORgeeJv9T3TVcaAP05MWoVCB IRS+YLOyk8NGk/l7gjyTtFWjQkvN9t2KKP9E/Mf7MaJTIYCnDiVusKVfHFteVW6DkZnG 7vvA== 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=Cr6phQZYZjvOu5JP8qqDbOBKrmu4rX/JZ3StXJdhuzyqYG3k5oHgnhrSEqefuJS1Ft WAJa7hL/SPvhR3eBt7I6N2qXS64vavlHYIhsc/DL33an6KDCKIh7IPZ5tWZLHxT1oLs+ L/fh4P5ZFbs31G79REXbsrICxngR8uFoOyWhQXycWust7+RBERevXXGHYMWLgZJwQCay Te8LgBywukEEmHELn3QcNqq0m2SI3hkz2sySiZ2XjPqldYiaXKbeRNRie2dJuGAA4iZa kn6X6VFxDeowTx+SV7/QIaqQkhwfzc43hgahbYO6bOWHHwmDQWxpWlhjFZAqrHFYjnNE WcDw== X-Gm-Message-State: AOAM530aPk4J/mUBo5WatW3bDr5tS50h7TL2Ac/jewNvhYgtqaStaytA l+COLdFzHUAvG+yP8HSGmUJYx/mL8pAbgQ== X-Received: by 2002:adf:e409:: with SMTP id g9mr1965992wrm.66.1626275311552; Wed, 14 Jul 2021 08:08:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f26sm2344648wmc.29.2021.07.14.08.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E38D01FF87; Wed, 14 Jul 2021 16:00:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 29/44] plugins: fix-up handling of internal hostaddr for 32 bit Date: Wed, 14 Jul 2021 16:00:21 +0100 Message-Id: <20210714150036.21060-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: 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 Wed Jul 14 15:00: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: 476779 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp663628jao; Wed, 14 Jul 2021 08:15:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4RdNIIoLoeEIZIu20cG4q9i4SS2xzlnEysUWK02Uc594ZBUmRZPEZ7oOYp96bmXlQ7d2/ X-Received: by 2002:a1c:59c3:: with SMTP id n186mr4772229wmb.48.1626275748772; Wed, 14 Jul 2021 08:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275748; cv=none; d=google.com; s=arc-20160816; b=XsNnnpKb3G6TP8ENrMx8mSx5dJqh90jtO036jGcVFKl+iVysbpD5JDki084p9kRRWw MEXt2lzab58CvvoU3Jgk63eHH+VFgfUIyIjXUNBnHG5PolGzWoTBQPUTGo3JuFkF16Fq Fmvbc2+Qyu2i+NXvM0sg0vNdZcBZmWcMbrtJ1pM1F6Uf2f5ABkIMU2MCebEby/4LcvtY P93JyB94ZcuIL4GdGXcgza3IN0JiFe7Z1hDDwAO9gRVliJiURdMEBa08Qkt1bguXyMil BvYf+XoPt097QeKpMixPG4l5W6mN3RVW5p8Wano3B2n7VlyQ1N6p/5ux1FYi2gO07/Xb iVPw== 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=uYjpqfSEzxq/cYdDqk2TnBut/PBRcqLRysFivAHVebY=; b=xEfbo/oM3df4wK8tEhyRcS4KBqQXZWz6Zq7VGj9at21KfBNQo3RHjDFqwlflzPJ/yH /wUDjDt9pZgu0WUgVcA46N3gZDQ9SdIJRWPL8mnjW2koEsSo/eDuwVX0iuK4zXdDgtQr EP/y5yskEoESihDkTR63rGVv4WCzPuRWzv7d1BwE0KZbCe/VV/PIsQWo+53K4ly314Jb +hxfBwbhETWppamsMcuvhJhb2bAcIQxPPSu2/eOtXcFMBiB1xQik2gJZZU52T5b+WK3d BubCohafk3aBg2FqDKsEjzlRdEWp3NgxwtWQiroFxtTpKZyLfsclvN1Km6dMX0XpKsc1 8JLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=orlj4CCF; 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 js9si2864605ejc.433.2021.07.14.08.15.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:15:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=orlj4CCF; 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]:40832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gbz-0008Q1-Kx for patch@linaro.org; Wed, 14 Jul 2021 11:15:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUo-0006LM-DK for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:22 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:45993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUm-0003wK-J1 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:22 -0400 Received: by mail-wm1-x336.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso1643021wmj.4 for ; Wed, 14 Jul 2021 08:08: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=uYjpqfSEzxq/cYdDqk2TnBut/PBRcqLRysFivAHVebY=; b=orlj4CCFwNNOWkqmFe1h7C38dsLDLBaPJwMq8vvMJWolsPW39awAknUYwHBT71sM8O Ql2ZCwDSWKJrGNYQqZkxOqoe3LsZo3gQrAw4aD0SR494TOq0cZcDFHFyBA4MXmEzlaja MGWuragpllRMy7oEm/HsBwR/xmENUEI0S5EKgGaaeO1CDEmCmNPB4gdfATdyDcGthmJi po/InI51u/OjVCmEosAvl1pnZuakWPtrI4/pOtXQXy5wpL6c+Nst/3WqFkXNCu53oxdP ZWOLA5C+RWJnAJdujRhfAN3DI48OTPZ/kB9aA/9qzRcfIPYqsTViTOvjvWkq35PEUjZN RVqg== 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=uYjpqfSEzxq/cYdDqk2TnBut/PBRcqLRysFivAHVebY=; b=KnupkqH0qmj+/kRix2hLiAb3ieYG+08YizAzUFgfPQ7+gcmEVngE9BI6xQER1cnIsj Q+raGRHzDqsLoNNLA/Y5fhW4m+9jVQe3s0kx7fNg1MYl8jMF+qUqDE9/6sWbJRAH+Ned PJy32DLfFVUDkvb00VxzP0fZ/9O8UeqVSZeqLxREqtaazdDkuALB3J22O5LKA49zOkHf NABuQM9VhWVW7iRtJ0MZ5Gxwdxl/Shokye+cPMIpiYw0XMulzWv81x/JaHxLZSosjPKF pDwshv+Z2xMsyTRJ9U5eM3bl7deHkG5nh0X7UCzkm/dmfu/6QsjC+SqODzznny4uK3se X/Og== X-Gm-Message-State: AOAM530varPWHCk1F+TA8zYDx0IjiE5MN6IhgzUi42yaszuLxie+agEv PusLEj1kvpiNyXR5kDjmI8CASw== X-Received: by 2002:a7b:c1cd:: with SMTP id a13mr10968194wmj.94.1626275298548; Wed, 14 Jul 2021 08:08:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e8sm3075086wrq.10.2021.07.14.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 049C61FFB7; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 30/44] meson.build: move TCG plugin summary output Date: Wed, 14 Jul 2021 16:00:22 +0100 Message-Id: <20210714150036.21060-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: 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 89c09ed7ea..c6dd70c400 100644 --- a/meson.build +++ b/meson.build @@ -2833,7 +2833,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']} @@ -2949,6 +2948,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 Wed Jul 14 15:00: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: 476778 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp662890jao; Wed, 14 Jul 2021 08:14:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyimxeaxcYioW1Dp5vQ0ljEW0V1sMSp5hUY2suyfeWfk7fsMUPmKyT3TNOHO/pD5Is3Ykt5 X-Received: by 2002:a50:9345:: with SMTP id n5mr14524036eda.289.1626275699620; Wed, 14 Jul 2021 08:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275699; cv=none; d=google.com; s=arc-20160816; b=nYVjluUWoeRPLVYDpBDN1d/H0cXTAJbFHFuScmc06nonh3lSVDTnbVpRNqTPcpR6wW lWX3AOD+ziiHdCkTtvGX86lZVR3ikEJY6mnZSGrBpQ4b+qrx39FDGcN9GvP7bAHZBAui m+hFJlmS3jTM0ddvJztMELebGY0z0RsZZfp9sYFOfRYxBITa+cVlQjRmAHxFDEv2y2LE vplcc2z6ODs51Wz2Ev8qRTQ2vZ7E6s20V8yT29gFFIyTO6TmX1PnAojmPyYp1/zerRHi Djcpv3OeYDDjVpg+zIgBQc7EOzSJ7ymYHx4LwgPU5UJP/10g/aD1fjLHKiMzocEkO2Cw vpxA== 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=6yU6hRbpuBSqR9M5Laxs7PUH+BSK1OBncy0W794VEpE=; b=cjHsd3KxaeeNMtobT7GakGVvMLI+iUSdaEjOFSkGXpw2OtOYiANcA7a9W1muDMNuyp 9hPVFe2i1e5g1vtgFf/Xjytiidi6Uy06k2h7ofn/rMr1cVl+KCnqKwCkPIZY/w2WJt1t HERIuOJPS/OFSzOxf2O7lqdXFfkFkeEB+axlUqry1yXH1TtrECjA7YXt6C7vFwPDXq+F TBhra4Z78SH6Vd3Ol7hIMiHm3fSyjc4Awr0Va+43AEi5B158uUuCoGD0l2vSvefy2kah S0kIVySOMhonsIBcbV8OPBwwk2SXY/D3Khos9b75ZR8BBAucS30qH+FOb8O1FsDdvZVH 26vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u5197Kaj; 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 i4si2921026ejj.165.2021.07.14.08.14.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:14:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u5197Kaj; 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]:39008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gbC-0007D1-Ks for patch@linaro.org; Wed, 14 Jul 2021 11:14:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUt-0006gG-Av for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:27 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:46863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUp-0003zB-QG for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:27 -0400 Received: by mail-wm1-x331.google.com with SMTP id o30-20020a05600c511eb029022e0571d1a0so1641768wms.5 for ; Wed, 14 Jul 2021 08:08: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=6yU6hRbpuBSqR9M5Laxs7PUH+BSK1OBncy0W794VEpE=; b=u5197Kajo+qFd3Eyzg6U0K++bn9+70ynhZKcuSjakAMfunyU6zyLXqo3EJtA+S0KMa 6uCs87dd203M2e6+UAXTx/hWqSIQvnXvPexD5Vt7b7A0x9KCUrE+jHPbwxAVOje0clq0 d6Md8jf56L9NxrkwajAbmsoCWZPSwitetlp6ROkIPpRi12Rn/pShYwLXDGTP6Ra6QkD5 pWLIPJMI7ZQ96a5AG6NKxEzEfRI8EOfXLh03GQc08rbhpFV3PzpHrhnC1QFKRMEM5Sgf 9fWA1mePpYedQrQkwCjIMm+x+MMChAB9JeJJohQnFtjetLs7MGLSeYAlIbPqPH64eDPK 8+AQ== 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=6yU6hRbpuBSqR9M5Laxs7PUH+BSK1OBncy0W794VEpE=; b=KNykGIDCyjgi/9WpawqIeRgmEfF7k0DTZaONX/fUFMQup7tIpsF6ScDodIb/YX8UnI Ge2ma1fOEs5Vo+A7yNL9YTEOJZEmSgVbhAejO55AljkwfzGCkqSdFPnFo7fMLWYxeKKE zyYOlkoybED9sA71qMzVHdiSkjgS0Dm3oOEZJOFQ29RsWyUh69XfnQeJzoh6nau6BNj0 QTPT5s3dXjt1sm2GKNGiFer+KXXiATW0sNsm0J/6+qTDQeDmueb2OyDXJ7F+SON6DNx7 PuOOWtcSFgFVuMsuejFwIfcTLwbZh9BgYNHaYbJoEl6uPAVO8X1Q+63N4Bv28pNYXPjK uNGg== X-Gm-Message-State: AOAM530EfxWRdYQZKv7+wr3yEDfW4aL0YidEqBfcTnjK/CjAiLPNKwHU bWeUzmk1uMQ50hRcO67Mim965Q== X-Received: by 2002:a1c:a709:: with SMTP id q9mr4592632wme.23.1626275302387; Wed, 14 Jul 2021 08:08:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x19sm2409759wmi.10.2021.07.14.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A0651FFB8; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 31/44] meson.build: relax the libdl test to one for the function dlopen Date: Wed, 14 Jul 2021 16:00:23 +0100 Message-Id: <20210714150036.21060-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For the *BSD family dlopen is already part of libc so it's not a hard dependency to have a libdl.so library. Signed-off-by: Alex Bennée Reviewed-by: Paolo Bonzini Message-Id: <20210714101536.16016-1-alex.bennee@linaro.org> -- 2.20.1 diff --git a/meson.build b/meson.build index c6dd70c400..e5de144233 100644 --- a/meson.build +++ b/meson.build @@ -455,7 +455,10 @@ endif rt = cc.find_library('rt', required: false) libdl = not_found if 'CONFIG_PLUGIN' in config_host - libdl = cc.find_library('dl', required: true) + libdl = cc.find_library('dl', required: false) + if not cc.has_function('dlopen', dependencies: libdl) + error('dlopen not found') + endif endif libiscsi = not_found if not get_option('libiscsi').auto() or have_block From patchwork Wed Jul 14 15:00: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: 476814 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp679075jao; Wed, 14 Jul 2021 08:33:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4LBeygNsRQkXhM/7lHBRfuc62U87yv4rkjiSqnH6KG5oIP11HVfXfpIJjOKofU2lCZu8C X-Received: by 2002:a2e:9bd7:: with SMTP id w23mr9935291ljj.415.1626276829315; Wed, 14 Jul 2021 08:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276829; cv=none; d=google.com; s=arc-20160816; b=G5lLPCBP6/hNNnYQIr9+HIt4AM/SbldbgvnMCeXkOufcdSCTqv76WlKIP7KHLTNAno zUXB2ZJeak7BT+FRYUUKIOWkUlJxYHlm8NB5hG0ljT/0PEF2O4TLmrHC7k7AKLq3lgDD lDlpdYdmvfNqtwNu7UM+A+S2WU1dBlXd1Xww6/uBIevTw8efEXB7EKvvb4bZL9O1e+dc rjyeEBkHDj253Kphy4Jn4SAhEXbmf3hESx+1cmwpkB/oJhlBGb8dArFNBKSsBQLtfKoj EpjzDBBWXyY5we2sMNcdKPaGgOcd+SWxRxnL/jqH+3gHsM1acXN4tcqYeHeF3jlfcqJS Xceg== 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=/lMniXsogkugA8ZDZhDsdubmKkZI/PlOffMKgu4hGm0=; b=b8DRVFxS1E48xL5X/m7qx3Csgo3kxbqO/TnlwhupXmntX6hEND7L+TTmD0JVl+Vxk8 gS/WG7/ufz1Xy7yukjecMICfmDjfEEoQbbGsTfAINuUDJGk+qFYvU086qJPdsyDUDKRU 9YTFwFKjf/txQUTNSUYVYBMohrb1Ri1M7UlKmbLJJGaplMxyuRXf1VTuhU9YloO1ZJxg aOfH+/3SHLwe/9HMCAI51E2Acb4mhvsVqtX7bnpZOHrin1j+FvdY93qYf3BLgiDpIKfU +XaHmbFjXoZ2AE/1WCavSphn1YdTwM8B5j9lWXdD93AJf/vwTkLAAgpcS2AgnsffksAp agkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Nwn4JYD6; 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 i37si4682676lfv.516.2021.07.14.08.33.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:33: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=Nwn4JYD6; 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]:42834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gtQ-00062R-8L for patch@linaro.org; Wed, 14 Jul 2021 11:33:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geT-00050P-FF for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:21 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geR-0002Ls-5w for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i94so3694649wri.4 for ; Wed, 14 Jul 2021 08:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/lMniXsogkugA8ZDZhDsdubmKkZI/PlOffMKgu4hGm0=; b=Nwn4JYD6MNBUh4iAGR8551J1DNBcKLrbzbruJQQr35uwilYqOgXt/Dq1OX+AZoXjnL RL8KFOXEC80YiiepZdhQ4RaiMHIJvxDyFICmH2NYnNd0novtFK6IbvlKEGvc5czsGGyt 619RfRnjNiIKCWn/WlJfY7/uGo2jNj3aMcD/o7/1OpMIaupo8TrULJtOmntPlu580xAG 7tRsEcNcQUUcXaIkuasJebiJGsxF5wUucWSVmNU0+6vf35eV+uQRUjmfcVq0W6dOMC8s FBpNoqwMPP0Q2WEjFoEIjq4AwogsTbTVVTpWAWtW+u1ekfXGlWbiS2pYJycHvj/nKlW2 LQKQ== 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=/lMniXsogkugA8ZDZhDsdubmKkZI/PlOffMKgu4hGm0=; b=Y0k5aXPP9tDRo1sjPrnkqMsAz11NH0ProrQ6P/yXlGe69x74IheUNurT2T040QmrqB zQkyQ9HRA/xZzCim50KCAEX5pA1HTQYD0Fd6y+rY1z2QDSR8jRnLb6X5pVXt8caTlyZp dY85n72FdV2FR4Cd+ayc5K2nnd5e5jES4YmQbLSGCoLt5fb0VtBAF8uUnKG1WWktwa+V SNnzWncm+1cF6O6KmLjMVh7wTValIu73Xs4+kFgv34fKSSi/iy1Nz8kLCkIXNnyLubtm spfXMzwfxfK55LMvBz+z0KzaLcMqponTMjuKhATpFzZjHuX1fjpyVqQtXhT01aM9O0cP yCvA== X-Gm-Message-State: AOAM533ap2FFP0IoP+5t09cJ9X5LsJyHbcPBurUz1etXxqfigx8eQcWy X/af6KCkH0JK2uK3jYUPj6gxQg== X-Received: by 2002:a5d:6506:: with SMTP id x6mr13406330wru.86.1626275896155; Wed, 14 Jul 2021 08:18:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s1sm5718430wmj.8.2021.07.14.08.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2F7461FFBA; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 32/44] tcg/plugins: remove some stale entries from the symbol list Date: Wed, 14 Jul 2021 16:00:24 +0100 Message-Id: <20210714150036.21060-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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" The OSX linker is a lot fussier about these missing symbols. Signed-off-by: Alex Bennée Message-Id: <20210714101623.17046-1-alex.bennee@linaro.org> -- 2.20.1 diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 4bdb381f48..40b4ff3821 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -8,9 +8,7 @@ qemu_plugin_register_vcpu_insn_exec_cb; qemu_plugin_register_vcpu_insn_exec_inline; qemu_plugin_register_vcpu_mem_cb; - qemu_plugin_register_vcpu_mem_haddr_cb; qemu_plugin_register_vcpu_mem_inline; - qemu_plugin_ram_addr_from_host; qemu_plugin_register_vcpu_tb_trans_cb; qemu_plugin_register_vcpu_tb_exec_cb; qemu_plugin_register_vcpu_tb_exec_inline; @@ -32,7 +30,6 @@ qemu_plugin_mem_is_store; qemu_plugin_get_hwaddr; qemu_plugin_hwaddr_is_io; - qemu_plugin_hwaddr_to_raddr; qemu_plugin_vcpu_for_each; qemu_plugin_n_vcpus; qemu_plugin_n_max_vcpus; From patchwork Wed Jul 14 15:00: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: 476787 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp670658jao; Wed, 14 Jul 2021 08:23:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZetzdypakism/+oZG3VnfVXHG3hqW3LkLXco8OaaUnYWzT1/x56VmwJBqRdPilc5HRJn0 X-Received: by 2002:a2e:7f12:: with SMTP id a18mr9880760ljd.492.1626276233501; Wed, 14 Jul 2021 08:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276233; cv=none; d=google.com; s=arc-20160816; b=R3wjV5BIKTCwYZzH7Cs0MzHudxrylpflWl1W68r50eH6kykmLx6pBpz2/gB08MYGkd WSl7wP1HyeVYYHAwrFno2JZAs02i6iSfBwmB8aSJc9VtXDbVFmy1ch5MwUkfOJ5Djp4i fmGNgdbCWxkEhoN395XlABcVrWWr2o8rjgMjnuoi2gsi9vVKlM246gQhZYHelR5o1gqg krOmcbDzIKJW+0V6ZCazpa2BVF+bxC3ubfQwdbSPM0gYMfoYP99QiPGkj9klhyPidiVt jB5p3y+UVRLtB1626ysBJ1wRgrLf3gkQFTfZTIvNIOJxcXgf+hPp6bxIKo6jF7SHEHw2 Qf5w== 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=BHQFj7LJmqkK4fnAtb9yLTlpkkBhIUxm3Sb/+SC3MMA=; b=EREtFDIfUXHy0hP5yZKUMRdWi81LL9UtZ3RnJSgsBDhGjvXZaBKXtTc6+A4YcIhkhy Bo8bcyggSh3PHYue15BknjCA4mVGyCYAPdHUwFYSAnzQ6zOEFeF24eF63Rb8iG3SL8Va esGGErDcT9oCEFAcXQrfJllc+9rQJYkkKbrtGqxqjAhostT+nC0tNvcEDn02Neeu2TGK 8H2k5+/hKfombz6+pgoFOKEctwS9tPjd2XGd4gxtTmFr2YDBz2vATzG1elNKsjyJBXXR oSCg5cd8nFhwzAyoW/mii0Dw3SqYLC4u2hGQeoO+uUolq/5GtswIVnIucyBbWFr0ssyY K4ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GS6pmjQH; 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 s3si3613481lji.164.2021.07.14.08.23.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:23:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GS6pmjQH; 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]:37510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gjo-0008Pi-An for patch@linaro.org; Wed, 14 Jul 2021 11:23:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUu-0006m3-Sp for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:28 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUt-00041O-4g for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:28 -0400 Received: by mail-wm1-x335.google.com with SMTP id g12so1808645wme.2 for ; Wed, 14 Jul 2021 08:08: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=BHQFj7LJmqkK4fnAtb9yLTlpkkBhIUxm3Sb/+SC3MMA=; b=GS6pmjQHia2HZey5gzy5WWkS3ZnjSqJFIfC6e6JbIiQAJvXQbcTlcdJc/GcVO4VGrH 2lqLewoLOMw/YWuzReR9ZEag37iJ2sNzzIybwmONBDugDULDdUvl7Ea0b0T4F0KkpUmT DTFNlx9j57Ly39KbNVhhMCZgTNpcN0GEvXYSwmmspLR9/QwP8X+a/KJnX+m2BazrB/yu mjShyueqdOayRtbG+2z19SGzLq+LpwirCzziTRBpVc843+mY+4r9/rqcfJd8eJiAaKmB udo9yM6/FWt6l5BH23gWTqRISR1HTKyxSFJjDJwYLXCsTBKiqyEo2QMNL5C98BN7urCv iByQ== 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=BHQFj7LJmqkK4fnAtb9yLTlpkkBhIUxm3Sb/+SC3MMA=; b=K4NF0eMqgDtjufb/P6SSg1Z7/OUXCKHhnUEvmw/+vkFNgM8HMp3ebXfbtmQoUoa1ht M0C/oZsFBGvIqxAqpD1M3NHwpwXGmx4iMd9XI08ePuGP3OsPS5aWfO/1oedIb9kVVpho VvgmhwYJd+H3A/RbMbIwl6i91ISzTQR5XafZNBolizRXAbpWmBdmjFr/nTWi0nO1dgZC kyLd2h0hvOcsx/omZU5Dfkgf562VwYVk9ROIvB1xrEsXIB17osH7o6JS+9186rKFhPw8 c9CANd1KfGFmZNVZbAMs5PM399MXd9CkNkmSpJCU593M4T9vumLGbAyY1WwD1ExdQDje VQVA== X-Gm-Message-State: AOAM532su4ihantqBuyrT72mfL0waWdCzGa4wR6tV9Xya8NSA9MO/d0O 1mtcTkKvRRwNwXAv4rYeJfDqSg== X-Received: by 2002:a1c:988a:: with SMTP id a132mr4593295wme.175.1626275305605; Wed, 14 Jul 2021 08:08:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm2927491wro.79.2021.07.14.08.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 497831FFBB; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 33/44] configure: don't allow plugins to be enabled for a non-TCG build Date: Wed, 14 Jul 2021 16:00:25 +0100 Message-Id: <20210714150036.21060-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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" 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 4d0a2bfdd8..e2a353ce1c 100755 --- a/configure +++ b/configure @@ -1110,6 +1110,7 @@ for opt do --enable-cap-ng) cap_ng="enabled" ;; --disable-tcg) tcg="disabled" + plugins="no" ;; --enable-tcg) tcg="enabled" ;; @@ -1575,6 +1576,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 Wed Jul 14 15:00: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: 476757 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp657186jao; Wed, 14 Jul 2021 08:08:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy00mw+2l2bQrnwTAQAWQUDBIxrOViOqWqJMuZDk1TR0UfdqyIdKpiMsQJ1OJGsGkYfDT3x X-Received: by 2002:a1f:6247:: with SMTP id w68mr12712088vkb.11.1626275337561; Wed, 14 Jul 2021 08:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275337; cv=none; d=google.com; s=arc-20160816; b=vmhmfckzhafziWGevw1Q3NmkhSo0fJV5HL4+KMMkDj+TkNw/FPL3J7DY0RDkdPk3Dk NWibawVfE9/M6RgHDmcz2DkjNlTWChK1P1i812kC1pp+NHWv9CH6QCKsgbcq3FtkQSAT XbI2utfz0Z6UwlEJoacCewWBHkj0G5oslulroCt5CDDSrapMlWhzDTcvf3cek+CSz4bs NnMaDzgWIkCytphjgFjkygXZmz2bFgKe0i2Ija1PMIi7L4mnfOWuW77qN8HX0YkeVPiX d1ZABIp6TaRMwyCP4uWvY3ppschzDgM4zZoh/3WedmTrggoY/ALnvwvasvn+K+TNaD3I YbqA== 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=Rz4HF13UL2VWdnwq1nt65tHpQIxllRbUtKus9j4K7Ew=; b=yErV/RGnPcuS+dy9nIMYGmlfvhqS0rQnvYWHOyfVPAt6g8QLohde5rBjRAgLQEVqN6 vbyVP68MhEJAbl2crSXTXGtb2kn69dL/XR3bpC2JF7Kwp5ICTmp+22yyRUr5UbjkhGbX X7wDhANMa/eOrS4pOniJ5dzQE8KJWSGnQBh3J5OqGPWU111WRtC2qiCKvjiHRoCJoPeJ R+feLfgDePpfAchufOnK0FGSZscnkq/5C1euTO85F6Sq5kh4f7KFK02cIeIJS6pvzg3g SOnhX3sRmSwV2fDtS7oAjakY1IU6W6i0thVFhZIcT3VfvfxVeEiHUELebcbEtc6bEqR/ wTHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=veRAS1iS; 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 k27si3178704uaa.116.2021.07.14.08.08.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:08:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=veRAS1iS; 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]:40152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gVM-00068j-TU for patch@linaro.org; Wed, 14 Jul 2021 11:08:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUh-00064g-SR for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:15 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:46628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUf-0003rH-Ig for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:15 -0400 Received: by mail-wr1-x42d.google.com with SMTP id d12so3593867wre.13 for ; Wed, 14 Jul 2021 08:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rz4HF13UL2VWdnwq1nt65tHpQIxllRbUtKus9j4K7Ew=; b=veRAS1iS4K0AV3Xw9SpR+XuqUhvBTMeYtNP+6IFRZdePJlzYMYNrcMmfqrB6oYqXDa Ke59pNLgtH64U5X+H8xBlR0+7uMgBmOg/gToqDW7QC7UukDxt57RhhSBLFQm6FK4jW0H 6aP3QRCTVIJ2yjjFUPA+70sjpS5XfQaCMHShYP5O7cfYqPkKL4XdRXu7VY4aiM8tawtW 7cUDoIOU5eSUpjt9BDLlcZusHhjNPapHcca2NNXd0VFBHvy+DEQFSVg5bT+je7BzS7Od pmZOcDqeDqkLlzcTDvbfZvHWsDfO2/2IuuH1yH535lvHVOzvlVp/jgyrE4m+W0VvFhxx w8Cw== 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=Rz4HF13UL2VWdnwq1nt65tHpQIxllRbUtKus9j4K7Ew=; b=TBJy1nZeWmz7ITpFp3Fv4mHTPZXbhbC0vRYjgNsTLKVzmXFZ/e9K5wDqGiFv+kkUWY VpNAnOFiOyjShTDmyZTFeOXknZxi7N0QyyklHZCSd8Oi5T4sbmSJ02TG4zbeytwP+gNp ZzksTqsCVL5nQ4qN5oSMBlPx6r/eYAPRAiSabYjvE5w7y8R9mCap9kqlm2SwrxuUT7Eo /qFLJlUhLKvFcOaNACBLLvlmtTHH1uZsuuQOqau8vFE+gQ70AZCmo5RS+gLNJqbR8GMv Q4lEnuppz51wk2VqdJrEi8EU1E89EAbRJT5OyHKN972quA/kzgdW8s4Ghd7UHlm7z6du wjIg== X-Gm-Message-State: AOAM533REEhYPSH1LuHqhJ5kz0vLX6C9xBFdbiXw+oLxtf1Excl3oLBQ 5RolJTugAjlDubsP2UxLBDdz+w== X-Received: by 2002:a5d:47a3:: with SMTP id 3mr5956404wrb.172.1626275291779; Wed, 14 Jul 2021 08:08:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm2951355wrw.62.2021.07.14.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5E81F1FFBC; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 34/44] configure: add an explicit static and plugins check Date: Wed, 14 Jul 2021 16:00:26 +0100 Message-Id: <20210714150036.21060-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 e2a353ce1c..2c39ccf8e1 100755 --- a/configure +++ b/configure @@ -2197,11 +2197,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 Wed Jul 14 15:00: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: 476786 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp670639jao; Wed, 14 Jul 2021 08:23:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylJGP3BubuaquANrK/+kjymcbKN9Ke9Xtt8/U1gqSGbdVCk4W9f6hweK3Rw6nmWnqUabvl X-Received: by 2002:adf:9d88:: with SMTP id p8mr13707171wre.409.1626276231532; Wed, 14 Jul 2021 08:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276231; cv=none; d=google.com; s=arc-20160816; b=nm6IZ5TG7MRWoPAmEKdSn/JeQqCNyRw+l7RIcj8BVw3GNyBBdM541W5i/KP4DHSrsM CkfizHH40D2j0Ux+nQ6sCfuQNK6bnk8cZ9xyfyQiuPahfeMRdsBqCAMFTot9tUMzsKN3 QFeLe1yUgWRUsWKRIrXznC6Sc96bPg7PpntQQa8nxzWWjhHA+cntHOzg5g+wOefTS/QP dQ/MEkCFWykqM7HOCjX2bma56/5qaZWhtM+5sbRhmo9Fi9YlD9Gd/KesyYHHXpCZlcpt BWhst5oan70io+haGVkyogl/sxia49Jr2qQjVi6ks+vtT6VVxmvUPpJ5ugpFqHgtalG+ y5Jw== 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=+GihtklE5UcjSoCl0u8euNMAqZbs+NhlpVqf3WDqQFI=; b=koBcsNUqJ3mlH/+JCNCs1xmqB9GteqL03Thch3yq9xVTxLbBkBNPpU3KR9/HMRGJQo A6hY2obubnIr6Y3eqxvDp7omJ4MgU6/9ZNG2OU+aCulCaqc374v+6j8mIdaIJIe/USry Hc2Rcg9Ru/fZlRkndCnvOzAJ5ZC98pX8xUMAOPr0Hwa3PD+5GXuYshBK/SixsNOImA6o T7VkQB7Oopk55K8aCUKePYILrLyK5hRccXdvwJWIEXnkpfKnPCxN+yQjelWQh0D7f6us nJmkzJuhDyM/fDo4LRviGHTyZbSAU9M56HrRiFiK3HHQBohyb1eluQuC9RtD3Iu+WV0S H+VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n5WHgXlc; 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 ce5si2928850ejb.237.2021.07.14.08.23.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:23: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=n5WHgXlc; 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]:37290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gjm-0008HK-Hc for patch@linaro.org; Wed, 14 Jul 2021 11:23:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geX-00053z-K2 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:25 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geS-0002MR-8K for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:25 -0400 Received: by mail-wr1-x430.google.com with SMTP id g16so3691088wrw.5 for ; Wed, 14 Jul 2021 08:18: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=+GihtklE5UcjSoCl0u8euNMAqZbs+NhlpVqf3WDqQFI=; b=n5WHgXlcqbiJOCPqboWoU1uz2b/wss9hv7ta2Qeah9RAkoe4eRFLv8jwDXcCpyE4EJ aIbxmFtc3ryI+26HMt4a+pE+aD7J/GtD1yfb7fNeMRykFTS5qii362DQskqi1Go6EHd8 F4B9QXCmAV+mldyxXmHQ5DXx0u6mreJO4wf0W+CXLvGcHGhr3bufeZLZ3wRuRED3b4Yv PpT+PgwEUZK2AS9n+knCsS6kK4uJxQvAuW8TzLS3uPpim4O3PFhve9SV6udlzW9D4goD +/+VyH1++UWFZjDFiuLobcpZnSA8+dwfaClIaVvtIqCE2ACi2Tpl+2StrTyEvhktRNQo ViQQ== 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=+GihtklE5UcjSoCl0u8euNMAqZbs+NhlpVqf3WDqQFI=; b=n6ib/1cgBazOYLqjcaih3j2FMkKher4kMBnvI9duMRS3MVkGCCZVDUeYv6sp1JaZpM mIZaa0uuwwxIhMlb6VcV2rcSHvhRijNvELlWYUbJRnv+Sl8ictg5X4HNe4mrnSF/N6up OqZsvNyHWYykslUeC+hxBXCJQp7QD4oqvrHBaG29K8cj0y7raxbj++Af6U6G9myqMXZz HFHCN9ktcbX3VpqkPQOSE/XDkNG3jf9DS4ggQNE7y17WIvTlDDpI4eiHaLB5gDqhyUBy MYgIOV9uHaoNbtxf2Rk/kKG4GUAF3DXoN4egsEP7EQwrtfr3DUBegtwux/zRV7H48Xn1 pNcg== X-Gm-Message-State: AOAM532EpPGezsS3y3gz7JBoPJ3/RGOSPQaaTkwoAT1JRi4cB4dFTgGW Y2H+OKP5nS3A9JHgnOdiuqTh5Q== X-Received: by 2002:adf:f892:: with SMTP id u18mr13598450wrp.64.1626275898834; Wed, 14 Jul 2021 08:18:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z16sm3154364wrl.8.2021.07.14.08.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 75CC01FFBD; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 35/44] configure: stop user enabling plugins on Windows for now Date: Wed, 14 Jul 2021 16:00:27 +0100 Message-Id: <20210714150036.21060-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 , 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 2c39ccf8e1..e7f2fcd02c 100755 --- a/configure +++ b/configure @@ -708,6 +708,7 @@ MINGW32*) audio_drv_list="" fi supported_os="yes" + plugins="no" pie="no" ;; GNU/kFreeBSD) @@ -1522,7 +1523,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 Wed Jul 14 15:00: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: 476762 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp658787jao; Wed, 14 Jul 2021 08:10:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyy2pqX5LBWTG27cIz2PN8zaeJk33WfdDnzcNlEOmxolcN4aI7+lCbA+fdTmOAWdZi1DPF X-Received: by 2002:a67:bc12:: with SMTP id t18mr14612131vsn.13.1626275437763; Wed, 14 Jul 2021 08:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275437; cv=none; d=google.com; s=arc-20160816; b=kOn3bK9BaCw/FnBLVi+wPcqtQATtcKaRaP2mewpC4I4eVMlhM7T4LWDx3uQEwJ6qcg vz7y8RhQ8AzKA1Z6FOOEOrAJLk1KY0w7HqThVcP6Q9sAIZ6pIsosvVp4GGvePsZRfYYK VbQ0B9rHQW1mWfxEI0IQZZ8L7wztLvAWj5Kd3ntttMRpJ2z8JMb6fwu1onSae63AaLPj sqMSwXhhrRPwSLNqJvNDNa8yXYbAoJR2pGfx4tbhvfz5u7h58IF0Rv0jgMJvPSsU9AFE J8FE4C1uMOAH+uwQUQx3bcp6I2GSFXgiKEMl0NIcJXwpAHpWMRlAll7BW5GM6Y2Ytcar pjug== 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=NdFhM3mErXM9CZH7/QXNM2pE9ztXd5aa82fNrrn30UU=; b=yqnqsox69EITZJoKrODF0yWZEHdMI453+A45JOOtCWUYbxOPyo/Ph8qg29GpJmsQcg LHx+z+cIYtXoZIyNd30/I+31ZC6zK97oLDeGxWRMHfrL18mgetEZczy89vrZGcnrnDhR ypP9MvhTD3AR5ekrG2LWxqa3eufXnsZWVAQIh3WYqrpZDQMaBvhRUMxvtnShc1MLUO7q GebM9tF2m2mzj8qw6hpuN0U4htm0rb8OiRXUxBL0+y44x7qIU/F5lHq6/DJbCRBC3RpK VIa1keEK2JWvJW7+U4uWz9k7CSc0vJPkWPYcmCWk2azEyLQweZmE0W6S94jhRuFmo/OR Cg0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nxXZlDjO; 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 z19si3633901vsk.73.2021.07.14.08.10.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:10:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nxXZlDjO; 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]:49756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gWz-000437-1S for patch@linaro.org; Wed, 14 Jul 2021 11:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNp-0007Tn-8N for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:09 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNi-0007d1-Dr for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:09 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f17so3616457wrt.6 for ; Wed, 14 Jul 2021 08:01: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=NdFhM3mErXM9CZH7/QXNM2pE9ztXd5aa82fNrrn30UU=; b=nxXZlDjOf12sKfB6+Q/pQXJbj89MHIoClUAk6s1jdINLIz5PPcaUYBUT8C0FtzN/DQ mjLSddlwsCQz6iODBVWlMGrlEwTeene4lKYXjzaW1pTNtMP4acujOMdG2qN240jzVUhp 0DvWomIFQc75LlYKhJdFrgfNdLnNT2ZQ/IO701j6e1SXbX5DBGqR2XIWwLjNTIPfrhQj FSt63mRO1dBW84oi0/AbcTgEGqjjAzSi/yP2fJ9ViccAeyuid0AY5G6JgSgKU2Ul0LTd A7byGk83mGQQ9qzMkVXCEOTl8UfppvFmi9MA4d80VQXbEjXTzFHWGIWo6eGqLcS6nsJB T8qg== 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=NdFhM3mErXM9CZH7/QXNM2pE9ztXd5aa82fNrrn30UU=; b=XhQi2CV8xoFKjXb44wZM5KMPEX/4Edd2WcdcHSgTqbe96wwgkFSbb6dTsnVlbDvCEM niYR70k+wId+85bdTFvEWqD56N3f8egmXAwW8sQ5+m/ztyfQ/EeeXw8O1g2891/VNs8F 0k3DfjM8bCfYRIRvEaLq4FrMHJ9NM3d7EgR5lh83u6hQ61ReuP69zxUH2rDES33or8ey Tful/joIBH31RizrYv5cV9B2GCARXsYho7lXSRIr2l2YPqAy+sM7poPPK/F9YZjjhzEJ I1NFktPmgDTb0RgyNLHepP5zh9P3GgbwjFAheFnkkxzMgkso4GS4j+TtWFN1acsC2laC qiLg== X-Gm-Message-State: AOAM533AtLFpr8lQgokxFSqys32Jud20PFhMH+8PyQUSa4BfsHRb1bJ2 tkLVAU47zOJ9w9s602NmKcBEsw== X-Received: by 2002:adf:f50e:: with SMTP id q14mr13495773wro.183.1626274860943; Wed, 14 Jul 2021 08:01:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm3066671wrj.66.2021.07.14.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 92AD91FFBE; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 36/44] tcg/plugins: enable by default for most TCG builds Date: Wed, 14 Jul 2021 16:00:28 +0100 Message-Id: <20210714150036.21060-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 , 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 e7f2fcd02c..49b5481139 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" @@ -2209,6 +2209,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 @@ -3102,6 +3104,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: 476815 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp680137jao; Wed, 14 Jul 2021 08:34:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNu28MjSUu3Ejpt97yrXLAB4b5mTku0lTlcjrgXNbfE/nj5NKY+qr/QdcaeL+ajvF635MN X-Received: by 2002:ac2:5d4c:: with SMTP id w12mr8770661lfd.494.1626276894853; Wed, 14 Jul 2021 08:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276894; cv=none; d=google.com; s=arc-20160816; b=BWR340CbykCa5SPTTfOJlISk5ksgfvqrGxx+rxqQowXw4RZxndMVImPYQKpjd+w24Q GE7BiZPwJIVYx2o8astqpFiiqQqpr7W+xwXEuzz3DO1q3K3n4+Z59XE40UHbbC5vUIFt gB4obnzRSPFa7cUvfvlltQScMnNqqOjhrTKE5Jm4T4NIThp5kGiZbK95j57KztIg4eej DUjPoPrO321lAJk2QoyOOOtTrK0LEKRr8A8tdGmO+In2Kbm2mp4r5C5Dd3MkUVkTz2Sg 3vQmFVSuHET1HYcILG+O1nyv5Ojd0R25E/jOx4pRbUs/xzGe+hnmwgnNaGcxsYfe0hAl f1hQ== 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=dGr/xjSIxkIo6TxVz+eodcQvQWE3Fd+0FG+EXJdccKeF/+dZyjBuvBTBfRQk2UXLcl /mAR92MkzKVZCaB5klMESgS4+tvlaAOaI+VXZvqpK5xi/X7KtlDr/NGUeeDqRRsyT8oc mrECMU87DQfCyf7lHavZvz0m19LKzPSsKG8HAIyMj3ITE6404iEoUoLjmt0py6s/1UDC +IXLj2mPHY5PuN6GSLEXjof/U4bInRlN0dDs0vDIXtk44NvEMvMsZditEqSCLyWZJXbE 1s87fUAkxTfcXdSvORh5qm5W41HJW77tQkqYi0jkCh9Nuc+6uZaEjx8PVdJvJrY+wyYk eQqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Nr/KqIIE"; 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 k26si3797585lfb.219.2021.07.14.08.34.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Nr/KqIIE"; 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]:47830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3guT-00011g-NY for patch@linaro.org; Wed, 14 Jul 2021 11:34:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geS-0004yH-Pz for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:20 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:43629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geN-0002K7-NB for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:20 -0400 Received: by mail-wr1-x433.google.com with SMTP id a13so3648647wrf.10 for ; Wed, 14 Jul 2021 08:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WoVJbMpdTXEKpoS9CcsUeUTDWRvb4b0qm9ZvuinWlrU=; b=Nr/KqIIETXj/XVOmlheUpmGvJxz0TgQP3T1Res71n6xPE5vi1PyT20pzgOCE9ZBpeB 91BMIzdEsmEYAy5icOj/a2XgulXtISjjjptopwCXtAG9b5g9Oj4FeQvi9nHn0CNM55/q P4QbvU8NBc/u1JteXuCJDHEnsV4HyJO1VN4GclnDobD+8VqUXDVm8/1Ln+BAovlYkEkS YpR8EgOOxgJx4x9AwGc8f9CY0biHNoV89BIJdte40/3zYmSf/r0zFusGiaz4rOeRpMSo kqqPnQhavpAxDrswTCeLEP+llvPv0ek/8Xc9Dk7NvOJwlbhSaYeBRvDVmcelY0zD0wv4 K5xA== 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=OVTm54Gjsi841kMe2uq7hL1OqTgNq2IxrlJ0jCZnee/5t5ypa7dEJugFW1kLvxiOwR OxLH05CX7hoKbCOin3OQavOVstZ54R4xFIiQZRKi5cpUztxeWRrwrEG7LgajbzcFUunt 7+69iuuMX6fcIe4MD2DGOz+u+0iW9ef9Zkj14Rpqu1NgukrLX6WEK69E7Rm6Dgx8fhMS g9XrNHn+hMrgtNiPCOFARy782C16XjgnWu3kxsb6dedBCtpgjw8OAzRcgGaZooq3tscH uThRn9WIn9GiMyEuBB/pP1rUrNHG6b0H1zvcj2yUYX4YEcQL/Au7238j625McHG6gFu/ sTWA== X-Gm-Message-State: AOAM530ba9cOO5lDwsYdfnT1hmSDWb5CcIhYrg827kievkZVRcJRcTHM 21N6FlWFlcs6FxBg/rPujIYUrw== X-Received: by 2002:adf:eb82:: with SMTP id t2mr13570452wrn.337.1626275894352; Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm3122138wrj.66.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A896C1FFBF; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 37/44] contrib/plugins: enable -Wall for building plugins Date: Wed, 14 Jul 2021 16:00:29 +0100 Message-Id: <20210714150036.21060-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 , 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 Wed Jul 14 15:00: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: 476818 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp681897jao; Wed, 14 Jul 2021 08:36:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvvM8RSLGN0DFm6nVRPlF/Crq6Kzli+cE8IK706GO99c7ot9nkzlmBo+jFmhEQTveylYkc X-Received: by 2002:adf:de84:: with SMTP id w4mr13976351wrl.104.1626277018159; Wed, 14 Jul 2021 08:36:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626277018; cv=none; d=google.com; s=arc-20160816; b=0rw48kEe/xuxe4IXw0YcEDdEupkpdwDtA3guC/q9FXRjJKdmXF5yj0vsKsWoLvm67r WXn7fI9ECcXXD4vLCFxJGpEZBbdma1AZ4BI+nRy9u1bbSQE4G+JJD6IxnuLa0BbgsVtm 4+5DcreIEFU7T4Sd8DjwypkLneZEpQa+UkYU25tP/XpN7nLgy1dn7S2bkO6l0hSdsRpL ZBlZy8+FT9scAxBI2ZOlTPWUt7Vtj0n/p+4RYxVWMvgk/2UWYDDm6OKbcgiqtoaY/wFg CeR8dLG+g9BfUoby6NZBaWiPNCeWIoHKw7WL/7Sqwzx0a4scNBUlruSBnoPGYFTEC7eb wunA== 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=FhX5dKUeoAw4Avo4Bx+F54Vk4MazsUl3jFdSxJfzYgY=; b=NPFyLy+69Sm37vNRMWnBhkQvLNYWJJcXxGkG2I0wWZ5pyZGte/nGEBJLFFMW4KWiKU sb1dC1TBSNRHfXnyYMWrnld06hgtsS5crNsNMbnU1myYawhXt4TwCjb5RmgjvLsg9oak u0sZ/Tq1rf4tGdyzRZRpG24BaURUayNEqLarGVdMMAorwmIjKGb4VHeMTE+Upq3Rfsp1 bgXyhJUBwxZzv2YTJ0VtweWt/pIGwNpQq3x/2lmMMz/w8TasdLUZLeaXhlbw3/vzyT8w 8ByaM7tob4FPum6bdT21v0uNelmX3yLGNSeU8OOJ2Yhm0R27iFdRuQA/KiSUUlrh9nT0 i0ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fNA6w6Xe; 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 s15si3810030wrn.16.2021.07.14.08.36.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:36: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=fNA6w6Xe; 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]:52140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gwT-0003wc-3w for patch@linaro.org; Wed, 14 Jul 2021 11:36:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geY-00058a-OE for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:26 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:44921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geR-0002ME-64 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:26 -0400 Received: by mail-wm1-x330.google.com with SMTP id l8-20020a05600c1d08b02902333d79327aso1058136wms.3 for ; Wed, 14 Jul 2021 08:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FhX5dKUeoAw4Avo4Bx+F54Vk4MazsUl3jFdSxJfzYgY=; b=fNA6w6XezS7hV16sLARY7m6EXEDo46AAujls5eE1sKfTI2eXfJKvq25yq5aC9CRIjE IKJ1zZZO9TwoCK8pzmI2i+S3WdiYMjPMTplbos/ewEp9vj1IF4C3drxDILqDtzR1AR5d vE6OUafbmenrkANAjP5okNJFh+1tnEhizy3jfzIHzDPAalV/L/ovQTIq77uuRwEZZixD quf1RhlI2je+e/ya8rcd6EYAxO9mcUv0c6DurR9BjddSWwAW/fuLNmWAv8B+9/BxW7pj Ojnf5a1A+eodkpVNtFbVmKuklmxWNKn7kZ60gf1H4x4qD2eHTFfjeZ7fq5adQMXHNVL2 Hi1w== 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=FhX5dKUeoAw4Avo4Bx+F54Vk4MazsUl3jFdSxJfzYgY=; b=rJ5qg+1+BLT01D9gwyEv/kQQRp5BuT6K7L75AoFj1x2oNxViat9K7JMmUl5JGuvJ26 w1k+OBKjEibFUwt9WXNI/qF4J1x2nJSU7HzW1A3auT9CdVWFQAYRBHmKQV/QXs3FilBF WXdo9U6I6BEdKk7l3tlrzvFzwB9nMGcJlYf1++UrV1J/uimFt0Ovjr8oN7ntBGPWZ3U+ AJtF10bC3Ak3StSPCR9ikxZNZpmCRzxTqlcFAG6GL/is1UxiN59N9Rdx+JBvl7lXTJW3 Hr4UnIllGiheligEzEhwUAh3ozxC0pw4XtcxdEWTrHBfRQTrwEA5RUHHOFzREQv4RAcS F2Lw== X-Gm-Message-State: AOAM532GjV+vmc849X79TBqqDi3ldU+Jtnq0FpV+gL8j3C4WaT+1e3Lg 3UxDU7Q4kYbWfpJ3guCEeLuv7Q== X-Received: by 2002:a05:600c:364c:: with SMTP id y12mr4669638wmq.78.1626275896951; Wed, 14 Jul 2021 08:18:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x9sm3064016wrm.82.2021.07.14.08.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C52D41FF7E; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 38/44] contrib/plugins: add execlog to log instruction execution and memory access Date: Wed, 14 Jul 2021 16:00:30 +0100 Message-Id: <20210714150036.21060-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: 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 c340bb02b0..83b55030ad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3017,6 +3017,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 Wed Jul 14 15:00: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: 476775 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp662083jao; Wed, 14 Jul 2021 08:14:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8mfsdXCu+fAwzp7kNCX5KnpQ9Xl2VwZbiaHyncQ/ioqh/h3Hkgw8Y2VMbfArYRFFiTnmU X-Received: by 2002:adf:a41e:: with SMTP id d30mr13722076wra.10.1626275641398; Wed, 14 Jul 2021 08:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275641; cv=none; d=google.com; s=arc-20160816; b=QSNDJvak+CO3Zf4Y4sAYhMBJvum++mIw/u0MA8vgP6RL6N+mRPgyDlrYSwfct/DnHu /uecS7F17pq6yU4WA0QQQladz2eFAR5oUJOHehjrEEE4r8mBfUGZActY9z8JnQNsL3+j AEp4MZoByk6L7rBPZXBi845raEMMZ2CISe+x9dOgFwgnWO8VXPkBs0izLiMcv3ot/TXf lOh1p92kL/nbS+bWmWdx/aZA75C+UyyBL4uiGe4zJPDA6L1StLv++k0+YFyCnIOuG62V phMblkHgvxt5qf2uSK8kvdRyMZff4p8H3K/FZoOcMWmhkZrEv0rHdzb+yU/T61IYxhBU 8ekg== 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=i5HnSE+P/5s50b3ycFZMLuncHoPnDDRR80OM7072KpRaOX6MSctJ8Mw/DWi4cjrA1Y nFN/pYCm0ZMLEb0IMkECQu6sTCtkpCj7cHr1YMGmTifoLNn0ENte6UWnuY5L2U/fi0ev l6gbdsCfTRSEtzD2BFpqurY4qe0420TIXpfhGBLw4w5umTfHA8mZEB4/Ff0ha5nhfR2Z PcOzyzKSLhaVoIb1YPcP0djUfIoFNp4/S/EVRTz/EdF81ppWpsls0JL1REcXLbaw2vSA DtwcNpNnz3mQDQAnUmGWehMryWAvzaV0uPEwea6WuqSh7Q2xgaaHzsBK2ouC1YfgbkNR o84g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BLCRDvz9; 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 f2si3719190wrp.532.2021.07.14.08.14.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:14:01 -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=BLCRDvz9; 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]:34824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gaG-0004Sq-Eh for patch@linaro.org; Wed, 14 Jul 2021 11:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNl-0007Qq-SK for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:05 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:33611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNk-0007eI-4E for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:01:05 -0400 Received: by mail-wm1-x335.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso3614973wme.0 for ; Wed, 14 Jul 2021 08:01: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=m+wx049KJ28JpFC9cH0HgqwfF96vUTHrRWKaIFgqKEY=; b=BLCRDvz9BtOLCneYOZwJQYaJEjSNVqRYJMZ+GWgLnorRcMyXne/8u65qg24ZXQMJp5 c3IiWpuogXwgJUH79S7MhsmoDlDo4JDSKSFP57LW5TKzM0GYHb1A0PADKAl94fgc6URF UvHOPacG+ni84YF9ZeTMpS9bWiYdpfvKGvtFeeYirshaFxws04nn5RJNthDjjrB2LqCH OsabpTOFNwKzoy9X5nJ1zDM2fLGgxGpjtdc6ZjYS68mSbdupLckvX5TQS39Gb+ifR388 JcbmXCdrORU4nsbpVRp8BthhXipIWIxM21v7ZMWZwbZcSkrBnckBlCCvWP3eRqQZQQiF kXtQ== 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=q3s+at3Q/CvS1k2vnqXEsrIoOz9AsVkCQgRQuLLGYJOkWg1AYLyGV2YCvFMgxcdb3S sRrZQ2Fnau2IQfmLsmfhYJgSU88egbZ87Yr48Q8aw36PdRikgH8xF4aTd8Rkn+6v8Sfi r77fgGcF1Yfd359S3htD2UKcgX/CeDW4ai5c0679R8unQwbq3sSeAKjDn1YWw27pOVOZ KzZcKvYuylq04mLVW6xea0ThB9pcdCnOUGQQjJi+HeBh4FANuu1qeiJ2riN46t/9+D2z 9I92HxBto+3zH8+AxpDaneceIUf3ER5ErBhjdvC9pEAZf/yqLZc7nFkZlwdGDdPEd7kd fmvA== X-Gm-Message-State: AOAM531SVMNiERh4kWFbRYpSJYX6TyK6Z9XE+NsU2bXBnXE0qSroEbBU og+h/A74I7roO6nEaaS5RYQ04Q== X-Received: by 2002:a1c:62c4:: with SMTP id w187mr11710029wmb.27.1626274862691; Wed, 14 Jul 2021 08:01:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o29sm2238160wms.13.2021.07.14.08.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA3721FFC0; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 39/44] docs/devel: tcg-plugins: add execlog plugin description Date: Wed, 14 Jul 2021 16:00:31 +0100 Message-Id: <20210714150036.21060-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 Wed Jul 14 15:00: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: 476776 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp662072jao; Wed, 14 Jul 2021 08:14:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTaJ4uFrEQ2hLAI/VzKzaSywzIfaepdtNraQ9r8X0JTbt+t0gk/6GwvyBer0HmeKzoNRxl X-Received: by 2002:a50:cb8c:: with SMTP id k12mr14493468edi.386.1626275640931; Wed, 14 Jul 2021 08:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275640; cv=none; d=google.com; s=arc-20160816; b=FVT5njDS2TpAmHcGP2d9re+iqypbTMchPkVYqHY2JKVp3e8HAWGbyYIb6+K1jka2Zs 96xsPfUzhqpP8wyI5FD9mMrW/pd3Pah+Uy+0gATjct2h9/z1EZOHvC5LEzTKcS6KYM3G toQBf4FJORUzZhJ6ujRq2pLf5LLiuf18cDkYonS9c2k6rTBRlg2NVHlaXFfeCtFQpBUT lT+4l8sGLMMIagn5doxyHr0bILiulE+7SsXfRf41hFEl/vfqjr2bF/b0GQpj64Vlv1Kp yJP9306m+tqa9N37jPw4C6yEP3TVQZua2XZLDhG+PaSEoIbmTYzOxI65MuGrE2fTZ30/ H8SQ== 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=CQkNzUW7sPT5M5U8xGf86bR3kDhxowmj60Cw0mYjb9z4Hn0JUqeqTCototbCN9HHhp Y76Ty04E6W3da9ml0rcuchVr0/4GUfS/sanq3vB8Fif1Afn6rUZy8RgBM91pSMLzy92X 8YFCzLBqwviKxM0W+Co0hl+BpX80nXD0yG8UfuaV90ZvzF9gHte2q2+wKWkd5noQKe87 va2xAb4Nym4p7jEH/W7WuBdWPuLlu7/KVSLqvKcVEcRMNAJ084CpXn7/D1fpgoO1F2xm oCCjujWHmABgpIaMmJCKf+9v91xX28x/Z4oSA+vevv+Q7qFcwdXKuDcgJgtcHFSlFL9t vEug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fnTePsGp; 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 lc20si2838996ejc.538.2021.07.14.08.14.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:14: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=fnTePsGp; 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]:60328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gaF-0002fI-Bc for patch@linaro.org; Wed, 14 Jul 2021 11:13:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUl-0006DT-38 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:19 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUi-0003u6-LT for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:18 -0400 Received: by mail-wr1-x42b.google.com with SMTP id g16so3648148wrw.5 for ; Wed, 14 Jul 2021 08:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Emyyojxqj/SMG1sz6wRTZIQt2IoJY5Vsor7Cz0ET0E=; b=fnTePsGpY3GoyJqqIsOPtI9PdtmV1FUZX0IzoCJuay3QU5/PjN+jclyf0BbZgkJLBE Tqmj+yTtwv04wv1u6z853918zCxlE07sXOWoQ6mMPTA7Kd6XJ5I/CyzbNQmRmECv9kqB ZMtyknrbf9b+FEZtgHRrib0LXUPt3JXs7A2fTqysp2WCn5+ltS6dHzXvAof0WhvXP6Ou 9srL7JyvW9f+iF7NylstAWntikUUsfzIMp6/N6S4T88FCBSzuJwLKgV3mPrq33aK+KEf w1YMnd1Tl5ok1yi9JQhU2a3HgWamtqVzZh0NqD5VwQnZbOOS2ZuYE2/D42vo9ZnWs47s HM9A== 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=s9jlDMJkYeI/e247VJegO5hkL994/EhkA7hxr7902q1ZCKoDgRDy0/K4E6ot3ccdnT eF3tj46KvG1NalKrTQX5jQYlfQrZtLVec7VwVsA5tdxtpYJF9UPRuT93nWTruzNsaSFS vTzBiK6knUSsmqaTCjy381JLy0aLDNJBKh0EbDtf+JIuY4JQMGKxFZKFH6oRDOsqXLDT Eua7qKC8xgoldnpyDCzOAghlamo8gWegvCZbYN1PNx9rNL9evttwN+k+ekk71oUXaEYH CdgQAGbLiaR1B3suTZsx/di2YC81G6BmpmfV44j6xPZfQIG9SfbBQVfsxJWix8n1xHvj 6SIA== X-Gm-Message-State: AOAM532QeU15JH0/AoXKURGS5MegUrsoyWI47TdLsaEUDDsRz+uaDEnS Cp0P7aqQAllREV2lXiXxcz/3hA== X-Received: by 2002:adf:ce83:: with SMTP id r3mr13720409wrn.204.1626275295470; Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w22sm5895294wmc.4.2021.07.14.08.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F37B91FFC1; Wed, 14 Jul 2021 16:00:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 40/44] plugins: Added a new cache modelling plugin Date: Wed, 14 Jul 2021 16:00:32 +0100 Message-Id: <20210714150036.21060-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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: 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 Wed Jul 14 15:00: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: 476785 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp668924jao; Wed, 14 Jul 2021 08:21:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPhyDiguTX9uSqKmc4ynmk2axac4HWMvxK1gcclNT5Bj31xRiLs1S+FQR9vPUy8rZcFHGj X-Received: by 2002:aa7:cd9a:: with SMTP id x26mr14460257edv.185.1626276107139; Wed, 14 Jul 2021 08:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276107; cv=none; d=google.com; s=arc-20160816; b=jhvW21kPk5rZRJVtGkJWYwHdKCDX0BfmQX6fxbpWFPWWsDzTrE8Qj7xxYMA/vmYhWd BariKD35fePIrnosy9/Lzh6PhQkuFVG45iW674l0LsA4t9hJmCfZZ8Uwj3auUX7mtBWd uQ+bjCpFWSsV10KnmVrlFgKuXt/FfjEoQ1elXANzWkQjUk3s9L2Xkb7S/4YkkfdRx9Ql K1L7vA5/sbz1z7gvenEuiY8VNM6q26sj/fL/M43Y2fBGkya8Iwwo6hv5b9pi9GEKjxuZ UsnGiUOWqXIIpcQlgBnFi4i2DbJiBJyg7qPoWSWXAat4ao7195wKwqxOH5eX57b8SByW WKfQ== 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=DURoXBI/ml0pl+tc3QoLvtshWv7BqtrPXDydvQdEZbfMzfKS0o5f/+nCdUg2JBa1k8 Rdhk8YQMXpNZhta1MJk8f4eo7r4IygahJPrCna9YaARXZVZbaxjCkrWRBfH2C/SE3L5R Ki68hYpZGLspGpJJQ47alSS6H3qYida7KviPbeyHFWPYDkrGHKrnb3TKUcZbsafo9ws1 D54jeclYNwTJJA79y4H89UrpONbNJsi2Xe0PNBDmm1N2is/nLxzoHwH27xMa2fmUqvya 720oMOjObyChP4uj8ARyZNk71b8rpjjS4pyfNtKc0cgBZcXCUyjeK1c3KcgAp93cUIdH rzUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D5xXGwNO; 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 h93si3674096edd.584.2021.07.14.08.21.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:21: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=D5xXGwNO; 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]:57030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3ghm-0002gG-2i for patch@linaro.org; Wed, 14 Jul 2021 11:21:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUr-0006b2-Vw for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:26 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:34730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUq-0003zd-6w for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:25 -0400 Received: by mail-wm1-x332.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso3599288wmc.1 for ; Wed, 14 Jul 2021 08:08: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=4RUje/NtLDQsjrm5Fp/QYjd0g9AvH8bzaEhpNLm1Wos=; b=D5xXGwNOt3XBk7rj9xcR7F3s0IyPbvJHbQBYWSZozT7jIdZQ8FfZULzpbzyTLa/uJA 2BVBrvF4Z8jm4L+lhpTQJfqgL/S4uI+rRVWOPUVJX3cdrQAp6YTtKJRLocpg5NmGt/wG HZ+LwdTePmrZpHVvm1nLL4ViWgpgu/ZCXMiBzIncPX0DLrB0yAuDo3gUnOOkGBZNkunl jevhToEH3naiApUFFm+bxVLZ+KGWweOIMjWLVnd+3NFQOPE58FUy4+DNCz+JAW4pDp2F teghh+3hvqhSJFukFMg3zMNu1Bx2fSe4pyp3Haovb3DYtMd0a3HafvRGEhmhYl0YzU6L A93A== 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=HDxaWv+AXvOz9Xrm07rg9hCXZzHYAgVm4s4jX4zslTwq3RhrVqrQcVcB/iGzUYIaMz uSCQuyIRikUkm1/hZV/W/yY3QB9LcP58xpFMGmZYz4vToilS0aZ6rY3PVW4nzL/0XkQc zWDZhg30oPUey0R0EY0U8pSQpIIJF8BIgGcaIps3PaKjcMc4ysZFQLEz2n+2Q4mAGNZD Bgs8OtPBXdQ70EVpQapMbSRu6TH8vMOjuY4ygGvPCkuyxQGlKTm6ljj1JHNYQjjvWm/9 ggNa3fZbNxVvJkYf8utoyu6GnSbx+iv8E47dAp98hfeiQnsrOWrxK5k6wKqRCAF9cqwG Nwyg== X-Gm-Message-State: AOAM532KRo5DbGHrHrK1+j2OcXW4E1KlZJi4JnvSw+AgFnKw/M5tIyvs FLh3NcTEeOQ6c8BgmHebWQm10Q== X-Received: by 2002:a05:600c:3b86:: with SMTP id n6mr12160543wms.28.1626275297464; Wed, 14 Jul 2021 08:08:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d14sm2986492wrs.49.2021.07.14.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1500D1FFC2; Wed, 14 Jul 2021 16:00:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 41/44] plugins/cache: Enable cache parameterization Date: Wed, 14 Jul 2021 16:00:33 +0100 Message-Id: <20210714150036.21060-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00: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: 476819 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp683177jao; Wed, 14 Jul 2021 08:38:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEEVPND+ibbkSxHza8SIekYEcZaoYNG5LBEYmH6/+f2AF+IUUXYgEt1q29xxFu34HY/8l6 X-Received: by 2002:a05:6402:411:: with SMTP id q17mr14362528edv.313.1626277106744; Wed, 14 Jul 2021 08:38:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626277106; cv=none; d=google.com; s=arc-20160816; b=BoRAtoqwWR/mfKMGMgjscFMHLml/A2m+5MQhzi61lDfrREnckHNeF7HPQhFZyt4bUw CSo9htaSyJBDRPCw8OCez/ybYYLffsTSxcx/D4nlByRxumE/HTJ+Amv0uA4M92dz0AoL M/bK+LPBVrebQ8zwxm7oGnQGVYv9qkLJajczFjrsp2c1UXeV7E0TetJSeEEMioDd0rzY vwIfpDqrAR7DkRrGKW+4Ys1rx9l7JDbIjvOhLrixSZzfz5peX/J5OPduPJ9uvc16qtUP ty7sQdheswUCA9MhAODPiZzNqgDFvQU13R3kC+6uz12m0hsV2NrmE5De4GTjVsj3tICM yILg== 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=bmxAwNXhWdyIdId4qJk+f56/SoRJ5TeEn8aR2kjmQRcH0KmjgzAm1I/FAiT++croz5 Zzokw1XwoP2CGFaTmELsnEiECbu/tTQmrYfDbPHZFj0oGj7INkx2OghDLfhotpZGqbfQ guo4gc+cF2E23RPchp4sdZI0OFlMw+rJ2qnqXGXqMKzx00JkOpHoV7RUVnISlSlxFfvG GnVPNjTxLVuP+1wbpEBn0KDFZxF+/+J2CwASPjFhVb4U/3pRVNAtZFM6czkHmfynegwn 75b1eOltyrwa2+RNo5poefUz0surEsMPizWct7SeO8+eKvQPyPsuDjIHmmeRXsyO5XmN LtpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PsCeuN3v; 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 p4si3604118edj.420.2021.07.14.08.38.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:38:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PsCeuN3v; 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]:55694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gxt-0006MF-NJ for patch@linaro.org; Wed, 14 Jul 2021 11:38:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geb-0005Lg-Pi for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:29 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:50856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geX-0002P5-Bl for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:29 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l6so1857247wmq.0 for ; Wed, 14 Jul 2021 08:18: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=JdkSRAUNJaTEbIDs6qvrNBzabxxOwURxYYp6kuEzBSM=; b=PsCeuN3vG/u1T/jQyxPLhXKDV1FxDerjL3xAHk+sYL0NCbgPW0nbJqMxOKxHEiIGTK krp0m0m15KppMoCZ9C94pnAw0iAxuJ8X5Db6vxWpqnIU8NZ4D2SlB/n/d28vl55FQtlu bHk+MKF4SRzRghRa0n2dNiuVdvi05DZCrSupzF5WlArqtpJAXERuAgzdm/fQ/HMRT5dx K4eA8fkhfV457XzWoZqQJxKHwzFvsF0PDVevc6w6uSJEHpvp0n4vSlY4A1ooiYuivgi3 gAwTFlCx6e3QuRlnpO3GRhZltJU6Akz7YN+/SmdDjhU4wcAy8JVwM84N7SncEYfhgpFF CteQ== 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=QPvm7ApoCYhXTfVQbwjRfvBNxXIzipAgpq76zzAoof7IbZki23iHeA/3ew/3xj4RNh /y8Kc1zR8+jWvAa9uFoK2rObcLcRi4VWmnU92kyXdZ/IiGNsgqJkEmrAr2g0cguboCpE zwIZRD+FF8UgJmJpRS0Sudv8hfhO96ASyFpZMOE9Cd9CCJyjjFMMS3dEIiXJBDgeNgQB e8nGo5dDPS7aXFVUZDzVMHlZS0pA5ZKUweWUt3aOI9K4I9XSUGJem1yHpkautXKklgg2 oRjEj+gLlOU6mkBgv9UKjmyQoli3kZVWTaC0FKQZl3Wt16aeMnkaHJ1rQyUCBkVtg6Zz jq7Q== X-Gm-Message-State: AOAM5322Jchzb6IE4CXycGc8rRzjhVAb1iQubH5dWB9fyJFG413ahnid J+rRtyeEZ8QoKDnjjvfk4q+d2g== X-Received: by 2002:a05:600c:1993:: with SMTP id t19mr3108437wmq.62.1626275902683; Wed, 14 Jul 2021 08:18:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u2sm2304836wmc.42.2021.07.14.08.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EDA31FFC3; Wed, 14 Jul 2021 16:00:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 42/44] plugins/cache: Added FIFO and LRU eviction policies Date: Wed, 14 Jul 2021 16:00:34 +0100 Message-Id: <20210714150036.21060-43-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 Wed Jul 14 15:00: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: 476780 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp666317jao; Wed, 14 Jul 2021 08:18:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWRZRUq5CTLLLvP1QGHhtR6y1UUhbTLAXuabUEkPDnRSS//1jNKbstcLgaqkjdIWEYZtOu X-Received: by 2002:aa7:d746:: with SMTP id a6mr14356783eds.296.1626275924954; Wed, 14 Jul 2021 08:18:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275924; cv=none; d=google.com; s=arc-20160816; b=MPjYYJoPLMIH9HGCKlf5387+cIuIgFmoH4u4btZmqwuVbGE3bqjUaPoMzH3d7HsLWp phNf3XJwEVecNeIPunr2ZeBve217WX0XnWowRPjWEe5aImrsI2ymJssDhZc+1xpxMf63 gRFJo75/8cLXMkkgB6RbBiH2CS8CvQFyaoAqbZIrWX3zXOBndhpGPUVJMeOGm1Ajv2Oo 6lGMHAMN+ukznGoj8dEIjcEGf1lJuNxckGiCsygvdsgUOmBuRXr1Gj5rYYgHJeljjTFt E6TENWHNGxSMkMYPIy7uxp94rs1JC/CyI+8DulPK8bsEeqqndvMEcZnyn9lCKicz7u4h Gnzw== 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=iBy3hMVxNDDX5EcaBUofj8BqjJGgRpc8hELshx3dRpTrUN4OL9hPSeBl1q3/kSJ1xO 9Dw5v2tZSOuCaWlgOMbEhFH+b5difXe0dqbcDEjPiqfjQlm5RUB9TX0lulQHACGKfp88 2Mw1ydCL+TCCURxWIBhqS5XYiyWrq/XLlnKYP0wY/3qpHo2iHlNNw+X8h/x+j2eNgmty a5WJrUEPgZMDqwxjz9EDD8O6Y+UNnQ5kXg2mp/+6xf39PgJjZVWwyRRKHLwxwOfe1zDO 2VXUdd5VhLZLHtfkZx3jPDkmWDANGCJ4LSKMgncYUorENGB4Vc5kvf3n1Lwm40M8KJzX 9keQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c37CSM9Z; 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 u15si3317141edt.211.2021.07.14.08.18.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:18: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=c37CSM9Z; 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]:48454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3geq-00059m-0e for patch@linaro.org; Wed, 14 Jul 2021 11:18:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUq-0006VM-Ia for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:24 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUm-0003wh-J4 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:24 -0400 Received: by mail-wr1-x42a.google.com with SMTP id i94so3651557wri.4 for ; Wed, 14 Jul 2021 08:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A9S6TE13pwXS1W3k92CYjpEyHJNMbR3VdpMZy32eUSA=; b=c37CSM9ZcJMIqBi0ATVcUWw8/zT+i21AIFwc5/nVzozHdVhsaLdQrb7A8HVwjq/E7N hBL5wtPo0VCae58XuRu8AUmhuMGoxucvIZm0zIcWzK3zIbYKLjhAG1zuPkUWjf3A0BL3 ft4FIr73jUhpMYog7JeHwn9MNmB5bWP0xaKrRiPlRCCGnSrmEKW1gJNV/hkCWCABaoFT hFfvs5AtNBXZfmPjMnVK95KjLdkwVcRlAn7spkaxgkkaoF520L+ZREik1zAXlkb+wDSe zTsVpj4POsuNE05LhWK3gpKvaQMLlIL59+ytA8TtkVKCiZk935M86tckgX7qRcG3Jrps ePzA== 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=SKYTTSYLRIHTAtpOnWDlidme512VxFS7YTWG8TUKIxEkg9jb+R1VCd8HLGyAAb/ANS oIh35kgbwietPruMVjW79Zu43uNccw7ZUiaC5OTmDIYPzz4fz8qLgDBWyFX5HqqcwWlI oKd6BioNT4mLGovN9sIoXpBI6MJ8pBbinAaXPbpriFG98QFW0AvrvBcdgsA2z4fAWgoa RToDFZn8SGaoj0cbJ3rkJqUM4zBhZ+M+1QnC8lGCz6xeVVgbAuW3BEEdbcdJk2UNxKZq vB4c6TdIcikIezZy/pDTvh9vB8/fwl9S3z8OZ0INcOYHurn9YKPLclfV9CMlkzT3iqNA OimA== X-Gm-Message-State: AOAM5315MrEzJ+/4Ec3zxk8nMUQ80O8OebEj9Ym50zoDtiQhu3MwVnSE nfHXuVbAjUjrg9IFO0kA1BIIug== X-Received: by 2002:a5d:524e:: with SMTP id k14mr13671706wrc.264.1626275299246; Wed, 14 Jul 2021 08:08:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l24sm5546702wmi.30.2021.07.14.08.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 448951FFC4; Wed, 14 Jul 2021 16:00:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 43/44] docs/devel: Added cache plugin to the plugins docs Date: Wed, 14 Jul 2021 16:00:35 +0100 Message-Id: <20210714150036.21060-44-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-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 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 Wed Jul 14 15:00: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: 476774 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp660441jao; Wed, 14 Jul 2021 08:12:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgddfefTKmcf1eFEFt2zyDN5JjOdwRYFSfinKV9BY2rgNnKU3EeNaaOuxxujzH99P754pt X-Received: by 2002:a5d:64aa:: with SMTP id m10mr13726997wrp.351.1626275544781; Wed, 14 Jul 2021 08:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275544; cv=none; d=google.com; s=arc-20160816; b=Rs1iYZFooRHlQAg1MVfHcTBdzgXvhgcv2SqzzuWftlJroTvkCDFdk+xYr5bdKQEqBo S05ugNbNVkV8HDBJZOBXqO9Cpd2vTllwxmX5zVIlwk72v50H9lp76dJidz3/COuUbyB4 /i9ToIn6pKwpmAgWq/R+hdyu0HOSPPE29ZmOGAKO7tiRPlRwTp8JkYueEOtiU1Nwh0Ek FjLoTxZxWXgr1zNuFLsDm0tjtQlrJTkh8PgUNCXb/LwwPtcyiYQ9y9XXOiMrERMkND+E MMztRULpiQTrIg0j5CQ0pe1/4DwxuZ3yAnBRANeKrl4nKPh2vAo1crteOqb1kdqkRt6L MfCg== 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=yrx1SOe1aGBqVEv0LQKxCqdsL1GTA/wjDq9K47Jj8UM=; b=Aw3+gb4Ik9OyMky/IDSdHO5gXLUfZKRxnPf3z6mjDzujVnojfQwIoD59sgVLiVO2Gc oRsC3xjQT71KyY6YqMmMfdrBqUG5h66GpXDp5AqRXoaPmgSyb/U02YexzdN/k3KegdFp UpMGrfstC6WvdHf72yl4pe/YemMUuLxY0847C4mR9EXqBoWGjk1RHbzJG6b7YkljLc2I DQSUQhAaHVbRpB9wmvgfCi+lyRunGMS9ELEPikBE8NnVReNGMEVQGe/wG1UHf0HrqDsz dFzpvnZBqCR5MF7+GAwqCrOk6C5T3tHriPxP5z/iKfUALdaitbVVHVgV/c1Cu6oXppC+ oEbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mZlZ3TtH; 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 z188si9768593wmc.24.2021.07.14.08.12.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:12:24 -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=mZlZ3TtH; 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]:53352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gYh-0006Pw-Sb for patch@linaro.org; Wed, 14 Jul 2021 11:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gUf-00062J-Mj for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:13 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gUd-0003pW-7N for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:08:13 -0400 Received: by mail-wm1-x32d.google.com with SMTP id f190so233874wmf.4 for ; Wed, 14 Jul 2021 08:08: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=yrx1SOe1aGBqVEv0LQKxCqdsL1GTA/wjDq9K47Jj8UM=; b=mZlZ3TtHcxRa1J4MZnCo8eUPy4Mr7ZI3VW9mr3XVFaYwTgfUDt6PEIbt8IYJpYJ1ej jziptejAui+v87hziYDTWOKms6JJbKwIdhdXDH/tdwpblA746y1QGs6IvqwZXD84szQp YgWpOxQFZPv81poQM1KcQPRJ4Lu12wZNRqzYTtpojntaFNaPfxMnrTGt7eSORLRcDJLq xphgL8e7Ew5DtY5YGx4jdSWkBM7u1Ni3hnp8vlM6yUgoVIxNoE9NSc0HSlRbxqiFFmTw ob707JeNOiAsQT/JP7VWcfJvDD2TRjmpRvLBdBsyfm4uFOasNhwp8HYfbVKxKkOCixMd s3hg== 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=yrx1SOe1aGBqVEv0LQKxCqdsL1GTA/wjDq9K47Jj8UM=; b=GCXCSSGLT9NByRWMyciMWMOD+vpURabTGYct9w0w4TaisGIFQ53eY3tyqJ+qI7Uq7o PjW+uCWGToZl5dSYJ2BnE7uC74eGOeixSW6r392AMrNPU0Tra1gc7ANBJcVIPvVcu4/S Tk9AUdSrJe1LARylbO+XDJn0wMCQnQj8mDUcKvdRRSvuBOCckf/7QeAMTVFIMOpgthxW Qom6/mR9/yNzHemvW1bxem6zrZegvkap9ubs6TpsKL6DMubqjE2lxSfNhi09nlNP4PI4 DOeB5kbu9ZDL75X7KN95zyO/KJqbIBvKGFDk2tFlnqMlvn+5ALHo15PkZru4mNKnatsu WG1A== X-Gm-Message-State: AOAM530zqMVyKiiy3Lf7p4Gk7ornIzNo12xrPuiLNHhoR3h8DffEqlf6 BLQyrpjcVH/WHB+cMkkELsDsgw== X-Received: by 2002:a05:600c:358e:: with SMTP id p14mr11572647wmq.136.1626275289495; Wed, 14 Jul 2021 08:08:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n20sm2367927wmk.12.2021.07.14.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:08:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 59D3C1FFC5; Wed, 14 Jul 2021 16:00:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 44/44] MAINTAINERS: Added myself as a reviewer for TCG Plugins Date: Wed, 14 Jul 2021 16:00:36 +0100 Message-Id: <20210714150036.21060-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 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 83b55030ad..c4439a9488 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3018,6 +3018,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/