From patchwork Fri Oct 8 12:25:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515564 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2861237wrs; Fri, 8 Oct 2021 05:28:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIy12I0CS/j6eim6xjUy5xHiB8um81PF3dq1wBGUpYqFgr3Tq/1fh9ZO8YNj8A8qljxFYK X-Received: by 2002:ab0:784f:: with SMTP id y15mr2296101uaq.126.1633696105755; Fri, 08 Oct 2021 05:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696105; cv=none; d=google.com; s=arc-20160816; b=iSQFHLbpakosHnYL+wPngXmqBQQmlEOtpjlAH92hkAMZdsU4Njc3i8gvmKdq4DpY/m CK4++3jc1jLhRdyOKuoynPgJ6luG3j13c6LHUoqYI3TwV+aIy1AplkrzHFizw3bjoqr/ ZpRH2SGrWN02z8E1CDaRbyGYCJYkbun3rGBdySpnj1Hh6DnVoJy1eoXwtAM3CjeTg4O4 x8Pk434OfyVevMH2VqCxmZjB0EyBqj7PeCAwZqsM8Z9f1SulF6k8xsN8/lqsydPMCB6E b416i9QgTpSvFdUUtWj55jgcb39kzGGaZxDT7y9auBO0wC5Y4pFbac4BikN/hNw2KTDh 5hzw== 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=lMmeyhB+N7zk91H6V9iKKmYMPFJOsMjTkfaY9u1DH2A=; b=Ud16Z9s9V7814d/WPr6MNaBVhx8VWveqKDbFo7UWImOOLvvXsAMEWmBcA0d/VN9Xd7 dH17paiEWIJpWUFO74O/s8Lu4hDaBaN2leS02Eh+Kf+XuoxHK8yWpezs8VjRRhk6KK0g tg2S68VOsMC6RbimwtFSLX4nRqP8fX++BjGdozP6gQLLv2Oy/kBGc8OggHbsP6R8S0QA mFkazozeWZzLIdYr4BNsO/myrjr3pGh4vGhxCQZkaiVFiHYApZu/t8jM4fDaCqnDA+yP kC0rMydp4HKCsg9CNbCt+RpqSnY2FBGzO5bAj44YN2scD4SEgLPN44S6NN9J8xGRRIGd 8dcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="hX/HcBVx"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 a11si2036988vsl.429.2021.10.08.05.28.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:28: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="hX/HcBVx"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:44722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYozA-0002zB-2j for patch@linaro.org; Fri, 08 Oct 2021 08:28:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYows-0002wU-IC for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:02 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowq-0006rH-Ne for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:02 -0400 Received: by mail-wr1-x432.google.com with SMTP id t8so29476790wri.1 for ; Fri, 08 Oct 2021 05:25: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=lMmeyhB+N7zk91H6V9iKKmYMPFJOsMjTkfaY9u1DH2A=; b=hX/HcBVx0wcPDBG0vo4HxTrxmMHLZUkbHR3WeTQZR+3b9R4Zeoo9qI6NdfceyDA2DA aC/NkgHfcgNGadlYmsCoPT4/VjvXj9WS/ZxKCSC/t0n0PkIswRR8gBUmtCM0epnr2Ow6 l9ZPASkxXHJ5xDtuhphcXOQhNjvroQ8jVECKj5xxIwnoTpsapZCY2mRcx9qnTGbtWXew 9z2+y60Vdp3gHHjF+f8UmhOBSEdLpsT7E/MwFPW998WU/WcZMkPyIUvoXP3CoCIpjE/f Qlli2C1e71i/QRc0bU9W9l3Sm4kXkS5fzerWIlgMfl2OKeIWEIaUJg+9LcGzxDaZY1SS sLMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lMmeyhB+N7zk91H6V9iKKmYMPFJOsMjTkfaY9u1DH2A=; b=6WEeiKdX1nesfOyiDcJ7TQnfcDA1ZIevXiR3duFK3vECoWiA6Zc8sWKteMhgz+po0y QSFlK//gSCeLHgmk3ObTNER4qqUlc/DuWS/UKw/RhxY7GBJeTZTtpoZDfLsasv3FIocq sPPCXS/UtTCX31rmFfzh8TsQNfyFaa5usYbtEC8/kMMYaWhZQAjEFlBRzK00tEDQmmsI ZZM9it3qqmojtIPOmZv8x3SUn25iaw4geTvXglwuLPl//Fj4QI4bDfhu75DJpyOtozHj n5zw524gqE/DQvzXHCvU4NAQPu4tMD5zAVXgS2uK37abJ2jvBTczd+HJFB0IyHOcxio5 pV9Q== X-Gm-Message-State: AOAM531kd+rccqwU5dIZtK0GCEkACHIVyA0++WMRQSY5t3bJJwH5OSnD rREwDp5FWObuf/BMA1RrM+7hTg== X-Received: by 2002:adf:aa99:: with SMTP id h25mr3694648wrc.271.1633695957892; Fri, 08 Oct 2021 05:25:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l16sm2592886wmj.33.2021.10.08.05.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:25:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 444391FF98; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 01/12] configure: don't override the selected host test compiler if defined Date: Fri, 8 Oct 2021 13:25:45 +0100 Message-Id: <20211008122556.757252-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There are not many cases you would want to do this but one is if you want to use a test friendly compiler like gcc instead of a system compiler like clang. Either way we should honour the users choice if they have made it. Signed-off-by: Alex Bennée Cc: Warner Losh Reviewed-by: Warner Losh Message-Id: <20210917162332.3511179-2-alex.bennee@linaro.org> -- 2.30.2 diff --git a/configure b/configure index 877bf3d76a..e2750810e2 100755 --- a/configure +++ b/configure @@ -1686,8 +1686,10 @@ case "$cpu" in # No special flags required for other host CPUs esac -eval "cross_cc_${cpu}=\$cc" -cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" +if eval test -z "\${cross_cc_$cpu}"; then + eval "cross_cc_${cpu}=\$cc" + cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" +fi # For user-mode emulation the host arch has to be one we explicitly # support, even if we're using TCI. From patchwork Fri Oct 8 12:25:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515562 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2861172wrs; Fri, 8 Oct 2021 05:28:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd2L/zHN+UK6PyOqiF84hfGuC8QCQDlpcsdxVwe4bua64FuVoBBvqahwQ+jzsrSLYH4cbx X-Received: by 2002:a9f:384f:: with SMTP id q15mr2293201uad.136.1633696101312; Fri, 08 Oct 2021 05:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696101; cv=none; d=google.com; s=arc-20160816; b=rF1QVIlLh0FAuCNHcM4S1H4H7tmtqSXbDH1zAhoiJ+VQOG8gre7ACJWt9+YvIs83s+ R0q/Nh/EISXp3hqH5yU1eIAuvxyDOyBPR/F4Y+SbRYK9zaeSD3c9t4BFETN2T/dN7IO2 gthJz4vxaQUtx7geA1QBUZziEtk9nh78GREqVOKaowoSm/Ot3IRV0LdHvkZeUTvFxPBC Ezu6zaoJXuWbhUCfq1j6avbHSH/GVfxWCi3Q+h4TDx9ijZVT610mJQDlw3qXfHPqcKnW ccvRK+a2f8KRL540OH2iYEn2pNLbARFB9zSXGM18CmsvMnFWd2cXNHUuKPFohMYvoIRF 4BDw== 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=UNCvOhfMcVb2T//uqDjRHKJRqdy+NSIyFeLv88Ae7MA=; b=1Cgxe30E/YnrC9C92b26zEaQTZw/WAqcOZyfUof3KTwLnQ+Ak7VKfAk2xnZUGhs0Lk BO8UvheHx5opK+afjsX5oEKs+/0SbqagpDFGaXiBEge4ooQ9e1bOBUk7nyBJs8jvFb2c uPfaJS3pXpXvsWZUQFdUTQwzaeLrR1b1xa5AuOLWs5eKpzGfKGgN0wnjTAI1esYM5CYE G77U5w0usaP7eXy3QSw0joS/PwK5GoWSDkRrmINkeiXXgRYt4pHJvHCa/n2OtCjK0P9P KP0uZABzQjtH0lAy5bAwlF6BNsg3vX/KYHavxKT95R93eD8pI6Tu1QxlrnLXnG7n35Ot J/AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q+p8t3q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 y12si2335607vsl.403.2021.10.08.05.28.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:28:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q+p8t3q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:44668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYoz6-0002x8-Jl for patch@linaro.org; Fri, 08 Oct 2021 08:28:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYows-0002wT-IC for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:02 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:37813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowq-0006rc-Nk for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:02 -0400 Received: by mail-wr1-x42e.google.com with SMTP id e12so29298381wra.4 for ; Fri, 08 Oct 2021 05:25: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=UNCvOhfMcVb2T//uqDjRHKJRqdy+NSIyFeLv88Ae7MA=; b=q+p8t3q581UjKQZj7LYMqQx/Fbm2bNkC5uuY9vIruH9dIKdrpSZizgR6C826R90UJg KiVLeR4XOPM0GPMzZTXo9ziwioAlmRfrSoa0czEzGKfXDRf0jm8I5sGVYvpZW3tTIxGh dFqgjgQQ1yDLQ3Bd2bMHfi1+dJtGHK9oSJrkSJmmkMlI7jQTPWN8mIvXABX2Z8l3ctsM r1RoHRzfZaXeU6XIh0JVCpD1C2zJGLHOUEBA2QFl4E6Xl6Kf2+FlQhPs+KWk43Idfauk aHvXWL9AXmks1BnTOAO3R43tAypgqSRbInIZJ4BbSMfFujEF/q2FTez6bpUNcQehr/Ig JNLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UNCvOhfMcVb2T//uqDjRHKJRqdy+NSIyFeLv88Ae7MA=; b=UovVqS5KdlRFp+yy+7FLOth+bBGeeNJ7fXawhq9QwGJjU2VMt/S8q7uCiZzErX2hMs ei4GFllOE2aKQzgK45DYeyUxmWL6eJg+acYNdXT7e4NV2H+j4B+3Cnmwo9ILpdgb6IIZ qzaLko+yZCBBKWtq3i/n77FgE6Yk5CcU6YdURobCtTWZnXUq7EpSIXp8xnSXwvXhpGZ9 6iP1fW3kkwkAtUkmgDQS5Du1RTMv1WfoGBhYX/rmp+FF4Wl8DbvWh+skMG98Lp7o+2yz w1drV7cu/sNddVd6ShAQ4w9ajvUqecq21DfA1pNoc3ZWCb9bDWFBe+8KyHteEEkEOr02 m8rQ== X-Gm-Message-State: AOAM531u/JY9/9s+kC1UKCJkkf0i0wu/+UUWSGUhh7fzquDbGFYZrszV SjMZpkjs4w2MMCURnW7d/DUYEA== X-Received: by 2002:a05:600c:4fd0:: with SMTP id o16mr3064019wmq.73.1633695958584; Fri, 08 Oct 2021 05:25:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w26sm2199168wmk.34.2021.10.08.05.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:25:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A6A71FF99; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 02/12] tests/tcg/sha1: remove endian include Date: Fri, 8 Oct 2021 13:25:46 +0100 Message-Id: <20211008122556.757252-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This doesn't exist in BSD world and doesn't seem to be needed by either. Signed-off-by: Alex Bennée Reviewed-by: Warner Losh Message-Id: <20210917162332.3511179-3-alex.bennee@linaro.org> -- 2.30.2 diff --git a/tests/tcg/multiarch/sha1.c b/tests/tcg/multiarch/sha1.c index 87bfbcdf52..0081bd7657 100644 --- a/tests/tcg/multiarch/sha1.c +++ b/tests/tcg/multiarch/sha1.c @@ -43,7 +43,6 @@ void SHA1Init(SHA1_CTX* context); void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len); void SHA1Final(unsigned char digest[20], SHA1_CTX* context); /* ================ end of sha1.h ================ */ -#include #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) From patchwork Fri Oct 8 12:25:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515567 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2866126wrs; Fri, 8 Oct 2021 05:33:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpR97rUbGeMsV4zhPwu9GcpmPnq8q7+LCGuPeEK5nfXlnV4+5Un447hz38UCp+INzffyRW X-Received: by 2002:a67:e090:: with SMTP id f16mr9165079vsl.17.1633696414051; Fri, 08 Oct 2021 05:33:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696414; cv=none; d=google.com; s=arc-20160816; b=rjAIK9X39R2sfcRSk37kJqJjlCMt5nLIWOknPsTTKG4ZksmI3HIKev3egkS5qsMxiH 9n03nYopLBci3Fxq42r0l2D+jXQbu0SdBwsBp9DMs0QiqPT1jWfiQXSlDdCmOfkFyYUF EOsoR9Gl+a/BCeJUWfpGGG8HeyoYJ7rOXDHqZcNb8GzBn98e+l96zt5eoksXpCSKGhoA c1hsUlKBgGtq3qRf3euRi9urVjH2r/EXqsF6ucFuXacw/CybhSvU41mbmB9AtzIr4xLp yJwR52agnnuRIYfxMeENKdeqv0awWM12wORAgAhcRh3OiD0aziNwPy5khjrp8qhizdKI cpUw== 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=5rte+4aR3/Vd75ajXIv4otNTx3jNTOeHVc3H5M5GOsw=; b=NVwMb+IUieapoThgMU6S0H8Dq3oeKCguiXXDtSWjcTknjPc/Yz+cDYKse1pceqD313 tBwSq4mCUme309A5b+OSLSynAgfZ7LlYR1phIN+Mq0ES+sfHDejsV3qm0LkTAx8FdX4K +AxKDfQHRKNdZoYzJpQZ/yl91y13IW24lgi9YhA/M0TSMlcoJBCS+7UkOH1QAzVBzc5u AsONBzM6RZQTFFNS61xAN8A1kXYmvxwMo5PwLjf6lgkw1Wf5nDD2HIfOJ+duZ1qVeBO5 Dar4eR9n0reRzt3qK5HKrUEUjH3ZmoB/HOM9aTO+uY88bw0lA506442/kKGNBTiES5Y8 NleQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gMePPYgG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 n4si2324970vsh.363.2021.10.08.05.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:33:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gMePPYgG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:53140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp49-00015d-8M for patch@linaro.org; Fri, 08 Oct 2021 08:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYowv-0002yK-KL for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:05 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowt-0006to-RU for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:05 -0400 Received: by mail-wr1-x434.google.com with SMTP id m22so29410987wrb.0 for ; Fri, 08 Oct 2021 05:26: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=5rte+4aR3/Vd75ajXIv4otNTx3jNTOeHVc3H5M5GOsw=; b=gMePPYgGei8PddWDNSqZKIhwt4Lry5ceOib9g7QyMJrtF9uPDkJcEpF9oLyA9G2Bl9 JJqvZT/FfXdn9qme85XizD/85VjNwXyX7NZ30WNE3ZdHdnq2sR8WHwB+8Mb6xcTkZ14I Q4bim2IzrBKXKkiZIKYn6yR9mSCp6yjstytA1m0xhuob2Cj/rBR+nNdpaRB8MYFO4TQD py8POP80Ugsmz8NcYFtwe7q6rxTAbpUSQ8EWnEhElnnio+HKHtHdIj/uPAYcJXh+dVD+ CY1XBAsfz2KycY17Nc0mtArWH6ln2isfI8fOaLqta67Rm8SXag31wNnCYdYWRrK+U83C xywQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5rte+4aR3/Vd75ajXIv4otNTx3jNTOeHVc3H5M5GOsw=; b=K5xTUIGdeSK96eEHhIDJ3IIpfY3RlSc4IIpbuKlGgnbJ5NpFUCPC+c8plcH4XEUO3a Xz43XfiLy5gNEVK3vWP2CrG+bDfmIYEjQszSet5mPEEOEL8ofEosNAbTPolacvl2/DU/ k21SP5Gb44QOCQDdffwwPWzExCuqT4cBXM6EbiKeHtwBv875o5qsHDlmCZzgRhwJcd9g L+ePl14qXHK00wViay1wNTEU4KQoIp0WsQOUMvS/3mPgnFZGB0dkKlEi9+gBQJPOZ1RK rT73tEV4toCjeh4Ugv4uuwpbq3n+U64jJN5s6LX87kUGPFxdYsAGmhRm6+fbMG24nCME VtBw== X-Gm-Message-State: AOAM532mWq5uXaPp4FQ/Qd0KKB1RTaxYesCtzsWsTjYQ2zKcbH40ApMC QynYmYgcpJLJ0No+z3VVzWt4aA== X-Received: by 2002:adf:e0c1:: with SMTP id m1mr3728979wri.241.1633695962512; Fri, 08 Oct 2021 05:26:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o6sm3501954wri.49.2021.10.08.05.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 73FFC1FF9A; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 03/12] tests/tcg: move some multiarch files and make conditional Date: Fri, 8 Oct 2021 13:25:47 +0100 Message-Id: <20211008122556.757252-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, Eduardo Habkost , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We had some messy code to filter out stuff we can't build. Lets junk that and simplify the logic by pushing some stuff into subdirs. In particular we move: float_helpers into libs - not a standalone test linux-test into linux - so we only build on Linux hosts This allows for at least some of the tests to be nominally usable by *BSD user builds. Signed-off-by: Alex Bennée Cc: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh Message-Id: <20210917162332.3511179-4-alex.bennee@linaro.org> -- 2.30.2 diff --git a/tests/tcg/multiarch/float_helpers.c b/tests/tcg/multiarch/libs/float_helpers.c similarity index 99% rename from tests/tcg/multiarch/float_helpers.c rename to tests/tcg/multiarch/libs/float_helpers.c index bc530e5732..4e68d2b659 100644 --- a/tests/tcg/multiarch/float_helpers.c +++ b/tests/tcg/multiarch/libs/float_helpers.c @@ -22,7 +22,7 @@ #include #include -#include "float_helpers.h" +#include "../float_helpers.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux/linux-test.c similarity index 100% rename from tests/tcg/multiarch/linux-test.c rename to tests/tcg/multiarch/linux/linux-test.c diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 3f283eabe6..6ccb592aac 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -8,18 +8,23 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources -VPATH += $(MULTIARCH_SRC) -MULTIARCH_SRCS =$(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -MULTIARCH_TESTS =$(filter-out float_helpers, $(MULTIARCH_SRCS:.c=)) +VPATH += $(MULTIARCH_SRC) +MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) +ifneq ($(CONFIG_LINUX),) +VPATH += $(MULTIARCH_SRC)/linux +MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) +endif +MULTIARCH_TESTS = $(MULTIARCH_SRCS:.c=) +$(info SRCS=${MULTIARCH_SRCS} and ${MULTIARCH_TESTS}) # # The following are any additional rules needed to build things # float_%: LDFLAGS+=-lm -float_%: float_%.c float_helpers.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< $(MULTIARCH_SRC)/float_helpers.c -o $@ $(LDFLAGS) +float_%: float_%.c libs/float_helpers.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< $(MULTIARCH_SRC)/libs/float_helpers.c -o $@ $(LDFLAGS) run-float_%: float_% $(call run-test,$<, $(QEMU) $(QEMU_OPTS) $<,"$< on $(TARGET_NAME)") diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 2151ea6302..d7a7385583 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,8 +8,12 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target +ifneq ($(CONFIG_LINUX),) X86_64_TESTS += vsyscall TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 +else +TESTS=$(MULTIARCH_TESTS) +endif QEMU_OPTS += -cpu max test-x86_64: LDFLAGS+=-lm -lc From patchwork Fri Oct 8 12:25:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515566 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2865944wrs; Fri, 8 Oct 2021 05:33:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVJhD3gzkOjb+K358VegDk/T/BNQOSsFVnZDj9e2zwGuPy5mLcqFcL1Tf09XDYdITVEari X-Received: by 2002:a1f:d0c4:: with SMTP id h187mr9040125vkg.1.1633696402162; Fri, 08 Oct 2021 05:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696402; cv=none; d=google.com; s=arc-20160816; b=Do+zQAX1zWNyaOiQqJk7glo/GDphzfpK4PdsGR+/WDYIT4Tr5RTauitNriD3LHTRVY JcpDPm5HJl1b5ioGzTPhspEs8MFKN6oOAFf0d1naCZfGO9RcQQ3t5ZyN6RAUEViVSm1g 2L76owwtJBKNrECEkgr7XLzn8nNscI3ALhQfqCAIW3u8IvTk5j7gtDg7f9gYgeLh6+Rw DRZ7hIFxZ3wyioyGpU+OnaWXVaAGGuIfI/Ga31JoaJdR5mTsS2/dlVUhdx5n9rmWYebX +2Mr1AYi6KpbAu2ph2iaWx7QQRcEvm5K40TQFD0qjxkQOJdN0sp4S1SSfSSBEQMqT6W9 6+zA== 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=QfgsiyjPNCvJW2ICwHEKbAih/Gq9LuRXM/hG4XuMnM0=; b=BX+i1cVb/ho22SW1A/6YutgqHkdm2fPvX+BQhW74szasuibLYGHMYwTycGYBmAvH6t annl9K+zkle3BUI3RIoZy9UQfU4zQ5I8OIx7H5Dv8GaP2qB9plKuWkZbnhHhvzH1rEQz xjS56kxU2Me8X5uxZc60M1pQ94cyfIh69gJhg9RWzXB71uBH9/D8uIWyNhK71p+6Yykb CbGQTz8ZFBzLURHI/ST/JhwihK+9W54i+u8Nopckn+Dl18Qh8nd67c/KitEvYdqjWTvP zbJONZP+kMJ8UcodxCMeyneCUadPtbxUdDYehs4KEV966BDHvGrV9ZSWT4mM0pN+jt72 65xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yWET4QsX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 p12si665527vsh.52.2021.10.08.05.33.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:33:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yWET4QsX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:52982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp3x-0000zL-En for patch@linaro.org; Fri, 08 Oct 2021 08:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYoww-00030Q-Ov for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:06 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowu-0006ty-Te for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:06 -0400 Received: by mail-wr1-x429.google.com with SMTP id s15so29381665wrv.11 for ; Fri, 08 Oct 2021 05:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QfgsiyjPNCvJW2ICwHEKbAih/Gq9LuRXM/hG4XuMnM0=; b=yWET4QsX+cqaWKXvCvQfJL2D9yBrw/QfNyvbnX2mBkwrWJpfcvGtCiYSDm3fn6lW60 uP/tNpkTxXEZkxTWfE9iRHsWZR01cQqkGloQ3TE4Hc4kyJv8746l63r/oPlqF1gBzAou kKdgRBpRvwPmP6R0Ak0zXINjtvYilbqldJ0MeGrHUdsKHO1wEp3jBxG3RQMAVL1XTO5n +KoJ127x0dv0nsRvTzigCjWE5/xskkxg+m1pzyAt1epa79NWerWFKk3xEqGyDt6mfTrZ 2ZB70KNVJhLolWuKTf4S8/9rdre5C6PLOTH5tkJ3QC0E8yPJBR1MuFaa2CsgBE3weSG+ /++g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QfgsiyjPNCvJW2ICwHEKbAih/Gq9LuRXM/hG4XuMnM0=; b=Imx1TmwYpEjZtw4lxFZs0y8+UuGCI4kcPYazKn2WonzShfWtfZIECWJxkw1xe5trxs OGjbnMTuENJkWYuU/yX2cuSiH6vaRnIuJ6qgPS0CJAfjxObt5jwnAGhsTO81pj7l5D0U ufiYrMJl5d5WNBRL/CTaF0BgZ+RaLF1wgxq9/iVeacVGEuNtMlBLfe1ia3qw0khmubMv WfiM14EDrXDE4PE5aGZ6hSX4mTes0sOKVzGsS7X7wgJuscmOyl2/uD6G8eLWZAsLElew fXTDgLOk4z2KkkeqwZe8wgIspXu/1SEYLKSHJrvGrYBzRPVv1ncaVzVDDATmwD+Q0aD8 EHKw== X-Gm-Message-State: AOAM5339EokbXfyYCi/mybWLUSpsWJp9oHCI64QsGvcQGtoRuN5AgFQv 4LuSB7x/hVRnQStc99f+6qWUnw== X-Received: by 2002:a1c:7c02:: with SMTP id x2mr2940701wmc.165.1633695963392; Fri, 08 Oct 2021 05:26:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k6sm2469253wri.83.2021.10.08.05.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 848271FF9B; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 04/12] tests/docker: promote debian-riscv64-cross to a full image Date: Fri, 8 Oct 2021 13:25:48 +0100 Message-Id: <20211008122556.757252-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_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" To be able to cross build QEMU itself we need to include a few more libraries. These are only available in Debian's unstable ports repo for now so we need to base the riscv64 image on sid with the the minimal libs needed to build QEMU (glib/pixman). The result works but is not as clean as using build-dep to bring in more dependencies. However sid is by definition a shifting pile of sand and by keeping the list of libs minimal we reduce the chance of having an image we can't build. It's good enough for a basic cross build testing of TCG. Cc: "Daniel P. Berrangé" Signed-off-by: Richard Henderson Message-Id: <20210914185830.1378771-2-richard.henderson@linaro.org> [AJB: tweak allow_failure] Signed-off-by: Alex Bennée Message-Id: <20210917162332.3511179-5-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0fcebe363a..a3b5b90552 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -134,7 +134,8 @@ ppc64el-debian-cross-container: riscv64-debian-cross-container: extends: .container_job_template stage: containers-layer2 - needs: ['amd64-debian10-container'] + # as we are currently based on 'sid/unstable' we may break so... + allow_failure: true variables: NAME: debian-riscv64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0806c6f726..450c76a3ca 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -141,7 +141,6 @@ docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-mipsel-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 -docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 @@ -180,7 +179,6 @@ DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross -DOCKER_PARTIAL_IMAGES += debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 2bbff19772..594d97982c 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,12 +1,48 @@ # -# Docker cross-compiler target +# Docker cross-compiler target for riscv64 # -# This docker target builds on the debian Buster base image. +# Currently the only distro that gets close to cross compiling riscv64 +# images is Debian Sid (with unofficial ports). As this is a moving +# target we keep the library list minimal and are aiming to migrate +# from this hack as soon as we are able. # -FROM qemu/debian10 +FROM docker.io/library/debian:sid-slim + +# Add ports +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt update -yy && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt upgrade -yy + +# Install common build utilities +RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ + bc \ + build-essential \ + ca-certificates \ + debian-ports-archive-keyring \ + dpkg-dev \ + gettext \ + git \ + ninja-build \ + pkg-config \ + python3 + +# Add ports and riscv64 architecture +RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >> /etc/apt/sources.list +RUN dpkg --add-architecture riscv64 + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross \ + libffi-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libpixman-1-dev:riscv64 + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- +ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user From patchwork Fri Oct 8 12:25:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515570 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2868672wrs; Fri, 8 Oct 2021 05:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztra7bawQ+s0jU7tA7kGuUwJ7VKZby3gNndGh3ozBIQu8Pi6OL/qHsLJrbBeykDuQzvBEe X-Received: by 2002:a6b:8b52:: with SMTP id n79mr7322324iod.8.1633696579364; Fri, 08 Oct 2021 05:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696579; cv=none; d=google.com; s=arc-20160816; b=b0k1CkEcwDjb1IHVOur7eL4QVV9EWpRExLlPNOkqn9dTekT7hEQHylmuKEVueGmd1w 4J03s6EgS9lMFlLYlurGYuYNrSLxjASD1utnd2RUt4/ggcF6POWY/EOXe2pgnt1pfC0r jl1zZHFs3v3qH+f7aWBXPzdS53FgSPgBk72+iZUXRWm7zDHeF/YerkRu3OCRJdzpaUNn vfEKsLtLmShZR5MHvS2F9M/R3w7VYWNg2TYcCLkvMcNbLaY1uwVQhcCzCZP63DuG0HaB BQ2qUd1U8Uu05kDpNmQfyZ0sCJct8SQZSh0v5+GDU6ipajRTVl+Wd7TCXKQ323q2KrjT 9HTQ== 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=/OurTzLLuet6/f8y2V92mbSdjr774nC3YCF5I0yCoTU=; b=rUEV8+p33ROGLObSIeHt4KzTgDiQaLe32vtFBori1pWKeBIHd2uXxZ+x6aBVdhxhzo M4CW/vd2rMB7GUbN3lfg2iDLy/+JLC1tEsN1Ohmk9hOWd9FWRD+f9AdcL8F5z91Py0WB gE9rHOMwtbl8/2c92L1YcXcGD0VBE3o7B/CxoLb4kfNX6PP9/vz4JgzkloReGvTF6Vh+ KioDKHcnhL1FnJiXX+9wrSv+Oa3kdZIL+hIzu4GMOjOMDTIb0TpeBDwSc3Z9OdeDiV5n D9D7mePkVAH1Y9IGj3/KxzCXV12u0Gp0ydu7N5zsasGH8z28Qm9dSDm7J5Iy0Z0E0bIR zXwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lgEiUzPF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 o12si3024365ilj.142.2021.10.08.05.36.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:36:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lgEiUzPF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:60414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp6o-00061d-OF for patch@linaro.org; Fri, 08 Oct 2021 08:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYowz-00032I-LV for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:11 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowx-0006vN-H8 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:09 -0400 Received: by mail-wr1-x434.google.com with SMTP id o20so29230101wro.3 for ; Fri, 08 Oct 2021 05:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/OurTzLLuet6/f8y2V92mbSdjr774nC3YCF5I0yCoTU=; b=lgEiUzPFlftBfd4UD01/HuZpajvF5asIusRx0QeldeDWG3N7FtelKPkq1WuMvj5axM m6rwDL0ph1HPgKWXGejdHavYlk2iBCLEvij6n5d4ULKW5e8H5PIzsFhL13/YlNyiSB8F gIXhfJh8c7B9Zzg68l4cQYg/kB1schxojDNDqTcgYaR8U8B20Dlz55Y9jcLseUfhte8K TGfBJZOcgNqRbesEPlHLZNUbVUG1A3qG0Pk+gzS531iZY6s3w0h/9GDzsBd3CGu3dIs9 u8Ub9iMlmaebZzrhQNunkxSlV3+S31KaybDbuZtoK9RG6pm8gEnhUx2fVcFXxx/zyQVC jLHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/OurTzLLuet6/f8y2V92mbSdjr774nC3YCF5I0yCoTU=; b=rzaUHJGYCw0qvUrAgaInxmCQFi0J4d8BSeWWRUVuZ4O5z7Hk3zNXGsIGxEcmrkoBSd a9hfHp5g3TvGMeaCkZNmFFkTbpVWlL/nchjy5jzK4k3vNDpUMgQATSl+KN8/Trwyn0jJ cN0jgqproCXMwMRfhbNgXplEVZLzt0mYWGzIjz83Y0CsFUUFSmL6pB/mGXzprsbfGYYv vvXlVwpxvN/94tV4RWE05ElDglKsaMpDsCScphOJfzOV42lIxTumYSVG4rirgvJsKilc fDR4tlOhH1kPBO/IZ1M7tGaOqxw+TJi/HVV9mWGdICsKJl4TTeGTCiE1cCdDZmJWP0r+ M/Hg== X-Gm-Message-State: AOAM530HTlfvYswB+ikFHQ0z86eoEyxigIVFCbAAMus1YO4AkN+NvjLX QylHhVcqyBmvgj8QwBowXYYg9Q== X-Received: by 2002:a1c:f405:: with SMTP id z5mr3104360wma.33.1633695965473; Fri, 08 Oct 2021 05:26:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q3sm2203094wmf.11.2021.10.08.05.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9A7E81FF9C; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 05/12] gitlab: Add cross-riscv64-system, cross-riscv64-user Date: Fri, 8 Oct 2021 13:25:49 +0100 Message-Id: <20211008122556.757252-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, Thomas Huth , 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: Richard Henderson Signed-off-by: Richard Henderson Message-Id: <20210914185830.1378771-3-richard.henderson@linaro.org> [AJB: add allow_failure] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Message-Id: <20210917162332.3511179-6-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index f10168db2e..17d6cb3e45 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -124,6 +124,25 @@ cross-ppc64el-user: variables: IMAGE: debian-ppc64el-cross +# The riscv64 cross-builds currently use a 'sid' container to get +# compilers and libraries. Until something more stable is found we +# allow_failure so as not to block CI. +cross-riscv64-system: + extends: .cross_system_build_job + allow_failure: true + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + +cross-riscv64-user: + extends: .cross_user_build_job + allow_failure: true + needs: + job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + cross-s390x-system: extends: .cross_system_build_job needs: From patchwork Fri Oct 8 12:25:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515569 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2868556wrs; Fri, 8 Oct 2021 05:36:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9damnkl8n8D+GOVoYRPya1aJeaHxFq4N5twG4SPvVsiBNI9S2fTnQvzpylCJyRb5c2Urn X-Received: by 2002:a1f:2d8f:: with SMTP id t137mr9037561vkt.26.1633696569577; Fri, 08 Oct 2021 05:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696569; cv=none; d=google.com; s=arc-20160816; b=LQC6ewKxWcNXOPGLSFvLhWfYMqUHidPoTLeIfHIRmWa1f1Mt6zjYfRd5YXwb1iPJSo JG87T9RdKaWPPnWEFRyTndMa/RbtwyxTHF1AAsz+ednWCFBBGWhAVaaBIu3yl3orhBvt W0KUpQTr2h+b+qirV2byEK5bgsvzfAnUNkIZrylc43BF2oVmxc1P06H11vjJm6bI3DGu cZVdKflKNFMiOmjSKvXPKHRp8GlN52sWpzjlfzk7zG4lmw5LcMZJRZupwq/2cuUwAyFv cbj2TqU61mYW4GjiBK+iauI9E/9qFHiuZXo6FQzT184zgs2iTGCwaULpaujx6Lbkn2bf Lgqg== 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=ey+8hcKjwn/a5eDg/jyMS1kvRV58lceBmDEfg1Aiejc=; b=guOiLlo1uWvHYqx+uRRf0OmABwMxPJjWJu/EhcsgruNgY/+0Z9ZWbCRNd2YrrXbhZA R5B+RvXUPiZAIK59nzH6dLugKTUvdTIceuTVKNrOOt2EWrxRVuve5kZJOtkcU8o9drZM fFa7AeHsvRzTPAUMvxH76mLZYVJEq/ybaWIbCgknI/7k0uRZ1hWmk3vRAz6iwLzepALm ZdmucGvgT7QnoRuwOKbDEbQsk528MhAMmgiMmhpkfLg9iexXJmY4wbH87KJji1HK0Js9 9QEcAOfIcjh5ZT5fTXEfuahyIqgGJWsxZYe9AHDtuLYr7DBbcVJhpmOQe6xjqSCyjhtY rnYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zTkvsGUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 68si1915894uaj.140.2021.10.08.05.36.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:36: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=zTkvsGUJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:60326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp6e-0005y6-RK for patch@linaro.org; Fri, 08 Oct 2021 08:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYox3-00034Q-6u for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:13 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYox0-0006xD-1u for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:11 -0400 Received: by mail-wr1-x430.google.com with SMTP id r18so29360249wrg.6 for ; Fri, 08 Oct 2021 05:26: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=ey+8hcKjwn/a5eDg/jyMS1kvRV58lceBmDEfg1Aiejc=; b=zTkvsGUJlu8oaaZOm1DTSlWwk0Q+sM4uz/7AqntQYYdpXFt0894QyE9IqcMse6alPV idFZG5ZfvsCjAZVqJ+CrxRRN0CH9ydNT8WHekWbXjsTUBuk/5fXwFGFUUpXNhZa6Dx1I 7LDc8o8+57n09sWTCMh7q/R128KbGZ2y34//FKYtXGxJn2z8hcEXjchbQPxAVYXllT6e 0v0mbsjAM/GLv6/2SZlwMVnIG2OaCqAPKEIqxgdvBnxkELzDQsZexEW4SxoYrqLqU80Y 0IEqjk0xQRyAZN9Xvl1Mv+BG8x2njLQXfs4KvxWOtNTZ8QLA9wL6QWbAm5kzU0zo/WkT MW4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ey+8hcKjwn/a5eDg/jyMS1kvRV58lceBmDEfg1Aiejc=; b=en0UNNQ6Zhwy/n+HiYfZbbRMlMJUwkl5mQUsrmFeV3Y7/zHLrokplv05OiozbroYAk i1xdK+4sIhCRjNOY3sdKJtEIyQDDDTt+dOhmYo9utLnpoVdz1col1sUN/Yyxyk48m5DU +5353JMw0uSfGSd364g6TZ+Nxpwi+m0aaeLC8jmLgvp+5UwslGh0wlieRj69bHI24mYG PsNo0FXanZQcWSG1wzGcAJDFX+4RwEOBHpIBWn8iSeeocxcrSNox8Bj84vBO2k4e0hMf LnEqkasIFm9tzb2HK7VyjrEXaM+U4j2nluDL4QG2LGugl8Vafa83RD0VKDTS5MHxBE6w 2hFA== X-Gm-Message-State: AOAM533DLfJPU/d6f4ntGJGZrf7fqFvsd7bKpF0u2KUFHGIVzKu7rIW0 /905LAin3sYzCMoOCWuP2bhgeA== X-Received: by 2002:a05:6000:184c:: with SMTP id c12mr3672749wri.127.1633695968645; Fri, 08 Oct 2021 05:26:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 61sm2503719wrl.94.2021.10.08.05.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A59591FF9D; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 06/12] travis.yml: Remove the "Release tarball" job Date: Fri, 8 Oct 2021 13:25:50 +0100 Message-Id: <20211008122556.757252-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_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: Thomas Huth This is a leftover from the days when we were using Travis excessively, but since x86 jobs are not really usable there anymore, this job has likely never been used since many months. Let's simply remove it now. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20210917094826.466047-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20210917162332.3511179-8-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.travis.yml b/.travis.yml index 0faddf7b4e..41010ebe6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -305,26 +305,3 @@ jobs: - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools --host-cc=clang --cxx=clang++" - UNRELIABLE=true - - # Release builds - # The make-release script expect a QEMU version, so our tag must start with a 'v'. - # This is the case when release candidate tags are created. - - name: "Release tarball" - if: tag IS present AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/ - env: - # We want to build from the release tarball - - BUILD_DIR="release/build/dir" SRC_DIR="../../.." - - BASE_CONFIG="--prefix=$PWD/dist" - - CONFIG="--target-list=x86_64-softmmu,aarch64-softmmu,armeb-linux-user,ppc-linux-user" - - TEST_CMD="make install -j${JOBS}" - - QEMU_VERSION="${TRAVIS_TAG:1}" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - script: - - make -C ${SRC_DIR} qemu-${QEMU_VERSION}.tar.bz2 - - ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 - - tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd qemu-${QEMU_VERSION} - - mkdir -p release-build && cd release-build - - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make install - allow_failures: - - env: UNRELIABLE=true From patchwork Fri Oct 8 12:25:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515571 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2868716wrs; Fri, 8 Oct 2021 05:36:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf+cX0RJOVjoY/8Z8OnJ+RbcPTHM+khfRU5chUlqOtLk5KZvOXPu5UbWkQBUI+PXJ7t7YA X-Received: by 2002:a02:1688:: with SMTP id a130mr7546551jaa.40.1633696580763; Fri, 08 Oct 2021 05:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696580; cv=none; d=google.com; s=arc-20160816; b=rfrLVoaku3gmWrgT6EIQwjaBM1ZomB1zaV5HGcsU48doSD4Lql8QflWC83maO/+mbv wTe5xADMW285XF9Hg1Hn1A36Gq1REEn8jaLx4RF2pc2whHqg8HKI8Q/MZsTpeB/W4+tM nFByxeLWnARaDMgIIc65HFleJZJSd1X8c+EHinZVsCNUU2JmKa9fmv3HFd7VLr/BUgAi ZtLZmWkip12ZWyOjbAiB5Daf7VRJxdSzsangSl7J/tdXvgJzVoitJi1BvLP5NSBRLvZu XXei9PPgdqr5roBazFx2ZSxKuF3aQ5UUCoDFGaPhkKD0KYUROosHAaFKMB4cmiGrfyxX nfVw== 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=5sIzEvgWfGKFtMvrQS5KEmIsP4SzZixuq/OxHefax68=; b=r5M32pBRyP+nY0jp379vTDaPf5NIcMkDf45WN2z1hKeCZ/Gy9TzArz6odNGs4DKLLb EJADUHSP4oswNxkRcTwe7q5H3uHsWbQ3Pu71A+DYWTJdOvlmQ0cKPG87gl77gwSaC84F MIvGRysc7nA3kpeiqkqrjvOAYshXB2pjsdyZL7NEosUCK43Rxec31MY5rOaYNA/SAcD1 mLmovuDP3SLv+IWE9UnDCNgcxzSRy1QuNjdEYio7EOKhXPCzn9Tp4KEPa+qqmuRvt/dD F9HEQot/ohSkkm98S+YQkKVHPddxN4/15xUSEP2+rzf0lexTR7tstEs2NEVzkUAyTUMF WCPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MwCSZ+ny; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 d6si3332112ioz.3.2021.10.08.05.36.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:36:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MwCSZ+ny; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:60556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp6p-00068N-W2 for patch@linaro.org; Fri, 08 Oct 2021 08:36:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYox1-00033I-Ba for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:12 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:42575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowz-0006wS-7L for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:11 -0400 Received: by mail-wr1-x42a.google.com with SMTP id v17so29275073wrv.9 for ; Fri, 08 Oct 2021 05:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5sIzEvgWfGKFtMvrQS5KEmIsP4SzZixuq/OxHefax68=; b=MwCSZ+nyaHSICVRIj67x2J9Yqpq5Qg/TvIEXOT8gtvCFBPhMIHRprw/gN7Y0bVdNUM tFqqb0xw1UmQf534CsnXU+imyI0brGMjhxHWLTNxCvl7R0KdaadEd1NA0YK42zXc4xpT LHvC6WyDzL+rXThirrcUinISYHQO9vtHX6E9J5g9cnR6hnVj16Cj8RUMy0YUr5xPEeNg 668nSKCcasHc/Lq8S+ab7rL/q9XpgFaJPb4iCVw4VAt51aQwrMCWflHodG5C434jlE4b cTmb2jkPq6GmKLFL8P+L32LWO6U8Z8bJoznliZ/8TQ2DmCspSxbksIwCwg3NJC3i2lc3 ciew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5sIzEvgWfGKFtMvrQS5KEmIsP4SzZixuq/OxHefax68=; b=gRdro2oZVNr9fdbxfRnBlcMSutNjuP2rQhvnZmrsoq0mpxOYwR+04XHJlXP+RVDyQB CKpxktkULU4wsDzr8EaMiks09mTDbudo4jAGbZEG1Ka5TDNXQQ+3epikyEi9DxMLDlTX qUKs7M5C2T93Dz9RdnjoZCGJhywv6Tst3Z5C7LwbYv2lw5olyX4W4h1vIE4GTse6Lbsy ij1cO1/LM5lm4p1Ylo02sDg5MAE0QVZ5A2OORQwNne8DQjE0HiJjuXDCgxGL4UOWyTzh cuEyd+5wfxY4bwDHx3WtSPfYfZqOuBf3nkZ2Ozim+Bv76/IeYDSAi1FYPCKlPvQLWlrl mqMw== X-Gm-Message-State: AOAM532rIT5CWoo6IGjT4O6HQDEq1kMLIqgX6v/IZzG9NR+stcpKh0/N 9uGh23byvOKgq2ak1oL7EMINew== X-Received: by 2002:a1c:208:: with SMTP id 8mr3172200wmc.114.1633695967850; Fri, 08 Oct 2021 05:26:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c185sm2394477wma.8.2021.10.08.05.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA8731FF9E; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 07/12] gitlab: skip the check-patch job on the upstream repo Date: Fri, 8 Oct 2021 13:25:51 +0100 Message-Id: <20211008122556.757252-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_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 check-patch job is intended to be used by contributors or subsystem maintainers to see if there are style mistakes. The false positive rate is too high to be used in a gating scenario so should not run it on the upstream repo ever. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20210915125452.1704899-2-berrange@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20210917162332.3511179-9-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 96dbd9e310..902843f8b3 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -8,7 +8,7 @@ check-patch: variables: GIT_DEPTH: 1000 rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' when: never - when: on_success allow_failure: true From patchwork Fri Oct 8 12:25:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515568 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2866182wrs; Fri, 8 Oct 2021 05:33:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEKT1pGnPTgGfickvrpPyCgcbJHD+XnPLugdbobnppqAGj8ndguz4yo25lk9gA8G24RGaD X-Received: by 2002:a67:1c05:: with SMTP id c5mr9922203vsc.25.1633696417769; Fri, 08 Oct 2021 05:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696417; cv=none; d=google.com; s=arc-20160816; b=hxqpg2FrGbAg+q6PUKjEhhrUDJZNFow7MHSrvgARDIA6AtGOZufVuxQTfyEZiLKo8Z vl+oi7EdZlWr6vZgp43FRkuABHSPFvl6ViRItCLduFWCHREmFrbX+sJd7eSzYhUzpefJ dDU1QUfUumkTyJcxsBGjh07LF1+Bs2qXFBDw209EvLMkxpqm7yvxjK0DTMFGGX7x5+t8 B9gFgI078rFhuh3jfERHIaqsLi6KSxyRrprlCpXHqVx7YLHJ3pjSa35RauJowhA043EV tLcy77fkT41IklpY3Z1C36s2DmnzhS5bzBQyESCuFpGr2jIiFtxlmopQ9ummoAHhih/V 5vSg== 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=ntHPAm7ZTn3P7GMc4eSupec9FlVNAY5eKw7rkTf/RLU=; b=IOXG/nqfslE3lsOJ4OS0KMM8QvsD6F3d+A3EjLuFjB+/oVcPko52z8h3pQT7lltXkg JP4SYSsRW8oys45Q7lfoVrqrut+azGJ6z9NXkJUVzXDhaNik+ob2QdRyx2yfwwnc4Eai X8dx2nMB5i63dWrVEx4JMpmpdx/j/zKzSVPC4LYBVKrUXBai+8FXEH8BJbcHkXWtHAOU xRhCpBBvr53lYDDXUd2agApWS9qKBn34abuzE/3f4YFjbvwciRL8cfebuIle3a65MSB5 EnbgFlzDSK9Kl9pQ3R3a8gmeK12Vn5GWdp70+JcOfMCx9P59GKhsdF5/8ISgfYbkk6OD EFBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e36UzqJ+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 j2si2333740vsf.80.2021.10.08.05.33.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:33: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=e36UzqJ+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:53334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp4D-0001Dx-07 for patch@linaro.org; Fri, 08 Oct 2021 08:33:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYowz-00032G-E6 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:11 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYowx-0006vT-FJ for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:09 -0400 Received: by mail-wr1-x42b.google.com with SMTP id s15so29382056wrv.11 for ; Fri, 08 Oct 2021 05:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ntHPAm7ZTn3P7GMc4eSupec9FlVNAY5eKw7rkTf/RLU=; b=e36UzqJ+2WHKi4j1zXyKR7/CUVaPtkfm1PZJe/hjQuWX7VjBN25G+YPRAWYshSqWgr dPHLw4SGWrUdlcNZGFoKBG0yOocPFyVMjMKL6NVpj++HJrUZToNT3FEdCEfuwvxfWCg2 KuveMR695UoV4yYsQppqgSuebKwmwuwYDGr6ilCLlbXopBVA25ee0zLNrnLOl9WBhLKG dzopEro1cFsf5VrK5QowgFSIYDntxy8MLBOs4FIFgFPbKQEbyea29+H6Awb0e3mayGxY AmpoYf88KTq3UAem0F3bxwFBF02b4KujdrlZgNMU0M/tsw9Sv9HegbYHtaH8wOTnX/1X VM6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ntHPAm7ZTn3P7GMc4eSupec9FlVNAY5eKw7rkTf/RLU=; b=L+ldnQ4YVRRfk6DY6lvi2AOZIpalOStiPOsuYY5Oj3zk1umq8DTy3pc8BWgjx1Jb40 PbntgNitrTCNp3TMtPXh6F0ig/9xSf5WgPuJO53kujTmcQRGWHPFVAchJjp9YOSEv6Sf tEUgaYABI0k7eScHR8mN/KfIcCoiMx3U3j2fLTwqIBLw+bo6Kj62nrJxpbLbnW2pUj6k 8bPtI4pOnwA4zHnbrvlrT6T9xh+t5SLiHPb+kaJ0BTxIEprsyZ4qQCtNPlsdY5onlvqe zfFj37VnuUVqALMloAInzFgAaYba70eNtXIINr7KH87sRcFYsdM8/9jCajYhHOpx8LQc /QXw== X-Gm-Message-State: AOAM531SNmId/0cJJyjf1xlW5BL2InRrstU8PrVi3D27CRCQUaQ1SWYL /Iplgl80dz8xoXrmm9grTf6pqg== X-Received: by 2002:adf:97d0:: with SMTP id t16mr3549183wrb.124.1633695966185; Fri, 08 Oct 2021 05:26:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s3sm2383556wrm.40.2021.10.08.05.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C7FEA1FF9F; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 08/12] gitlab: fix passing of TEST_TARGETS env to cirrus Date: Fri, 8 Oct 2021 13:25:52 +0100 Message-Id: <20211008122556.757252-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Da?= =?utf-8?q?niel_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é A typo meant the substitution would not work, and the placeholder in the target file didn't even exist. The result was that tests were never run on the FreeBSD and macOS jobs, only a basic build. Signed-off-by: Daniel P. Berrangé Acked-by: Thomas Huth Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20210915125452.1704899-3-berrange@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20210917162332.3511179-10-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 675db69622..e7b25e7427 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -35,7 +35,7 @@ -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" + -e "s|[@]TEST_TARGETS@|$TEST_TARGETS|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 diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 857bdc5536..c555f5d36e 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -13,6 +13,7 @@ env: PYTHON: "@PYTHON@" MAKE: "@MAKE@" CONFIGURE_ARGS: "@CONFIGURE_ARGS@" + TEST_TARGETS: "@TEST_TARGETS@" build_task: install_script: From patchwork Fri Oct 8 12:25: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: 515565 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2861280wrs; Fri, 8 Oct 2021 05:28:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw54FY0UUNht+AzXacBvFpviY4m3e/C5sgRyIAxtwkn3rZzDjgRiRVgTDmlRKOkp46rFLKR X-Received: by 2002:a9d:2a8:: with SMTP id 37mr8499394otl.58.1633696108025; Fri, 08 Oct 2021 05:28:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696108; cv=none; d=google.com; s=arc-20160816; b=kVTmTkiyAIb8mWaS5avzUIYnj2zLbb0MLUv0vgD+FYMGS5FyAeen09Y9TDvCrC8s/K nKKS3G5OAYZXt+fAqhjdui39rWk3zAMM97gM+lE8tb3JMZGcs1envftjZ1Fa8ylwMBmi j4k790JjKZMUJFGw6A4rE2yk/bvQk44GOUAt3xwCVxgzX7pSJD5MlrouQsu23/fixX/D Ib85pKUYaDzTZGt60YiL98LlFxahwPcuQ1S2hjP+4ZQ5vfZUKK4C8sVq6E2hHBO9vov2 x0W2fwSS5UhSS+SH8OR2tjsk+pOjrLTW6HjGML6bQVswKBshARbP5AudOVECiVFXihrZ OxQQ== 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=UlbD6XGfCfOXQupeOaSvEq6gHfGN83XYP2EpCj2vfsk=; b=yEwx5ByRmPNc73qcrIQJXhOZ2e0/q+nRfAMAswoE87Q3RY7SCW3gU+X6GJng38swrV D1VFAxvWSeeox8FzZtSr19u2U3HDhSb/BLa0Z36nVqXIYz62rUamHoXrMgbu4xPFQymz 2bFVSdYKTWgAKiwGEKEI1vW3IJotWEBmXvjg9/3jA3vGgRnOqULT8tg1+P2MeyfOWB51 enBvfBRFgepoIFbZJpCsZ5HaaY1f0w+eIr7R3JPOGM88APxzy+zxPYUlSQGD2RWfvVdw 1+HU+BltggY4Vs5WNhpdmn46TlY7ruotiIueVsbKHaF5aIGMK/RtrlpWbkHgm5OBf92u z6NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dg+F8z3j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 e188si2152895oia.211.2021.10.08.05.28.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:28: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=dg+F8z3j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:44966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYozD-0003BC-9A for patch@linaro.org; Fri, 08 Oct 2021 08:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYox5-00037W-52 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYox2-0006xZ-JA for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:14 -0400 Received: by mail-wr1-x435.google.com with SMTP id v25so29247658wra.2 for ; Fri, 08 Oct 2021 05:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UlbD6XGfCfOXQupeOaSvEq6gHfGN83XYP2EpCj2vfsk=; b=dg+F8z3jmyzi9qAi4YnugEblf9Js7jis7RShYJeqyCGaqi5Q93Usdq7EptitIMcXAZ ils/DYNvKNzZl2K/Lr1IesZi1HbYRu1ylDAA7bQ9NOa/onJCpmAifP/vLWpRkDh8SJr+ WU7todvkmAAnPozvn/AV0RqDpB1XCeZAmVzfkUIEB6yGpaXfQpQzVr/DnIf0FoUd9dii VuwuTm0JyGvRj8x3xfszgsWQfrsE1UFlXJgN1jYB+fEkfh6Vt7gcz8cPhEySWrvVTcns HDeihKN1AczOeNQOSFjazcf9EV8avtIinAWYbMDCe0GSbjEwLji7CDFh+8w6MKq3G0sV wnKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UlbD6XGfCfOXQupeOaSvEq6gHfGN83XYP2EpCj2vfsk=; b=cg22qqn8rThFf5E6vuXd4ZmA+QNylGj9EzfRC29XWfNbLn14Lm9MsgcIEvLhtByq6Q k/R+ynUqbZCjiHUSD38ioaVIqO0uJv0PbmaTIeJH+sEExpW4JKSUh4gG0KZuvI0yNHVR HlF3sRWwoCFRvHtTRpvGYgvOzfZ+BxdMYbmOpMXpbp9lhskR6HGCpY3hIf0szKG4xRI6 rr/AfqN2jnjO+pAKmZA6wZkPQAu90XWuSMndVTIKN/wID4ZSdAWYMGFphTDBnNAgSzIw r5ghq0kTdOMvNddx4dgnLuVxG71N16QRx9S8F/hx9fDQp9bx7M6uTVgcXi5qvp+Yb/vu yCog== X-Gm-Message-State: AOAM5312yW3w1Uo88FQWMC9OCqoN6JEAl8GJTTbr3FCsyVNwTwc4yB/n DJoGPA1Dw6LJEOEPoFcZrRt78A== X-Received: by 2002:a5d:6481:: with SMTP id o1mr3882998wri.140.1633695970739; Fri, 08 Oct 2021 05:26:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l21sm2418952wmh.31.2021.10.08.05.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD9DB1FFA5; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 09/12] plugins/: Add missing functions to symbol list Date: Fri, 8 Oct 2021 13:25:53 +0100 Message-Id: <20211008122556.757252-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, =?utf-8?q?Lukas_J?= =?utf-8?b?w7xuZ2Vy?= , Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Lukas Jünger Some functions of the plugin API were missing in the symbol list. However, they are all used by the contributed example plugins. QEMU fails to load the plugin if the function symbol is not exported. Signed-off-by: Lukas Jünger Message-Id: <20210905140939.638928-2-lukas.junger@greensocs.com> Signed-off-by: Alex Bennée Message-Id: <20210917162332.3511179-11-alex.bennee@linaro.org> -- 2.30.2 diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 67b309ea2a..4834756ba3 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -1,11 +1,14 @@ { qemu_plugin_bool_parse; qemu_plugin_get_hwaddr; + qemu_plugin_hwaddr_device_name; qemu_plugin_hwaddr_is_io; + qemu_plugin_hwaddr_phys_addr; qemu_plugin_insn_data; qemu_plugin_insn_disas; qemu_plugin_insn_haddr; qemu_plugin_insn_size; + qemu_plugin_insn_symbol; qemu_plugin_insn_vaddr; qemu_plugin_mem_is_big_endian; qemu_plugin_mem_is_sign_extended; From patchwork Fri Oct 8 12:25: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: 515572 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2870879wrs; Fri, 8 Oct 2021 05:38:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhvYwKXyU4jRFE4bXZkHomFHd1H8mVyjMepvC2ckr/EYir9qNcEllr7V7OKMrMKxmJ4e8r X-Received: by 2002:a1f:9ec3:: with SMTP id h186mr9292022vke.5.1633696718518; Fri, 08 Oct 2021 05:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696718; cv=none; d=google.com; s=arc-20160816; b=mE0cOwmUtZgacJyIdgGyrQBCcH4oMEHDfWu8GYge85DpXEHTYAh73Hb3FzzlBklSvY ZdVkwVuktn0kpbPDap9KIARDpkMtq+7XkPRRLX7LoXAXMl608biT6k2uHr8ZOtjS5P6I hGu3k65fyscCLmEh/nThlUarRDVet1mxyjAbsOYd8wy78FwSNhn6P118Zkesu8+uNrPa JdJIMdhmbax0FJ3c25aQc446yp8UYebSy1MrKCvXRK+PxDhXwmMr/4EzEi1Fc8J9lo4m l9aI9mXrizVWpe7RZJR13D2YyrnBQ+Wra5d+J9oC6fcQ3e/JXhZAE0hanPyPfuQZLD2R L9rA== 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=ZL+EkeuDSYax4Njq8b+4tD79xCQ+GxkMgghLJlbiF4g=; b=Dz6mG4I5biBNZLMFhFDVBVrKqWCsMAO/L210W6BhU/dIw9qLx8YDiQrSC4cbb4AQLz 1vYsshojaxi5hB4wm7yg2VODllf1m1qFZ0k2DmrF3vovrrS2wtqJ4svEiderfwgjtbFt OTOM9JXsU54L7aEFsBZOW40CCmfnNvmhXhv9YNIiE7HfUEScZ5GDyg4tXTy5yejA72o5 +t/EtmNp7B1Rpzxsa5cdmnKocD87PcSu+G/pdeQZ0OFuGsS2pWTppDsPuMEvA76LH/eF mDoKoOikMd1Ot9MLnCDsDbglolfNZQfzUDgwRHMhQN+ff43miWpbZVy3NWX4QDvQUs6x pIwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uNB40QWU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 g21si2369640vsj.460.2021.10.08.05.38.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:38:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uNB40QWU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:38508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp93-000229-SK for patch@linaro.org; Fri, 08 Oct 2021 08:38:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYox5-00037Y-3u for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:16 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYox2-0006yQ-Ua for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:14 -0400 Received: by mail-wr1-x42b.google.com with SMTP id r7so29262970wrc.10 for ; Fri, 08 Oct 2021 05:26: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=ZL+EkeuDSYax4Njq8b+4tD79xCQ+GxkMgghLJlbiF4g=; b=uNB40QWUviZ9un/PQjGD58KgaT8rv43LpIP0sHDRRdfVeBY6ub1EWGD4krlAbv95+S oYl1rAr435e/QtCXTjhGudnlxBzGbRjNEMS6H7ZWpWDHkdrlS9mheONTJtWdzXV6q+wc IPrB+cX7zc2SFvG7Q7Du/W12yCFoKo4RPXS1JqrWVCDC4fgU57K5Y+aBDwhs3B/t+XhR MwGpQvAXUP02gj5/w3ORStfpQ4nm5qClsmnMi/HIcLSed+/9FlG0+xmugEs97eCIweRK DxZSxjWgxMpGZEheUw1AZDmFyPoC0kN4ZqBHoyt0768Ny2tq4KaVD3GaYIP82GUfnYFI o/Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZL+EkeuDSYax4Njq8b+4tD79xCQ+GxkMgghLJlbiF4g=; b=uWibTZuB4Nbv1y/sZ9hfXZwzWVmzK160zt49A5Ivx5lsiPLBZicXZLUKdi7EzOnbAl jo+/Jg5cCx7M45NfGwV2cozc/NM4MbOW0nhiuoues+SXQbgXeyucGzXjoP1k2yywOaIF XLqHCqqOOzfM8c+BEOq/SYx0VDxLhkYQ0Xs4Hr4IQGvv1m0JgDt6nD9V/Hf2fHljO2GZ n2tc2vExwi6VBuqCZKzlZTTRD80xSC+6SjpZGH6QekZ5dBEXA8mx53cMWJA4GcERfYvU lEr64NX+z93MhQa6d0HAkPSWLyZkmRdNXIwhPwNFpKjLP6MxudTDn3fFoP/nAHC7eEWV 5LUw== X-Gm-Message-State: AOAM531OK7ktYcGyjsvWIKWQWdv7SSrYVBzposGWDnSWQYCzyKCp6CIC 4CCFwL0gN+m/znyWXL4UPc6xng== X-Received: by 2002:a1c:4455:: with SMTP id r82mr3031702wma.100.1633695971386; Fri, 08 Oct 2021 05:26:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f18sm2363589wrg.3.2021.10.08.05.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EC15A1FFA6; Fri, 8 Oct 2021 13:25:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 10/12] accel/tcg: re-factor plugin_inject_cb so we can assert insn_idx is valid Date: Fri, 8 Oct 2021 13:25:54 +0100 Message-Id: <20211008122556.757252-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Coverity doesn't know enough about how we have arranged our plugin TCG ops to know we will always have incremented insn_idx before injecting the callback. Let us assert it for the benefit of Coverity and protect ourselves from accidentally breaking the assumption and triggering harder to grok errors deeper in the code if we attempt a negative indexed array lookup. However to get to this point we re-factor the code and remove the second hand instruction boundary detection in favour of scanning the full set of ops and using the existing INDEX_op_insn_start to cleanly detect when the instruction has started. As we no longer need the plugin specific list of ops we delete that. My initial benchmarks shows no discernible impact of dropping the plugin specific ops list. Fixes: Coverity 1459509 Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Peter Maydell Message-Id: <20210917162332.3511179-12-alex.bennee@linaro.org> -- 2.30.2 diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index ba13ab1151..9f398b9afe 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -493,9 +493,6 @@ typedef struct TCGOp { /* Next and previous opcodes. */ QTAILQ_ENTRY(TCGOp) link; -#ifdef CONFIG_PLUGIN - QSIMPLEQ_ENTRY(TCGOp) plugin_link; -#endif /* Arguments for the opcode. */ TCGArg args[MAX_OPC_PARAM]; @@ -605,9 +602,6 @@ struct TCGContext { /* descriptor of the instruction being translated */ struct qemu_plugin_insn *plugin_insn; - - /* list to quickly access the injected ops */ - QSIMPLEQ_HEAD(, TCGOp) plugin_ops; #endif GHashTable *const_table[TCG_TYPE_COUNT]; diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index f5fd5f279c..61be64b78c 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -162,11 +162,7 @@ static void gen_empty_mem_helper(void) static void gen_plugin_cb_start(enum plugin_gen_from from, enum plugin_gen_cb type, unsigned wr) { - TCGOp *op; - tcg_gen_plugin_cb_start(from, type, wr); - op = tcg_last_op(); - QSIMPLEQ_INSERT_TAIL(&tcg_ctx->plugin_ops, op, plugin_link); } static void gen_wrapped(enum plugin_gen_from from, @@ -706,62 +702,6 @@ static void plugin_gen_disable_mem_helper(const struct qemu_plugin_tb *ptb, inject_mem_disable_helper(insn, begin_op); } -static void plugin_inject_cb(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, - int insn_idx) -{ - enum plugin_gen_from from = begin_op->args[0]; - enum plugin_gen_cb type = begin_op->args[1]; - - switch (from) { - case PLUGIN_GEN_FROM_TB: - switch (type) { - case PLUGIN_GEN_CB_UDATA: - plugin_gen_tb_udata(ptb, begin_op); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_tb_inline(ptb, begin_op); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_FROM_INSN: - switch (type) { - case PLUGIN_GEN_CB_UDATA: - plugin_gen_insn_udata(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_insn_inline(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_ENABLE_MEM_HELPER: - plugin_gen_enable_mem_helper(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_FROM_MEM: - switch (type) { - case PLUGIN_GEN_CB_MEM: - plugin_gen_mem_regular(ptb, begin_op, insn_idx); - return; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_mem_inline(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - case PLUGIN_GEN_AFTER_INSN: - switch (type) { - case PLUGIN_GEN_DISABLE_MEM_HELPER: - plugin_gen_disable_mem_helper(ptb, begin_op, insn_idx); - return; - default: - g_assert_not_reached(); - } - default: - g_assert_not_reached(); - } -} - /* #define DEBUG_PLUGIN_GEN_OPS */ static void pr_ops(void) { @@ -819,21 +759,95 @@ static void pr_ops(void) static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) { TCGOp *op; - int insn_idx; + int insn_idx = -1; pr_ops(); - insn_idx = -1; - QSIMPLEQ_FOREACH(op, &tcg_ctx->plugin_ops, plugin_link) { - enum plugin_gen_from from = op->args[0]; - enum plugin_gen_cb type = op->args[1]; - - tcg_debug_assert(op->opc == INDEX_op_plugin_cb_start); - /* ENABLE_MEM_HELPER is the first callback of an instruction */ - if (from == PLUGIN_GEN_FROM_INSN && - type == PLUGIN_GEN_ENABLE_MEM_HELPER) { + + QTAILQ_FOREACH(op, &tcg_ctx->ops, link) { + switch (op->opc) { + case INDEX_op_insn_start: insn_idx++; + break; + case INDEX_op_plugin_cb_start: + { + enum plugin_gen_from from = op->args[0]; + enum plugin_gen_cb type = op->args[1]; + + switch (from) { + case PLUGIN_GEN_FROM_TB: + { + g_assert(insn_idx == -1); + + switch (type) { + case PLUGIN_GEN_CB_UDATA: + plugin_gen_tb_udata(plugin_tb, op); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_tb_inline(plugin_tb, op); + break; + default: + g_assert_not_reached(); + } + break; + } + case PLUGIN_GEN_FROM_INSN: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_CB_UDATA: + plugin_gen_insn_udata(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_insn_inline(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_ENABLE_MEM_HELPER: + plugin_gen_enable_mem_helper(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + break; + } + case PLUGIN_GEN_FROM_MEM: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_CB_MEM: + plugin_gen_mem_regular(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_CB_INLINE: + plugin_gen_mem_inline(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + + break; + } + case PLUGIN_GEN_AFTER_INSN: + { + g_assert(insn_idx >= 0); + + switch (type) { + case PLUGIN_GEN_DISABLE_MEM_HELPER: + plugin_gen_disable_mem_helper(plugin_tb, op, insn_idx); + break; + default: + g_assert_not_reached(); + } + break; + } + default: + g_assert_not_reached(); + } + break; + } + default: + /* plugins don't care about any other ops */ + break; } - plugin_inject_cb(plugin_tb, op, insn_idx); } pr_ops(); } @@ -846,7 +860,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_onl if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { ret = true; - QSIMPLEQ_INIT(&tcg_ctx->plugin_ops); ptb->vaddr = tb->pc; ptb->vaddr2 = -1; get_page_addr_code_hostp(cpu->env_ptr, tb->pc, &ptb->haddr1); From patchwork Fri Oct 8 12:25: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: 515573 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2870881wrs; Fri, 8 Oct 2021 05:38:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZT57+zB/JdRjsZkLWmPVOJAvdEnJjFg0K1OF2/N2qnX8tJm3RoaDVjlRTigTk5e99Kels X-Received: by 2002:a1f:1283:: with SMTP id 125mr9030165vks.2.1633696718938; Fri, 08 Oct 2021 05:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696718; cv=none; d=google.com; s=arc-20160816; b=Tsnz4snd6YjvSna8n9N88xFP6wwM2fUhfUpc0bp5sDz6PVg9PCNXkcKNDhV/dC841l ZpXv7VqBrXNdQ1b6VZb0nghDFGceS7SWIk8atgTXHi3WGB3ntFimOz1C7x7eh14myK7u +QZR8O2xrRukIFonATByW/sYVJks/ynPYphwihcyZ/k2YGjkDcg6fMvwD8tQHasQv3WU l5ZA2K9Vu9g1RRlAKOy4UdjI3ExozjVRqBcpHRolCl+bTbUc4NqXZ0CoAWE5cC7Sj9UR 8JkHmWN/pizkr2gtLtptO3G3J1fwMlirKe/lUbW+fqss/pNGVpMLRcp4P7Rvac4hiMOo 7IVg== 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=uCqSveEjhHk9BnAZ8LogSOQHlGWbu7ehSdKzjcVgaFA=; b=xuSbkXyvehc1iuHiS32BipnBmzbDqxlOrFCyI7fviaE1Bn6r6x2AvsqgmEjUdJX7Zp CLdn/MN01p+Is3Np6BsJ87cX7WXwjH++koS1YdGT/NjGuzk1W+oUpDvgM6FbW4RzthIi 3PfLde+9GnWwZ8OkV1+Av1SiOqePd2D7/LFKiQUM0FK+vTiOCVwtcti19jSVykwFahFb BiH5HmTh/9m2Wg8vBk9WOYFGoR/YGeUUneV7SsBsoz/KfwCQY9rzEnf3dgaqEw903FZY qvN/w30+rYwbbuRZl/Bh1XgZ5AdJLDh2LbI9Zg2OYBASBcs3lK7zqasXXCLROlag+LAH 7FDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uDOC6c8B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 p4si2251389vsf.448.2021.10.08.05.38.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:38:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uDOC6c8B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:38482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYp94-00021Q-AN for patch@linaro.org; Fri, 08 Oct 2021 08:38:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYoxA-00039a-RS for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:21 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYox4-00070I-T4 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:19 -0400 Received: by mail-wr1-x430.google.com with SMTP id o20so29231075wro.3 for ; Fri, 08 Oct 2021 05:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uCqSveEjhHk9BnAZ8LogSOQHlGWbu7ehSdKzjcVgaFA=; b=uDOC6c8BozHYJU21RbDMttFOUa9OwitawpN54hbPkeF2f4iinMZO9HOk0pUEHIXY6i WCJZ+rh3jJpocAjmksTaf8uy5WGJ2yoKbpnFgWZmudoZQyKRCjkZ4WOeLWfAz+9B3oJJ bt+VOJvIOBcnaqJBcJjsq02QcAhIfvG9HiNZ9mZXnyGVj9LgUzDUpILEMmVGn5iOckeG KHuCHkyhlxKKuxUXZAs1UhZ3uIMxKFOHa5ryDIzBPYWvbCu7RlccOGvtD209sd2BigEN GUr0HATNPC4d5GucBNmFrhJgB3yg7AKQDwGzsLBv2AUOmDrhL4EtWkEkVCQWPGGDiQ8z d98g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uCqSveEjhHk9BnAZ8LogSOQHlGWbu7ehSdKzjcVgaFA=; b=N87EH5NMAEblBsH8su6qsKhE3R2tjdeFEbBOdEnsyIpkGrnZY2Pz2WHQNXNhOVPaGS yRF0T8vq4ZoLbAzM0m98K/z0SlY2+/eBzSvO5hxVPdwBP5Av4bBobmuAo8ByCw8R1dkB b2u1GHJf7/dYfdiRuhJxquNj6czyXAkQ1nk+AYAWKx5pw7gz1JLnrDd8yekQrg6zDmJq dx8sfXYKB4hhgL9uf1HnKGSRaaqpwpb4UEcDIJ6p5FHQ8PccS4b4vsCRjqDAr0p3rXfm skcD2TX1cfV2IOGnzupyDHHhkwcdw5R8kBJ1Jj4CjrUIAsgfvfqQYsZRZ7PitVjpEjtV ZgXA== X-Gm-Message-State: AOAM533CzqdZORTVPcVAcsCUAqwZ1s/YkiU8uM60PrmQBrEqm6CBiKKx AxRxHMTypaOQmTxEIhCX7yYoWA== X-Received: by 2002:adf:d1eb:: with SMTP id g11mr3666154wrd.16.1633695973403; Fri, 08 Oct 2021 05:26:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l17sm2272787wrx.24.2021.10.08.05.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0FB551FFA9; Fri, 8 Oct 2021 13:25:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 11/12] .github: move repo lockdown to the v2 configuration Date: Fri, 8 Oct 2021 13:25:55 +0100 Message-Id: <20211008122556.757252-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-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: Willian Rampazzo , peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I was getting prompted by GitHub for new permissions but it turns out per https://github.com/dessant/repo-lockdown/issues/6: Repo Lockdown has been rewritten for GitHub Actions, offering new features and better control over your automation presets. The legacy GitHub App has been deprecated, and the public instance of the app has been shut down. So this is what I've done. As the issues tab is disabled I've removed the handling for issues from the new version. Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20211004154308.2114870-1-alex.bennee@linaro.org> -- 2.30.2 diff --git a/.github/lockdown.yml b/.github/lockdown.yml deleted file mode 100644 index d3546bd2bc..0000000000 --- a/.github/lockdown.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown - -# Close issues and pull requests -close: true - -# Lock issues and pull requests -lock: true - -issues: - comment: | - Thank you for your interest in the QEMU project. - - This repository is a read-only mirror of the project's repostories hosted - at https://gitlab.com/qemu-project/qemu.git. - The project does not process issues filed on GitHub. - - The project issues are tracked on GitLab: - https://gitlab.com/qemu-project/qemu/-/issues - - QEMU welcomes bug report contributions. You can file new ones on: - https://gitlab.com/qemu-project/qemu/-/issues/new - -pulls: - comment: | - Thank you for your interest in the QEMU project. - - This repository is a read-only mirror of the project's repostories hosted - on https://gitlab.com/qemu-project/qemu.git. - The project does not process merge requests filed on GitHub. - - QEMU welcomes contributions of code (either fixing bugs or adding new - functionality). However, we get a lot of patches, and so we have some - guidelines about contributing on the project website: - https://www.qemu.org/contribute/ diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml new file mode 100644 index 0000000000..ad8b8f7e30 --- /dev/null +++ b/.github/workflows/lockdown.yml @@ -0,0 +1,30 @@ +# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown + +name: 'Repo Lockdown' + +on: + pull_request_target: + types: opened + +permissions: + pull-requests: write + +jobs: + action: + runs-on: ubuntu-latest + steps: + - uses: dessant/repo-lockdown@v2 + with: + pull-comment: | + Thank you for your interest in the QEMU project. + + This repository is a read-only mirror of the project's repostories hosted + on https://gitlab.com/qemu-project/qemu.git. + The project does not process merge requests filed on GitHub. + + QEMU welcomes contributions of code (either fixing bugs or adding new + functionality). However, we get a lot of patches, and so we have some + guidelines about contributing on the project website: + https://www.qemu.org/contribute/ + lock-pull: true + close-pull: true From patchwork Fri Oct 8 12:25: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: 515574 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp2873046wrs; Fri, 8 Oct 2021 05:41:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9Rt4yHg/l5LRWbKo8qTBXfVKoGc9HZ/dPGC/ST1XUz0XWSwBCg9cnDsg4Ycc9wrjN7EsD X-Received: by 2002:a1f:5e84:: with SMTP id s126mr9055118vkb.7.1633696870271; Fri, 08 Oct 2021 05:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633696870; cv=none; d=google.com; s=arc-20160816; b=lpNHF5CIdSFcSCYM7SRh6w24PffxfMmtkNzW8mtovf9uCH/Ump5ed7+DV9xhrskUWK /dWWdw7FC85TqMI5UR0uuaR3NrVYWr8wcPvS5Bgb0YzMYgAz8uzF5oXhA/SLRD0IXbff hSVoKrpKuZBTRTajxuF+QMq08Qo5qQy44FjGvGNDDFNXvd66CuXwn/jiZ1/FV5qV9Q6y aBFwtTXovzpICvYe5WNpeVv2lbNZYdQW4QnvHibNiIDHIugWhZbArX/R1hjnKoQ8qaZU qlVU9UkWP/sZ/1IgpzBDxdeiCFtqOYCLewUWe2ShRVRBGbndJUuANdJIe70EkBsbxiBn ypQg== 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=F6Md3DXGhaogoIPC2KfJR0RFUjtrXYLoKKIxGJdWSbA=; b=xd4nvExK7lhsLnURkOZLPOcsJ6nWXylADL9CkzRkrKafDGA0uGHMD7wwYWFavV1IqU 7mfe1h/GXsmslJnpcEgCmSDqls5D7TdueIb2No2iCX2SRWsD3eu68hEN25ifcnvJoxhD YigYIRLlVoU9rLBo4xkjXlm7oD1eb3TUzY8yDq9h4KnOkgRXGXzxND9pxqCRKi3wmOLC rmbwCu1Uq4ex1NntNjuxCF/oWLTGajApbM0N5fx2wvUR34iEl5eoeXroMIRMeFITTbmG UBr4xiq0l2oLFHVDbulqx4UMhufT+k1UOc0ntYIChP2r6T56eTvwv8xObGsKq/ppblhc xzRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VYpbx2A7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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 d11si2121689vsk.428.2021.10.08.05.41.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Oct 2021 05:41: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=VYpbx2A7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as 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]:43014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYpBV-00057h-Gi for patch@linaro.org; Fri, 08 Oct 2021 08:41:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYoxC-00039t-Q1 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:44982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYox9-00070a-6l for qemu-devel@nongnu.org; Fri, 08 Oct 2021 08:26:22 -0400 Received: by mail-wr1-x436.google.com with SMTP id s15so29383072wrv.11 for ; Fri, 08 Oct 2021 05:26: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=F6Md3DXGhaogoIPC2KfJR0RFUjtrXYLoKKIxGJdWSbA=; b=VYpbx2A7aV7Wp3oBifjKjvEFTyKwcMA6bNaVFq4nNKaR0pz+jlVCCofwYWYx1iewhK ZbKkE2BQqb2+q0QBcZ0ZLAZC6yRz4xin0DOCsDvJ/6Ep4uk8mCdiSSUkAYD89m2YpquP 4IrYvZOIvjvdfgBvszRY9GESqbL6zFY2OBcbXB+lYMWEk1/4U/jvSljWQ0EFu1kVbErV vvPeqCMYnmIMQ2I/TzXsRGOLMfNq/h87lBolnVDVXbydIUkA7Kmd0ZqjC8+zf1jdihnN vtOlut7bkPDTT9ceVuwrS5Mwr+79Sn6eQZiAXMpAArLIemQTgEwslAJdl/H+NbGfagKo BG3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F6Md3DXGhaogoIPC2KfJR0RFUjtrXYLoKKIxGJdWSbA=; b=Tom6NyaiOFeoBK7dPQ1F67GeWfy9gcL2TZ+K9LeIvDUXard4y7ZfdDPjx9NJX1Nn7U maXr9qJ8AWvtUzX1nC0wNFsnkBd3OAEegQ5wUwDj4OFAesU/mAo/RLO7VGOrVvBMNYeR quo/4kVRur6AHfz9O2AtKMzNasmGFz5TVKTFIy21zoGnS3050EmDk0vNJL/nUv4VHJmT 69At0Gu6YN3G8tZ+bAjJ7GIfRHmODybhJejMepgy5KDP8FTB5e2qMuKe+B6iWlYzUnw7 o7AHILPvw9Ql6+4y/JJR0easiZlPObSSbX9ildLSbTQ84vYgL1XcZI5AkUcQRaa4Oj9E eJvQ== X-Gm-Message-State: AOAM533NJYf0UXNDj30HRtmRVT6ypyBBVDWCH/tYz5westvDa3joR2hR wPAbgUomFQ6SJsDozzJlxBdLow== X-Received: by 2002:adf:fe8a:: with SMTP id l10mr3703466wrr.434.1633695974178; Fri, 08 Oct 2021 05:26:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w26sm2199473wmk.34.2021.10.08.05.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 05:26:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F9741FFAA; Fri, 8 Oct 2021 13:25:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Subject: [PULL 12/12] tests/docker: add a debian-native image and make available Date: Fri, 8 Oct 2021 13:25:56 +0100 Message-Id: <20211008122556.757252-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008122556.757252-1-alex.bennee@linaro.org> References: <20211008122556.757252-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , Anders Roxell , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This image is intended for building whatever the native versions of QEMU are for the host architecture. This will hopefully be an aid for 3rd parties who want to be able to build QEMU themselves without redoing all the dependencies themselves. We disable the registry because we currently don't have multi-arch support there. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Tested-by: Anders Roxell Acked-by: Willian Rampazzo Message-Id: <20210922151528.2192966-1-alex.bennee@linaro.org> -- 2.30.2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 450c76a3ca..b9d4094c2e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -145,6 +145,10 @@ docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 +# The native build should never use the registry +docker-image-debian-native: DOCKER_REGISTRY= + + # # The build rule for hexagon-cross is special in so far for most of # the time we don't want to build it. While dockers caching does avoid diff --git a/tests/docker/common.rc b/tests/docker/common.rc index c5cc33d366..e6f8cee0d6 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -12,8 +12,14 @@ # the top-level directory. # This might be set by ENV of a docker container... it is always -# overriden by TARGET_LIST if the user sets it. -DEF_TARGET_LIST=${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"} +# overriden by TARGET_LIST if the user sets it. We special case +# "none" to allow for other options like --disable-tcg to restrict the +# builds we eventually do. +if test "$DEF_TARGET_LIST" = "none"; then + DEF_TARGET_LIST="" +else + DEF_TARGET_LIST=${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"} +fi requires_binary() { diff --git a/tests/docker/dockerfiles/debian-native.docker b/tests/docker/dockerfiles/debian-native.docker new file mode 100644 index 0000000000..efd55cb6e0 --- /dev/null +++ b/tests/docker/dockerfiles/debian-native.docker @@ -0,0 +1,49 @@ +# +# Docker Debian Native +# +# This this intended to build QEMU on native host systems. Debian is +# chosen due to the broadest range on supported host systems for QEMU. +# +# This docker target is based on the docker.io Debian Bullseye base +# image rather than QEMU's base because we would otherwise confuse the +# build grabbing stuff from the registry built for other +# architectures. +# +FROM docker.io/library/debian:bullseye-slim +MAINTAINER Alex Bennée + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +# Install common build utilities +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy --arch-only qemu + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + cscope \ + genisoimage \ + exuberant-ctags \ + global \ + libbz2-dev \ + liblzo2-dev \ + libgcrypt20-dev \ + libfdt-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsnappy-dev \ + libvte-dev \ + netcat-openbsd \ + ninja-build \ + openssh-client \ + python3-numpy \ + python3-opencv \ + python3-venv + +ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS +ENV DEF_TARGET_LIST "none"