From patchwork Tue Oct 27 09:59:31 2020 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: 301899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA1CCC388F9 for ; Tue, 27 Oct 2020 10:00:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3EBF82225C for ; Tue, 27 Oct 2020 10:00:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RL0eVP4g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EBF82225C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLmf-0008E7-4e for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLlZ-0006eV-0p for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:45 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34956) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLlX-0000OJ-4J for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:44 -0400 Received: by mail-wr1-x434.google.com with SMTP id n15so1174683wrq.2 for ; Tue, 27 Oct 2020 02:59:42 -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=34R6NI0WK0Vxw1MqeYCeWgrDTVopx//TkoJDjYqCmug=; b=RL0eVP4glzR6e3kTiU9PPSr3dDmKWpvYQbEJARcWksjxbtDHytl/mcvWOLeIvwUM4M yS8LWGjXvUjk2uMyTa13ECeUosiTDWYdN3Z7v8cce8KMFELdoThujyPqMZfJQkYtpLXj 1tscs3NJwB0Sn8OfvBYFkfzT+8eL7nwv0HbC3tAHW21SQMPpIpTdJ9UqpORWNkg5efHv AK89Ew2mdSSm3Gc5F+gZAIWcpy2waZ7UKJfzKMc7cDopG2DyBHuqBk7YIFrSl/cEoRXw l/QZ6QfYMXWEG9SomH90KgUzsNXfa2T2wGrNjLwX2VP9wU/iGCQOUJ0carJbuvdjJ1Ju 4pzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=34R6NI0WK0Vxw1MqeYCeWgrDTVopx//TkoJDjYqCmug=; b=t1laXg587W1k9OoAki8jVyfG9aG3wVnDq9SKzWz2vkZ853UmIRJWl8jgqdNxhxB7dR Nu/BxPy2ySBE+EVfEJc0ax6xgkX+L2nxNaOCd01wT/+e0dGksRwTxWqpThYn2WYD2Nj5 da27xxQQXnOlwwPUQXyu2SrtvFKI+QnTfZs8vTeM2+xMuOn3r4LtfrmIL1cIA3ylSIlv HR/TPTylAukcGTz+ICzdn8T1aMA6fkEAMIZDlLr81N2Bvj5C97rx2Nbj+RNq6eE/gW0f 6CYmtwCX8/jsbxFt3pMH2vPxFhOBRJU8X3rjfuP9wZZXpyhRUhojhgFhZ4fR2Zi2Ts1b ZpSQ== X-Gm-Message-State: AOAM530+Oq3puUVesQmEKFAF8INz8IT5wmWVU6n2wPeMIVC2LuLsyfCd lXf1ANxhw+CS+AO6ZD2MfHGTvQ== X-Google-Smtp-Source: ABdhPJxTLwBw4nZx5uziwyvxxZEmUgMPv2O6QIgSeg22Q/hADGEHxw6+5/UrC0WbRQBMdkUpxNET5g== X-Received: by 2002:a5d:6605:: with SMTP id n5mr1810249wru.355.1603792781622; Tue, 27 Oct 2020 02:59:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f139sm1338136wme.47.2020.10.27.02.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D185E1FF87; Tue, 27 Oct 2020 09:59:38 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/8] Adding ani's email as an individual contributor Date: Tue, 27 Oct 2020 09:59:31 +0000 Message-Id: <20201027095938.28673-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Ani Sinha , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Ani Sinha Ani is an individual contributor into qemu project. Adding my email into the correct file to reflect so. Signed-off-by: Ani Sinha Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201007161940.1478-1-ani@anisinha.ca> Message-Id: <20201021163136.27324-2-alex.bennee@linaro.org> diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index 641169fa63..d135f4b143 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -23,3 +23,4 @@ vr_qemu@t-online.de nieklinnenbank@gmail.com devnexen@gmail.com pauldzim@gmail.com +ani@anisinha.ca From patchwork Tue Oct 27 09:59:32 2020 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: 311687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B05FC4363A for ; Tue, 27 Oct 2020 10:02:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B09A206E5 for ; Tue, 27 Oct 2020 10:02:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QmF0CU0V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B09A206E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLoN-0001BJ-EC for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:02:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLlb-0006eq-9D for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:47 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLlZ-0000Ov-Lt for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:46 -0400 Received: by mail-wm1-x336.google.com with SMTP id k18so765632wmj.5 for ; Tue, 27 Oct 2020 02:59:45 -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=uajyyIUVuN5H5ZPpAguAQpdeNr13la0Sl37siT1QEAg=; b=QmF0CU0V/97XMLAKay7Yuw+7o82DhB3wbVbIySUUfat/ll/kXlbP85bf1BxqWJvw3J DvTBoJ/qH7RtbzWeRK849S0JSmPKgBCCoPg7cft2JBZgZeTmIDEtdS/BPM6r7iQkVknI j8PR82hGbx/cvoat7UK27IRiq/dsNBEXXjjIeRXdfXFMSvNIyT19IUxIobeT+q13pbPn kuWsvVyoA3Y4D9bUyYlPQKSomdcxPzftMCvpCQpBIpUwx2Lu620hn6lE9p7YI7biEOGM YRpviBd923UACim/wUm32d7NIlv1At0VNlL02Ez8BL4FPPDaRnYU15BQ5ZN1PTNBAYpI GJow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uajyyIUVuN5H5ZPpAguAQpdeNr13la0Sl37siT1QEAg=; b=WrY60khXA+rXSw5wgjGm9E+080CEycJXz8I7saGPU1IC2cCXWLehSl40YZqYFSN/Bb h2ACKb0AXVDu/N+pXekUjJT/GG5SSx8nMUoyzEmEyJfNdZlNWK20psY57lII/kZLFtwd wR+Iu/eEF/JEggZKRQQVCv76FV0FGSZblZ/OxPFgtPlOxukYOSafZpA4C3CaaU05xdtb nGCVhTKKcSmXBheD5lAswDR2No6YNCWvbmp7yJ7Cg0VYCwLN34SGk3+lRSyjdSMTX7FF 9CuABid28Uivt3ZWoEFkCa76Vi49K0ajudI0bOn077I0604Kyc12HfxD7aFWtww7mLk5 LwTQ== X-Gm-Message-State: AOAM531XBHlGkyQiSzvdis4Hdopvn5RYnsW2rbE8IKY3/EQeOm+NRiDV IBp+CGY/R/ChSJI5sFFVvkiHWA== X-Google-Smtp-Source: ABdhPJzz0A2FQuZorRLMbvz8dWFTag0A6r56oP1p8e2zje8LwsSpahint7HnNImSikoSOXDQYrRC/Q== X-Received: by 2002:a1c:8145:: with SMTP id c66mr1761626wmd.75.1603792783715; Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s12sm195039wmc.6.2020.10.27.02.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E85AA1FF8C; Tue, 27 Oct 2020 09:59:38 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/8] contrib/gitdm: Add more individual contributors Date: Tue, 27 Oct 2020 09:59:32 +0000 Message-Id: <20201027095938.28673-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , James Hogan , qemu-devel@nongnu.org, Subbaraya Sundeep , Michael Rolnik , =?utf-8?q?Alex_Benn=C3=A9e?= , Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Subbaraya Sundeep Acked-by: Michael Rolnik Acked-by: Thomas Huth Acked-by: James Hogan Acked-by: Artyom Tarasenko Message-id: <20201004182506.2038515-1-f4bug@amsat.org> Message-Id: <20201021163136.27324-3-alex.bennee@linaro.org> diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index d135f4b143..36bbb77c39 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -24,3 +24,8 @@ nieklinnenbank@gmail.com devnexen@gmail.com pauldzim@gmail.com ani@anisinha.ca +sundeep.lkml@gmail.com +mrolnik@gmail.com +huth@tuxfamily.org +jhogan@kernel.org +atar4qemu@gmail.com From patchwork Tue Oct 27 09:59:33 2020 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: 311686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED870C4363A for ; Tue, 27 Oct 2020 10:04:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A36021D24 for ; Tue, 27 Oct 2020 10:04:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KHIvbtMI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A36021D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLqR-0003Vr-F6 for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:04:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLlc-0006hZ-I8 for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:48 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:34281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLla-0000Pr-DM for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id k21so701901wmi.1 for ; Tue, 27 Oct 2020 02:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ji1OK2cw4qK0q2shMLk3KuQWB+2Gvmzz4g4Bk/4luuQ=; b=KHIvbtMI1hr1+sN4NyTAjjCpR02d1leMyhwPlTt+DIjN5UF379AzAJwTCl42jQ4BEw yihZ9k/lmSlgWZdfbOseHo18ytsN2NF5AqpIPpyUA9XkxlwBYBDvX/0dapaiZ3q/Ji4s wFlRj3U/K6zQ18L/dQQbGib/s+n5Wzf66xo20k+viw4p3bMYlHA/sdHKtL/89pdPU6R4 khI9JJ3Gc5qD/dw6mPM6q+duTTnd95h2B11mXImc/DFKDBCbbjPyQiXcRIYDX8Z86oZK ZgfI+xognV3mdWERsWy9OFDHcgdrcRo29ya+7CSfEI1DxqPT/0RVSHSvQF4IkFJfFb7S nGJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ji1OK2cw4qK0q2shMLk3KuQWB+2Gvmzz4g4Bk/4luuQ=; b=do5VFyXyGfAuw85K7rkrK6e11ZhuewJlerIJHi4lANdx3GNcDbRVi8PlgI+d5Vuyij qFCjTrbC0R7OReJ+jqJbV7jE9a1sQrv5a2kM6kYlAikwOenpx/N7xK6eJSZA0MYBgPg/ AsXoJEHjQXNxckKK34hf07voySmm624gsE8/8iFYEx7myzD/G+rmL79NukiaRG5klctT uyynVKjawGNIhoL9k10AUQRB4JjTZI1db2nPrEb6m/1gV4WjuPzR5v3eQmdebPkAUKGe gU/g4M3JMDVNN4HAsmVoFlfiUW916YyjCPjY5MEpt1f4XS15BLzlN1vM2+hpjTeSkWVN mHfg== X-Gm-Message-State: AOAM5338rcdeWaH4aIp+ki5s3K7c9G6GlHMoZMFFk6vdqcZMKrbbpDKS 0oLDuCQF8NykQGW7JTQIeAAcdORnQ/LXBg== X-Google-Smtp-Source: ABdhPJxJftfX1EH2LsCMs9FxM5+3N0g6O9j7Jz6anibj+hIawlTKVln12G85bfNelD4pnURJQhPyIg== X-Received: by 2002:a1c:7e82:: with SMTP id z124mr1792545wmc.8.1603792785128; Tue, 27 Oct 2020 02:59:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e20sm1268247wme.35.2020.10.27.02.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C4AC1FF8F; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 Date: Tue, 27 Oct 2020 09:59:33 +0000 Message-Id: <20201027095938.28673-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We do not support SDL1 in QEMU anymore. Use SDL2 instead. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201021072308.9224-1-thuth@redhat.com> Message-Id: <20201021163136.27324-4-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 8b273725ee..6f11af1989 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index a589142114..54bc6d54cd 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -2,7 +2,7 @@ FROM centos:8.1.1911 RUN dnf -y update ENV PACKAGES \ - SDL-devel \ + SDL2-devel \ bzip2 \ bzip2-devel \ dbus-daemon \ From patchwork Tue Oct 27 09:59:34 2020 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: 311685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD88FC4363A for ; Tue, 27 Oct 2020 10:05:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5872621D24 for ; Tue, 27 Oct 2020 10:05:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zYUd285e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5872621D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLrL-0004cI-AB for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLlc-0006iL-SC for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:48 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLlb-0000Px-3z for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:48 -0400 Received: by mail-wr1-x42c.google.com with SMTP id y12so1151794wrp.6 for ; Tue, 27 Oct 2020 02:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ri9ZPbou4O80XpPc4WvyYHSH7gy/FoC28327DlYeuec=; b=zYUd285elqVuf73XY/0ewPWK+rlda7UFTaZITM71ZPSRtQIws1m48QD4fsgSQgIDVa SDVsnGXK6gTx/SR6EorAAeAFrQ6zcZbwnxgL0/i/hSMgSQ6tQoBhp7hZFeESLgTMeDYf o1mxMK0KqiqkzvDF+I1q1MyGFz2Va2mhJ4TW6LyU8EnLArbb5NJwq2BY/YnWuX60Rzln 3//J7tEGaHvVe5YO026GuyNU9+QfIOw8Drk0+nVhaBr/V0RE7zcTgjXWCe9YLryvyMoT //+Uyf1RT6NGIt8ugmZVm1vnDfwe8apk60zqUtXK9xxHEcGBUFR8AxCEoRhg36UjFZWf Koxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ri9ZPbou4O80XpPc4WvyYHSH7gy/FoC28327DlYeuec=; b=ev5mLkhB8L94QYGoeguER/MbogUa5BOluzb5qOurFU9YeZNXwhEL/Iym6fkoYR6exR paDX/OfjnUg+qwWt88t0wm6purZpWhSBmToK/xtu/DslmYQxP0WjDkmCVp/Q8/OhNgfv e7lOR8tRZpdOiedWLaHQH141qAI9w8BfsizLnyFiIO+U4yxjOyF4j2knu1X3nayLwMLN 01p2DsyIfWmyFoIKWwKqAdRynwJvSoCq8Dp136odnwb4l6N/ntW84MetDqqgmIM43f5n yXXq5WDSYhvJqfc4AELJqG7U9ZPxYoVSHlg84D0IhMgwNqkK4DHuVoPKn1pxj3dynRzX Ugbg== X-Gm-Message-State: AOAM531uPCuNcZaKOkOGyY9+oNXGyHZYydSR/GQlC4Ti3v094vz6MszL XPSXtKxY+LHOKebcsBohICdFLLzy1T3ARw== X-Google-Smtp-Source: ABdhPJzQSyGgq/6uEkOnFKix+fxaKCxELewlTQ4ZZBmUkuuNSrFknz0lDnZMGvzS7Q6Rr7csf6Z7Eg== X-Received: by 2002:adf:bc13:: with SMTP id s19mr1901073wrg.338.1603792785826; Tue, 27 Oct 2020 02:59:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm1368226wru.15.2020.10.27.02.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 241861FF90; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch Date: Tue, 27 Oct 2020 09:59:34 +0000 Message-Id: <20201027095938.28673-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé If the current branch is synced to the current upstream git master, there are no commits that need checking. This causes checkpatch.pl to print an error that it found no commits. We need to avoid calling checkpatch.pl in this case. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth Message-Id: <20201019143537.283094-2-berrange@redhat.com> Message-Id: <20201021163136.27324-5-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py index 5a14a25b13..0ff30ee077 100755 --- a/.gitlab-ci.d/check-patch.py +++ b/.gitlab-ci.d/check-patch.py @@ -33,8 +33,16 @@ ancestor = subprocess.check_output(["git", "merge-base", ancestor = ancestor.strip() +log = subprocess.check_output(["git", "log", "--format=%H %s", + ancestor + "..."], + universal_newlines=True) + subprocess.check_call(["git", "remote", "rm", "check-patch"]) +if log == "": + print("\nNo commits since %s, skipping checks\n" % ancestor) + sys.exit(0) + errors = False print("\nChecking all commits since %s...\n" % ancestor) From patchwork Tue Oct 27 09:59:35 2020 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: 301898 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2700C4363A for ; Tue, 27 Oct 2020 10:01:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F0B822281 for ; Tue, 27 Oct 2020 10:01:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ct7+2tBs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F0B822281 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLnJ-00006I-Tl for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:01:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLle-0006mG-MK for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:50 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLld-0000Qd-07 for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:50 -0400 Received: by mail-wr1-x42f.google.com with SMTP id y12so1151878wrp.6 for ; Tue, 27 Oct 2020 02:59:48 -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=pFYczLPUBSOWDoLgSQqU1D7iJ2Ux4Pk/W6bbBdNtUg4=; b=Ct7+2tBsgww9pDeT6nxCVMSbr128ISULjfNKKzxUk610GQdV7X7/sBX7mNRrbcyBWP OFxgEmcmS5MiDc3GjYk7HoBc2556IS3UYeRu6iBpHvaV1VPSHigrHkYj5WEbQ/yljFia dKJzt3Ks/yZZkXN04in3VMzHpZXkbyQwtPRC4VuvgjU2wBcSWijjRHbVyy6p95TYWx7j lkWGtCN1ezqylEHwJCWtrcb0jPNvDm8EasgwGqqY55DESvc44U//kAioao/xdE4pxuB3 wYfm12GA2ODURgBOVPurv0nnlidNBoDV2/d8+oV8GSZQC8HAU03dx3Pwbj7BBXteuJin Xq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pFYczLPUBSOWDoLgSQqU1D7iJ2Ux4Pk/W6bbBdNtUg4=; b=DEzdqH8uufnKdwU2s1zCEL9jsX9+DYNG/KASjvm6ldu5Oq/vt6tdoH126GXGoxgQru K/4Vt53PltbFJi6f049V2XIhGpz7ITo17waOuWnXC/uGjDuF2HU+eVDxAjIZEcXPbb14 4Kxbr1hETstUHNI0A02AeMJCDb3BBK7kw6hVG+NWH0mkN4QpbrePzgjwXpSzoccBtwyo hMfFuLFv8PexEFDKNb1hz1DQiCK4V1Pc8BLFxYpiB2b62gRTIP9lyzpJab3ghN8KdLrS 3JKSTyL8NEv3i/j2ui7AqIRZNPyZ8kkEH3jn7u/OVPgT1fvzpkN7748xewB2NYlYkIlH uFWg== X-Gm-Message-State: AOAM531YpD8BMznE60BSL7VdFYuWDyF3+cqSOtJtZ2O9Yl27fUrTwgd5 V7ZVpaW0BiJfhK72VfMrcAbVt04mUqxnlQ== X-Google-Smtp-Source: ABdhPJxsvH8adRARaW2rUJDpqL5rTOOQPdh2huG8s+Q2IBnCneiVl6jzr6Ca63sNH/OspTfPGu7bzw== X-Received: by 2002:adf:e444:: with SMTP id t4mr1981223wrm.58.1603792787571; Tue, 27 Oct 2020 02:59:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i14sm1312564wml.24.2020.10.27.02.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3A0A31FF91; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found Date: Tue, 27 Oct 2020 09:59:35 +0000 Message-Id: <20201027095938.28673-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé The error message was supposed to mention the input revision list start point, not the branch flag. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20201019143537.283094-3-berrange@redhat.com> Message-Id: <20201021163136.27324-6-alex.bennee@linaro.org> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 6ed34970f9..88c858f67c 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -392,7 +392,7 @@ if ($chk_branch) { close $HASH; - die "$P: no revisions returned for revlist '$chk_branch'\n" + die "$P: no revisions returned for revlist '$ARGV[0]'\n" unless @patches; my $i = 1; From patchwork Tue Oct 27 09:59:36 2020 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: 301896 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5072EC4363A for ; Tue, 27 Oct 2020 10:04:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D177022281 for ; Tue, 27 Oct 2020 10:04:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DHk2RCuj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D177022281 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLqU-0003c5-NJ for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:04:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLlg-0006qB-Jf for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:52 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40453) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLle-0000RD-Me for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:52 -0400 Received: by mail-wm1-x336.google.com with SMTP id k18so765925wmj.5 for ; Tue, 27 Oct 2020 02:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lQMst0vXtb4Gg0mYZJn8zq4jVmArpnP9j0CDdQR53Fo=; b=DHk2RCujppzlQ7+fcFFxRrGca+ff9nXNQeeQl3B7PwBG+2NLPV1DNLu+XIPo/AAjiX TvX2dsBxOcG4TbBwLFknXXYCbpTEVAUgp8uUdf1Yrz2LDbkIQFm2cxt5ZgAaphsJYmG7 OZyybFNsNLV2Yx5MPGjQVxbmWw5zbn7kN3KH4MjTMdR+tFKsR0asZpQWBmGAKBFbxfoA 44o3KIKFyF2664ojEmzZ308b5BVwj0E1Bfu3DHBiPxBtrGrHzkyqS+fuQZD54zTek6O3 YvjLr9+kQqBWHsef0myuwBklGAu3/v2CN88CPf1/XCtnxNv0EU93GETET0rdTXPw/Vgd XG8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lQMst0vXtb4Gg0mYZJn8zq4jVmArpnP9j0CDdQR53Fo=; b=Q2F9kHHjvZrj8ylmMIlzRHKk51DhoBeJkSKnEMJ6tFPZSIXcESPrlQkZE/DJw0qk0H PYpV4GBIvur103hgiK12dCpFcqYoPwmk6nItD7NwywDFUzenQrsiSO3obVAkYhKq2BJo aSekXt5Lw3E/8g5iGKqpNJ2TxfC1/DqYvjw8Y+GYF8KlGv6cH/YZf8czfCZnl+LeqZ1a emRG3POD74yaQEdrU90IbbpetuCSukFFPVwhrnRiLpMbwyv9+tg3kKbPIgTjQw0sE6x6 l/7+5a4oyfB9NoGGjcOuCPr/UoxV11m/ldTOYrKU7l8WSOHpP9uYDwOc3udTee3jyW/3 N9Sg== X-Gm-Message-State: AOAM5336aBvQ+Jrna/9P/+kG5Buj9QMSLFIVqQGdslRUdaYDLAHnFM71 XHQftJcA5yPRw1FAddmqG6gjIy4odp7vkg== X-Google-Smtp-Source: ABdhPJx0frd3m/iZNyQrrBVl1v/ShXDknJ7npPZnZfW9LfiimbHmWyAuzw/goenPLcK7tMbd9+4iDQ== X-Received: by 2002:a7b:c04a:: with SMTP id u10mr1899209wmc.83.1603792789383; Tue, 27 Oct 2020 02:59:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm1311022wrm.2.2020.10.27.02.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4EFBA1FF92; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging Date: Tue, 27 Oct 2020 09:59:36 +0000 Message-Id: <20201027095938.28673-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Pavel Dovgalyuk , =?utf-8?q?Philippe_Mathi?= =?utf-8?b?ZXUtRGF1ZMOp?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Pavel Dovgalyuk , Cleber Rosa , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Currently the test randomly fails if you are using a shared machine due to contention on the well known port 1234. We can ameliorate this a bit by picking a random non-ephemeral port although it doesn't totally avoid the problem. While we could use a totally unique socket address for debugging it is fiddly to probe for gdb support. While gdb socket debugging is not yet ubiquitous this a sub-optimal but workable option. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Pavel Dovgalyuk Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201021163136.27324-7-alex.bennee@linaro.org> Signed-off-by: Alex Bennée diff --git a/tests/acceptance/reverse_debugging.py b/tests/acceptance/reverse_debugging.py index b72fdf6cdc..be01aca217 100644 --- a/tests/acceptance/reverse_debugging.py +++ b/tests/acceptance/reverse_debugging.py @@ -14,6 +14,7 @@ from avocado import skipIf from avocado_qemu import BUILD_DIR from avocado.utils import gdb from avocado.utils import process +from avocado.utils.network.ports import find_free_port from avocado.utils.path import find_command from boot_linux_console import LinuxKernelTest @@ -33,7 +34,7 @@ class ReverseDebugging(LinuxKernelTest): STEPS = 10 endian_is_le = True - def run_vm(self, record, shift, args, replay_path, image_path): + def run_vm(self, record, shift, args, replay_path, image_path, port): logger = logging.getLogger('replay') vm = self.get_vm() vm.set_console() @@ -43,7 +44,7 @@ class ReverseDebugging(LinuxKernelTest): else: logger.info('replaying the execution...') mode = 'replay' - vm.add_args('-s', '-S') + vm.add_args('-gdb', 'tcp::%d' % port, '-S') vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s,rrsnapshot=init' % (shift, mode, replay_path), '-net', 'none') @@ -109,9 +110,10 @@ class ReverseDebugging(LinuxKernelTest): process.run(cmd) replay_path = os.path.join(self.workdir, 'replay.bin') + port = find_free_port() # record the log - vm = self.run_vm(True, shift, args, replay_path, image_path) + vm = self.run_vm(True, shift, args, replay_path, image_path, port) while self.vm_get_icount(vm) <= self.STEPS: pass last_icount = self.vm_get_icount(vm) @@ -120,9 +122,9 @@ class ReverseDebugging(LinuxKernelTest): logger.info("recorded log with %s+ steps" % last_icount) # replay and run debug commands - vm = self.run_vm(False, shift, args, replay_path, image_path) + vm = self.run_vm(False, shift, args, replay_path, image_path, port) logger.info('connecting to gdbstub') - g = gdb.GDBRemote('127.0.0.1', 1234, False, False) + g = gdb.GDBRemote('127.0.0.1', port, False, False) g.connect() r = g.cmd(b'qSupported') if b'qXfer:features:read+' in r: From patchwork Tue Oct 27 09:59:37 2020 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: 301897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B36D3C56201 for ; Tue, 27 Oct 2020 10:04:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F302C21D24 for ; Tue, 27 Oct 2020 10:04:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eNu+1ZUD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F302C21D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLqK-0003Oo-Py for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLli-0006tS-00 for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:54 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLlg-0000Ra-6t for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:53 -0400 Received: by mail-wr1-x42a.google.com with SMTP id b8so1194074wrn.0 for ; Tue, 27 Oct 2020 02:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6RhO4cdwQCgpwQ0W5UH+iqbHXTkkBBBZq5r2GBAXBI4=; b=eNu+1ZUDW7KK31w7OGjrpCAJulmG/4nOnjtfA2SJE/8ZY22qxBlV/l4icyfzkz1G0w j+xFsROdEcuechc+gGzi9Pn7yljLn/s546mg34tfqwiia2pihGEIr8HEGsEt9UUIQ+Xx MBCWYIxCXseM93NMI8QfXllMmDwzaAG0Q5zWLL9wpBCq8l5xqx9TcC5rnvZm7vdz3K4h 2JpksBEIBcLfhcBcKNdDeusNCe+ThjunFo19m1aM5fRQEMjY52nAHPRX+8rgRiE0QpqB MNOdKCw/kTB/Fv0ps+dKBo8X9vG30WCbp68G5BPdR478T0puxbTzLZHpG9Mk3RDEO6Rx 6l3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6RhO4cdwQCgpwQ0W5UH+iqbHXTkkBBBZq5r2GBAXBI4=; b=KbgaDqDcq+ixsMcGE8LjyEoXoSDobsH08u1u9daht+UAo2mbuRlPmAo/wED3f1dOP0 3CxXoQ/xcUFSZxn4udXknMl6VL4ufI0+bxHlFWAFlUw7/D5CGxrm5DKdJ40iljAUFUak al3G1Kolrf2RL7kOQD2ydCh64IFluckso2oJUi5st7bpLwfjzg2Blgwj5eyPmmTN4jFw XCVaGh/Qm6O2G+tQ9UIU4+WcGH1R8jHEWefXevcOcSGadIBzZ+Zl6U4BI+bOEThTjNQh pmNkfwv6RNC/eDAF4hUdJqp4K4gxvfWaJcVNXUEZCDhMHS8WZ8vEvS8K+Nbv8xdjgmhu 1NuA== X-Gm-Message-State: AOAM5327NpSrii9IXrqWjqCH9TxfKTgnTQAzy/rGFNHItcEsL8hbKnnh 8ghhzU0yj9pwH5hD/WENt57Z/A== X-Google-Smtp-Source: ABdhPJxbPqI2rJquE4iqYyJkUhQTxEKSMF7Dx0AwF251D9zHSac0xbJN6M3eD4rdtkhNqcVGBc9vvg== X-Received: by 2002:adf:9150:: with SMTP id j74mr1973074wrj.57.1603792790552; Tue, 27 Oct 2020 02:59:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 30sm1392304wrr.35.2020.10.27.02.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 669C31FF93; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/8] gitlab-ci: Clone from GitLab itself Date: Tue, 27 Oct 2020 09:59:37 +0000 Message-Id: <20201027095938.28673-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Let GitLab runners use GitLab repository directly. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20201022123302.2884788-1-philmd@redhat.com> Signed-off-by: Alex Bennée diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d6773efd2..3b15ae5c30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ include: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: - JOBS=$(expr $(nproc) + 1) + - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules script: - mkdir build - cd build From patchwork Tue Oct 27 09:59:38 2020 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: 301895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C01DBC4363A for ; Tue, 27 Oct 2020 10:07:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 197B621D24 for ; Tue, 27 Oct 2020 10:07:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bru/TKrL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 197B621D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXLtT-0006nW-PN for qemu-devel@archiver.kernel.org; Tue, 27 Oct 2020 06:07:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXLli-0006vr-Sh for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:54 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXLlh-0000SW-2t for qemu-devel@nongnu.org; Tue, 27 Oct 2020 05:59:54 -0400 Received: by mail-wm1-x335.google.com with SMTP id 13so755279wmf.0 for ; Tue, 27 Oct 2020 02:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JvXXjxCnzuVyw48/pxsXMREPw8qcCphYSqn16eRFOWw=; b=bru/TKrLoDy1C0WPdF8PgJFiuWrlD2cYPv33bMQPLFI6R7bRUXy/KfYDrZYFHvgcSC ZEivrJMW2fkXNIg+YNgrAIlY+LJhK6LSpMyCm4of6rCf4mr6bodrnpvHgILuF3CDCFQt 2cXt/cVzG8PE3voSOvjJanAzn+6A7c4ZDzpGc5lYUdJ+ux6RH6yzccZww9ngSE1lf5E1 1SLC+IBOWsGRbq3pPc+M2Ei/XrMEfPXn3w1KMNJJPaRI49BS2KgzyDer9JTVeph9RRBU vZGVS0vAYsLY/i69vpYnCbDfPPPFJXgzEGtTXKBB+MG7rI8uOzu07xSvGmX+FuE9w4Er w83A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JvXXjxCnzuVyw48/pxsXMREPw8qcCphYSqn16eRFOWw=; b=J1V//tsmUFKq7u7vwbz4+a8gA5k+Atak4LR8e1eKzr3CHfYSPR3uY2fW7RCy+nzkC1 w+dSQ0LMYB5WymU0MGlsp74ZCBRcGqO4gCx20pvLUyb0aZNbSBC5pO+T17a8myXa78lb tJkjVljICTUa/vERExzViYQGcndH+YO7fuE9cx9ZWn67b1xCwTHHDpbScUQyN7bzgKDv TtI+zyV96a9naJTibYzl2KkJapM58kDXvjHhw54caJ960WU2PvTm/dQtciMeUWKfbm8n B5iAfrJ++Pa3o71xqETwgf+0wNWCi2ApY66QZd0jupvNGikh8qx4gNlJB4Php/Bn0U/L Ejvw== X-Gm-Message-State: AOAM5334WG/zTP8yGHCjxuvQMN/OWxxuCOPaeOpN//DAz9XBZPrxVKzc FTrV6pqSvjETVkd1eK+5Bw+xkQ== X-Google-Smtp-Source: ABdhPJxEAGs36Q4O8ZxPmIeq8lHWQvpGi/dhRz5nrTSHUgB9FHCkPMu8QLjubpsdbOa0G2qYDmrJ8g== X-Received: by 2002:a1c:56c1:: with SMTP id k184mr1781446wmb.14.1603792791742; Tue, 27 Oct 2020 02:59:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x6sm1370497wmb.17.2020.10.27.02.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 02:59:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7BBC11FF96; Tue, 27 Oct 2020 09:59:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/8] makefile: handle -n / -k / -q correctly Date: Tue, 27 Oct 2020 09:59:38 +0000 Message-Id: <20201027095938.28673-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027095938.28673-1-alex.bennee@linaro.org> References: <20201027095938.28673-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Use $(findstring) instead of $(filter) to detect -n/-k as different versions of MAKE fill in $(MAKEFLAGS) differently. Do not bother running ninja at all if -nq is passed. Tested-by: Alex Bennée Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20201026155854.3074290-1-pbonzini@redhat.com> diff --git a/Makefile b/Makefile index 4d1fa8bb3d..e7c1000f5c 100644 --- a/Makefile +++ b/Makefile @@ -146,9 +146,12 @@ endif # 4. Rules to bridge to other makefiles ifneq ($(NINJA),) -NINJAFLAGS = $(if $V,-v,) \ +MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS))) +MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS))) +MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS))) +MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) +NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ - $(subst -k, -k0, $(filter -n -k,$(MAKEFLAGS))) ninja-cmd-goals = $(or $(MAKECMDGOALS), all) ninja-cmd-goals += $(foreach t, $(.tests), $(.test.deps.$t)) @@ -165,7 +168,8 @@ $(ninja-targets): run-ninja # --output-sync line. run-ninja: config-host.mak ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) - +@$(NINJA) $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat + +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) \ + $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) endif endif