From patchwork Tue Nov 15 13:34:30 2022 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: 624834 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2979051pvb; Tue, 15 Nov 2022 05:38:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5LzEzqlyhjo3NvTU1yhbnnb1tm6CFMbMcpapzOdxZyFmHz4jvK4DvdlB2ibKJ+lYw2ec6+ X-Received: by 2002:ac8:5787:0:b0:3a5:ef4:675d with SMTP id v7-20020ac85787000000b003a50ef4675dmr16868413qta.409.1668519532145; Tue, 15 Nov 2022 05:38:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519532; cv=none; d=google.com; s=arc-20160816; b=VZqQegzxN+JYtn9feemSQFQl4x+8dOMDKQk/TpoGqYvbm8eSwHwvu74hYe9e0DTB3T LwQr5mMbaEk0chPVl0FpmsvZ32dQ/9KjrtXAuVT4MOeqZ0Btn+nXLPIxDzDewuFcDMzC oz93cbxJrqpO1CYDJzAYPQLKCEJoYRp4NMmOc0+LeJy7rYjLHTisLse5ESJ2gVA2FlnQ uy5/sqIaCPV8iQ3mulCyu0cwvEV15r74uLXk0M4yK7giflNTCgTzjIt8B4wNCMnatJtZ nmW5J7oYjXyFudiygT1MWFUdEsEq+hHHir+mCt3jXFGs5O4zv+Pnu/8Jsi3j4x1KkCmi sm6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=CQvTnKRrgHBIhsU/qKoZl7peLGzidrm5phvdIW8Fp4vaex9XhTMmVcsEas7WDZfnsX Qgjlekw9+hekhhfolMIgmnulFiv3eUA/NV2EsZuiumrS79ZLYMrL9HswHs8eWS5zpSWu USQjbvTyqg5FnsmWmhntbdbwq6U5j1MbW62nAO7E42Gi8rIFhle9aekd4uM95Lk2gOMO FBzM5c6NDODm/Ihj4ajRIbH39DKyGBbhqySz/EJoaJDjqLB9W5pONWY1EZfYxq6fA04E IeYJtOzz3MiM8hpfCrzs6/OBk0ZeQP84uNSq62orEQBoUG1MZoJ/9a93BYazl+DdyWJ/ 1lqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ye8AjOgV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 x22-20020a05620a449600b006f5f43caac6si8628239qkp.176.2022.11.15.05.38.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:38:52 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=ye8AjOgV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6q-0006zE-GL; Tue, 15 Nov 2022 08:36:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5O-0006I3-Lg for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:49 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5L-0004Ia-W8 for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x429.google.com with SMTP id h9so24317995wrt.0 for ; Tue, 15 Nov 2022 05:34:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=ye8AjOgVDLjvAN3QziHEMI3XCoTwtN7ulYk9iRWj7PZ+TBZK/y3rfS7GG3syvUSiR1 kyLjJ4T2mVh+yhC8rfTPP5xdtUnZeZ+say91r6PImvoVgxdRCM1FzEo9dOYCJXMpxmYj k7yDpYSeRoGJ4gvNLOhtLQM5MlfcoykLwIDGg/pzU7Kd/DNl2t3D/+3UdD+LQ5Fg9tWB 7i/rZLXNGd4aHxO77g4vPRs2jbyVQlcIxcZHUIpk/SVOEVzfwqWjk2rLIwggbBjF/Brs 6WgwsDVZPPIrJH0rNalApYLxuYENGJUPXcCWDxi4TS/X9jkIUrb+sim9xsPrdyxBMbxs bJzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=gl0qLoarUeQgd40uId8LhTeztiLRP9wSSVKAPK39Li9kH3hkyiPXCvodQrs/g2wj3O iSeNvWHtGQQdQvhBLfleZ09wiLmUPIaKQsQ01HJBHlAE/4waRQsJ+1dz7AN5CTfpne4L yZk9T5sK8Anow+nCh6wpc5pv56oqgHbcOHAHVmrBrdT9wJpKJK03bAG1I77fepAErK96 J8GmXL+N0cMWSJzISMxftxqUVyFD1qeZAo6Tl5+sMKSnohr5BQLA2/u7Aesuy3smHjlX c8ECWGwnptY5G1EX3VEauUp7Bxg6tzhFGNyk/cRJND33zW0r9U2d7xsLhViOuy7atC+2 gO1w== X-Gm-Message-State: ANoB5pliR4JNwEBewnmWmXtLyXlclkdTb9TRFDDqi4sytwN/0fstwYDb JbE4vRSqDV4onBxg1knVHESBug== X-Received: by 2002:a5d:42c6:0:b0:235:cebf:8a0f with SMTP id t6-20020a5d42c6000000b00235cebf8a0fmr10738827wrr.220.1668519282145; Tue, 15 Nov 2022 05:34:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t67-20020a1c4646000000b003cfa622a18asm21515616wma.3.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:40 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 521EB1FFB8; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Stefan Weil , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL 01/10] Run docker probe only if docker or podman are available Date: Tue, 15 Nov 2022 13:34:30 +0000 Message-Id: <20221115133439.2348929-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Stefan Weil The docker probe uses "sudo -n" which can cause an e-mail with a security warning each time when configure is run. Therefore run docker probe only if either docker or podman are available. That avoids the problematic "sudo -n" on build environments which have neither docker nor podman installed. Fixes: c4575b59155e2e00 ("configure: store container engine in config-host.mak") Signed-off-by: Stefan Weil Message-Id: <20221030083510.310584-1-sw@weilnetz.de> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221111145529.4020801-2-alex.bennee@linaro.org> diff --git a/configure b/configure index 66928692b0..26c7bc5154 100755 --- a/configure +++ b/configure @@ -1780,7 +1780,7 @@ fi # functions to probe cross compilers container="no" -if test $use_containers = "yes"; then +if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; podman) container=podman ;; From patchwork Tue Nov 15 13:34:31 2022 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: 624826 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2977425pvb; Tue, 15 Nov 2022 05:35:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf71zXkA6BPaBeDW/PgDBnPq1HETMdHoBEjyG5bHxdp/wg+bbxCMXfM8I0usD+IB2TrD2EfW X-Received: by 2002:ad4:4347:0:b0:4bb:a80f:3f43 with SMTP id q7-20020ad44347000000b004bba80f3f43mr16615407qvs.43.1668519343697; Tue, 15 Nov 2022 05:35:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519343; cv=none; d=google.com; s=arc-20160816; b=S46SYt5misjmtUvmAMC7rhVKHu7aWSDgfVM/rE9p6p1eE7i8gJHkFvnYz+YAXGtSim 6Uzk/Hy7TjkDgNT1iwO5L+jTNLHAV79OZ68fDwdvenoerOjUxmKuc0oEkTs5oeovpByW Ky3t3ggNgN1XL7ZrllBozS8iJ3c/b5WOQGqkVYyHhqUO61V2Uw3rqbEyw7qjMyZkgA13 zJVcrQmaCkoWO5FUg5n3IYBlZhYyz0FQKyWO5idC28umuZjEu97lVt+e5k+jnyOyZ7mt dUttN/4HbZadi/xAlBdGCXSiCBIpmvtwwzZ2FZNCSuRrM8sLkGDJ6lxYXltpE5j95o1P ci3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=Hd677+bfuIhpkyc3PSGbpAuJqC4YjdSOyP8U5M+NGW8=; b=HGYINSIJ0m3baZCn510XGjDivu2RRqfnpTrTEqE4hqFdecivfYMiDqfhi+6ZABgNRT tBKzuxeaXwa15VJPHzGdfyJ6OuYu7u4vZJbAHKeseQv+zavI0zwYDyhG6lWprXoGtm4J tx32eusiyF4wPYxqE5qqP5+8I1bjGjY6Rb2ZgRh3wQAIN8wNUOuTsfIXbKvlr1NIqdGd OPrpSzNnQ6Uzk1YQaPLQ5c7qcG07Y6eC/s4uqmJTqdfcPGAUGw15A9UTgD/6V7fdqhAQ 8Eh+NFGuqF7bJ7I+sbPi766pkKX6H3XynUNn4CHWVzjrHRsVNFclaPakPP9CsN7rSWyT BYSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Io5WJ/Gw"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 d21-20020ac81195000000b003a57a317c09si6956930qtj.46.2022.11.15.05.35.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:35:43 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b="Io5WJ/Gw"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw5y-0006Rf-QQ; Tue, 15 Nov 2022 08:35:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5N-0006HV-LN for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:45 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5L-0004IV-Nw for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:45 -0500 Received: by mail-wm1-x332.google.com with SMTP id l39-20020a05600c1d2700b003cf93c8156dso10249267wms.4 for ; Tue, 15 Nov 2022 05:34:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hd677+bfuIhpkyc3PSGbpAuJqC4YjdSOyP8U5M+NGW8=; b=Io5WJ/Gw51NkOBE3tns9bK4v7JsGaoqxFdxvzkYEPrWxAHc2mqy8DZMe9vROJXqUDo y4MqKzPpB5m0QJQECFh9nJU/yfq31ICmu8gW5wFunPaDh5B53rG4/2q9PpGSlRkyZMcb 2uMm7vwqiv7MBd4JkQASICxgWQ7ZqQwy59jcoNvoitmBSbe+/j8HfbZ2kpq3NwCru3Lz SjATSG5Lr1StiIxa2zeGj9/lpzXZDXmbx/fb6Q5/+MWBCYa0PErS5cbiKWVv0kMv3ece NikSFAp4FqDpYMsWc0rxuY9hG9GGMrjRGo044c3fnD/rC2Ra1LFBNetTUnmgsGjNKbxm TxpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hd677+bfuIhpkyc3PSGbpAuJqC4YjdSOyP8U5M+NGW8=; b=peswpJ5mK4rQvdywv29WB2TnOgMpJN9v7gmHjsfWlb6WsAseWRVEQfnRIQrrzanwzi yKkJ7L+IK8jrX1J1Wo9W1n53ejKqKy0jmr3kPh8vFgu+mO8XvyRA91HWIdN7ejVjA4Oe EqXKMP+6EJDF7Fd9BoC3hLsI1TsxSJL+1DQzeKLR3dSFh3xZVmzmor4z91fTlxWJs1CB tt96QyhCbvzvPEY5Gx+sJWII9eyX2dSNhIdGeTghGtwWH2Ofq5Mw5PUU+FQjN3pQuOlD su75H5sW9mkOsCio3vOtNdRdJYD3Y3HsDwVmBmHvLZgRDQ5zIYnTPEvuSKw4EfVPkgvF Jr9g== X-Gm-Message-State: ANoB5pnVUvZAkzaG2q9DXIorv7eRUYF5S721K2w4APWlFyD/xVER0StS XOaoXqggx36UYW4l2WMbYkGSOw== X-Received: by 2002:a05:600c:5390:b0:3cf:9b4d:ec4f with SMTP id hg16-20020a05600c539000b003cf9b4dec4fmr413974wmb.114.1668519281351; Tue, 15 Nov 2022 05:34:41 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bt17-20020a056000081100b0023677e1157fsm12636017wrb.56.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:39 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6CDAE1FFBA; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/10] tests/avocado: improve behaviour waiting for login prompts Date: Tue, 15 Nov 2022 13:34:31 +0000 Message-Id: <20221115133439.2348929-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This attempts to deal with the problem of login prompts not being guaranteed to be terminated with a newline. The solution to this is to peek at the incoming data looking to see if we see an up-coming match before we fall back to the old readline() logic. The reason to mostly rely on readline is because I am occasionally seeing the peek stalling despite data being there. This seems kinda hacky and gross so I'm open to alternative approaches and cleaner python code. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221111145529.4020801-3-alex.bennee@linaro.org> diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index 910f3ba1ea..7469a06804 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -131,6 +131,59 @@ def pick_default_qemu_bin(bin_prefix='qemu-system-', arch=None): return path return None +def _peek_ahead(console, min_match, success_as_str): + """ + peek ahead in the console stream keeping an eye out for the + success message. Because we are partially peeking into the data + stream we do everything as bytes to avoid partial UTF decode + issues. + + Returns some message to process or None, indicating the normal + readline should occur. + """ + console_logger = logging.getLogger('console') + success_message = bytes(success_as_str, 'utf-8') + peek_len = 0 + retries = 0 + + while True: + old_peek_len = peek_len + peek_ahead = console.peek(min_match) + peek_len = len(peek_ahead) + + # if we get stuck too long lets just fallback to readline + if peek_len <= old_peek_len: + time.sleep(0.001 * retries) + retries += 1 + if retries > 20: + return None + else: + retries = 0 + + # if we see a newline in the peek we can let safely bail + # and let the normal readline() deal with it + if peek_ahead.endswith((b'\n', b'\r')): + return None + + # if we haven't seen enough for the whole message but the + # first part matches lets just loop again + if len(peek_ahead) < min_match and \ + success_message[:peek_len] in peek_ahead: + continue + + # if we see the whole success_message we are done, consume + # it and pass back so we can exit to the user + if success_message in peek_ahead: + return console.read(peek_len).decode() + + # of course if we've seen enough then this line probably + # doesn't contain what we are looking for, fallback + if peek_len > min_match: + return None + + # we should never get here + return None + def _console_interaction(test, success_message, failure_message, send_string, keep_sending=False, vm=None): @@ -139,17 +192,52 @@ def _console_interaction(test, success_message, failure_message, vm = test.vm console = vm.console_socket.makefile(mode='rb', encoding='utf-8') console_logger = logging.getLogger('console') + + # Establish the minimum number of bytes we would need to + # potentially match against success_message + if success_message is not None: + min_match = len(success_message) + else: + min_match = 0 + + console_logger.debug("looking for %d:(%s), sending %s (always=%s)", + min_match, success_message, send_string, keep_sending) + while True: + msg = None + + # First send our string, optionally repeating the send next + # cycle. if send_string: vm.console_socket.sendall(send_string.encode()) if not keep_sending: send_string = None # send only once + + # If the console has no data to read we briefly + # sleep before continuing. + if not console.readable(): + time.sleep(0.1) + continue + try: - msg = console.readline().decode().strip() + + # First we shall peek ahead for a potential match to cover waiting + # for lines without any newlines. + if min_match > 0: + msg = _peek_ahead(console, min_match, success_message) + + # otherwise we block here for a full line + if not msg: + msg = console.readline().decode().strip() + except UnicodeDecodeError: + console_logger.debug("skipped unicode error") msg = None + + # if nothing came out we continue and try again if not msg: continue + console_logger.debug(msg) if success_message is None or success_message in msg: break From patchwork Tue Nov 15 13:34:32 2022 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: 624830 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2978020pvb; Tue, 15 Nov 2022 05:36:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf5x8nnP4MR5yEY5WRClq1lSMLF4y83tWJOJIoZlo6bRVMslIHevsx4DU9g+XFW/HWDi1qiM X-Received: by 2002:a37:c245:0:b0:6ee:909e:ed6c with SMTP id j5-20020a37c245000000b006ee909eed6cmr15141161qkm.264.1668519406106; Tue, 15 Nov 2022 05:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519406; cv=none; d=google.com; s=arc-20160816; b=EoYJ7+Y7DKJj5S8KlNwUD0Xw+ciPegR/9ewmpHeDQCw85aexOyqvCjJq1GAHJFg60X 1vEqOipp3Z2Hil9ZY+IvAS2UfMQaDpRIE2l8HAbnIlba703YJkbaBNy/sOoTWhLPGGjg uRu+N9MgSDzfG58EncvrN3SvRglmSsVGJUlmST2e47VKdiwTDjvDpsDdyHOOP5QfR+pG wSdiEOkr+j1Zh2DjcIy+4aiel2syuisCWGXA+4hBsTBybYw+oK8fJHjZ+KPp8YU6bW2H U63PBj+NzkvmIXVPGI3V6YTSaXE+XcySvRd8DZHd27JmDJwoQTo/im6j9/vjTWVdRbJH vEew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=LtQX120C+hnP3/xU0LbI86jAFTmJKj2SqP+/KJlvaQlehNOjV0Y1+YA4oPsMoevhn6 GyOzyrEWQlelX/oKuZIcC4YKul0bJddFMzm5pns7pHTjyrlbuOfIQesiaKHe7u9GScev ryGFoiVut4zA5smDHGwy2CXBOvxEXUCKNxl6jZK2bSh+/K0svHbFr5FepCvne/2HpOw9 tQXmEumVbZSqwWcPSwlZWmA17kF/NS17j7mAScOTR7XX3PAKYJ0whfWtTwFl+4zGyaai JCJHWaKQYf/ZqHgMVvSdsqdLgQ8Y8Uuwa6ByUahK5fmpU4U0XkzhDQ5YTwVWRhTsg0tX OdMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qKQkMNyY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 g15-20020ac8480f000000b0031f0e2230d5si7017857qtq.609.2022.11.15.05.36.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:46 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=qKQkMNyY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6z-00076p-Rv; Tue, 15 Nov 2022 08:36:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5O-0006I6-S9 for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:51 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5M-0004Id-1U for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x42b.google.com with SMTP id j15so24315719wrq.3 for ; Tue, 15 Nov 2022 05:34:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=qKQkMNyY3q5A21V1pJiD/QReq4xatEQHJwbGWmHW0oHcJZhPA+hoywlhLsITII30TE VuEjXqMFvja/IRyp36QmK4aSCQKJOzZBDdpz0u0wpL5Sk1K5sQQjlTS3NK4l1cyCoWDh SnSrvSnftaJBNuLzW+U+EaIMqVa4wKxQpQHxCFfqTX+r8rbG42JHkPHdkzZuClGvmXU7 9JXRB8zUVqM1ihLu0Y6A0361bBPe3emUAidNXVpUENKjtdSg7LmaXw+VqI5VnoTeIM7n aODDgj/yVMDloyjiAngIKdl9pNNAL6RJWlmO7TmcH4VjpX7ZiNSppaZBnXo38ad7E0AD /PpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YEwk4mG4SDl4i6e5vGNuhjwgLf2dcKmgfAwFXe8VUyU=; b=e8VFoNArhNdL0Xdbs3Ck9sIkUv+dQXnK9X0AlDBOGmRq9/u2diUAU1mjFJUCba8OFv JUAzQyiCOxVm9QEL/puWlDjivaM/2fAklawsyqSCaYZHHCiFafqW1zu4ccOt46TS/iKE 0hqX4iaXCBdLfx3oACX/9NK3skRpu/nvLjCD9YnFEf9pj18bMPswQOP7CoNVsqu1l5ev +w1NUhLHxDyooICD5X9JesWPpdHdNZCJHL+Pp0d65kabJ+DmaDHCO2vxaeSp2jkjtaPW JuO6h4ZJf9jbL7uYtiZyG69WGCHQCIhclrc02LBG5T4OB23EYVy9/bJuUf7QSVoMcjK2 xWAw== X-Gm-Message-State: ANoB5pk9JH4qupNjFeU3nZN2RGcQJ161fJmsjRmXwpCE8wc4kT2ay7zx ymOtuGJLhKJRqrpJniGyuW5rZQ== X-Received: by 2002:adf:aa44:0:b0:236:651d:60d4 with SMTP id q4-20020adfaa44000000b00236651d60d4mr10739076wrd.609.1668519282567; Tue, 15 Nov 2022 05:34:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g10-20020a5d488a000000b0022cc3e67fc5sm12265749wrq.65.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 84E141FFBB; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/10] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Tue, 15 Nov 2022 13:34:32 +0000 Message-Id: <20221115133439.2348929-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Cédric Le Goater The Aspeed SDK images are based on OpenBMC which starts a lot of services. The output noise on the console can break from time to time the test waiting for the logging prompt. Change the U-Boot bootargs variable to add "quiet" to the kernel command line and reduce the output volume. This also drops the test on the CPU id which was nice to have but not essential. Signed-off-by: Cédric Le Goater Message-Id: <20221104075347.370503-1-clg@kaod.org> Signed-off-by: Alex Bennée Message-Id: <20221111145529.4020801-4-alex.bennee@linaro.org> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index fba6527026..1fc385e1c8 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -12,6 +12,7 @@ from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern from avocado.utils import archive from avocado import skipIf @@ -182,6 +183,8 @@ def test_arm_ast2600_evb_buildroot(self): class AST2x00MachineSDK(QemuSystemTest): + EXTRA_BOOTARGS = ' quiet' + # FIXME: Although these tests boot a whole distro they are still # slower than comparable machine models. There may be some # optimisations which bring down the runtime. In the meantime they @@ -194,7 +197,7 @@ def wait_for_console_pattern(self, success_message, vm=None): failure_message='Kernel panic - not syncing', vm=vm) - def do_test_arm_aspeed_sdk_start(self, image, cpu_id): + def do_test_arm_aspeed_sdk_start(self, image): self.require_netdev('user') self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -202,9 +205,13 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.launch() self.wait_for_console_pattern('U-Boot 2019.04') - self.wait_for_console_pattern('## Loading kernel from FIT Image') + interrupt_interactive_console_until_pattern( + self, 'Hit any key to stop autoboot:', 'ast#') + exec_command_and_wait_for_pattern( + self, 'setenv bootargs ${bootargs}' + self.EXTRA_BOOTARGS, 'ast#') + exec_command_and_wait_for_pattern( + self, 'boot', '## Loading kernel from FIT Image') self.wait_for_console_pattern('Starting kernel ...') - self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id) @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): @@ -221,7 +228,7 @@ def test_arm_ast2500_evb_sdk(self): archive.extract(image_path, self.workdir) self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2500-default/image-bmc', '0x0') + self.workdir + '/ast2500-default/image-bmc') self.wait_for_console_pattern('ast2500-default login:') @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @@ -243,7 +250,7 @@ def test_arm_ast2600_evb_sdk(self): self.vm.add_args('-device', 'ds1338,bus=aspeed.i2c.bus.5,address=0x32'); self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2600-default/image-bmc', '0xf00') + self.workdir + '/ast2600-default/image-bmc') self.wait_for_console_pattern('ast2600-default login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-default:~#') From patchwork Tue Nov 15 13:34:33 2022 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: 624829 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2977734pvb; Tue, 15 Nov 2022 05:36:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6RPG8l2EspfR55qn1qdC+jtTlbZkgZF/57UqsXneFeMDLmBYr54YJTA/5jOSmqBYbMGI0U X-Received: by 2002:a37:7d8:0:b0:6ce:4418:16d6 with SMTP id 207-20020a3707d8000000b006ce441816d6mr14862629qkh.138.1668519376006; Tue, 15 Nov 2022 05:36:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519376; cv=none; d=google.com; s=arc-20160816; b=Aow7s0YjTTRf1Jty/1t31HfXhIyEqsi/sEG4dUljKBfInPyBkHX1cUeWV/K96kFW6h +1iKqQWL5xTEOxKTRFtmHoCe2ZzdU6az3+OIU/ih15okiwjvofvQBGlbgJbYrIPUj7/d 9i4qOE9m/yiBqCuerNwnHXrQe3MVTi+tDQ9Tk1Rr9a+GSrlVRntnrzgexKnt9Y3dlPkn i5CboI3l7OB9mS9TBxPhtxJS6+JNKcEa6lK08+2VxKrHgaCkD1MH/8j8chx+aU12h22s 3I1Ji9FrvQy5sSMe6EpZHXdJpo+fyQCOt4dI8ykviEk/UQ1nyEULDOBTGA6KlgddxORV or4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=DjmCrGLQX/yCFVTKI/kGmq++m7m3PKY5ojI0xVVEqbgm1X+f5fsXta65tfN5AMVLqA u45WQbQ8R6/fi2R/rOmyVk1xuuGwToBcAxuA+ad7aRPhPhPn71UFSkmnIpJFxn0YHeUz t3+rMhmoLslt4hBm9bJLgnVUDJhfHenSBNe/n4Q/xqWw2+Mk1jhQwYZPgzkQ8MScWu4v kxCC22O0UiU79rkWJgbgg5ZbrRVnNb7uqASq6Cnh+BV1KuPMZS475C4IJ9Bqj6x7jzOm Njtik+tZEL2yCmZcoddik83ssQVXb6qlhyYd+DoAFloowEEv4WTl2LaUhkkZ5dWwszc6 npRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yQtaUFm7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 cb25-20020a05622a1f9900b003a5279ddd36si7692792qtb.576.2022.11.15.05.36.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:16 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=yQtaUFm7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw60-0006Rx-AN; Tue, 15 Nov 2022 08:35:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5O-0006I4-Of for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:51 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5M-0004Ir-Ox for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id j15so24315778wrq.3 for ; Tue, 15 Nov 2022 05:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=yQtaUFm7Qmv9Y7PgtR57DZFE6aQoJobYUhCR83MIhMsHw6+vBtpBKvDkwKyDLb+iXD XyLui49oMy1V+OF6w77Ae0+dPGfXnRjtRHfda4jz/tNJCFnPOJBiTgFvVvXzCz8Ke3dj MvsWLNxzTfCoy6uA5E5VMQfe5dqUNLCWVVDR3LDv2UDUulAkhXTCzXa6uUGIrjwCqVQ4 ktxVEdBSEl5E6b2UQA2m3ncmFRaM9xzi4EeFjUQr0T18A8TT2aU1VvmsO952L+04IT/d bodHyp0FptQDnfQpgjkta+2HToXXRu0PJXUi9YQbKpfUWGGmH503MdabUAhBy5vLOa+q mBKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=lM4ICzBN6clTV+wZ5vhTa87egKbnifvDYpxuNdUd+h1ml2SMOKZ3Jun0kyq8XNkD47 hoZrTiDZCSIIPiAnL1IvZeIq1aCrbviYIR3b/TsWavGehS2XhTK2sX0IytA4IIGJWEoJ xE3mr9Z27058C5biMgRcCymZ43AJQcpOIU+9/Okp24HwXoOs98Td4IGoK2hmX4grqOUi kax8UDQI/H0U7QOEknc4B2q5y5R8DU3blbq5kk5oONBD5PWTjCtlswBZ2SO++cfilHw5 LySRFoWSVipCrpdsZaNM1yXN94swzVK60A2rfrpl/CAbc+4TbWP2A5gLE2qUD85hm9rU N6QQ== X-Gm-Message-State: ANoB5plchaMjVtzsgOwc7QCdudBcc7dcy3LV2ygWfOsLX87blCIFUSqL YBqlcwHzxRS5BrP3In7KGHACFg== X-Received: by 2002:a5d:4c82:0:b0:236:56a6:823e with SMTP id z2-20020a5d4c82000000b0023656a6823emr10749492wrs.495.1668519283328; Tue, 15 Nov 2022 05:34:43 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k34-20020a05600c1ca200b003b47b80cec3sm24556815wms.42.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A18D91FFBC; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 04/10] tests/docker: allow user to override check target Date: Tue, 15 Nov 2022 13:34:33 +0000 Message-Id: <20221115133439.2348929-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is useful when trying to bisect a particular failing test behind a docker run. For example: make docker-test-clang@fedora \ TARGET_LIST=arm-softmmu \ TEST_COMMAND="meson test qtest-arm/qos-test" \ J=9 V=1 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221111145529.4020801-5-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c87f14477a..fc7a3b7e71 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -184,6 +184,7 @@ docker: @echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' Extra configure options.' + @echo ' TEST_COMMAND="..." Override the default `make check` target.' @echo ' IMAGES="a b c ..": Restrict available images to subset.' @echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @@ -230,6 +231,7 @@ docker-run: docker-qemu-src $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ + -e TEST_COMMAND="$(TEST_COMMAND)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ $(if $(NOUSER),, \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index e6f8cee0d6..9a33df2832 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -63,12 +63,12 @@ check_qemu() { # default to make check unless the caller specifies if [ $# = 0 ]; then - INVOCATION="check" + INVOCATION="${TEST_COMMAND:-make $MAKEFLAGS check}" else - INVOCATION="$@" + INVOCATION="make $MAKEFLAGS $@" fi - make $MAKEFLAGS $INVOCATION + $INVOCATION } test_fail() From patchwork Tue Nov 15 13:34:34 2022 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: 624833 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2978745pvb; Tue, 15 Nov 2022 05:38:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Z0amtgUu1/8ZEr/Z/2M13lAjS+2POZalK/6cZTfRGct2vTVn/zFY1nuvOvol+qfiPIE7t X-Received: by 2002:a05:6214:1050:b0:4bb:6575:32f1 with SMTP id l16-20020a056214105000b004bb657532f1mr16820427qvr.42.1668519495779; Tue, 15 Nov 2022 05:38:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519495; cv=none; d=google.com; s=arc-20160816; b=xJaAwllkPQaWYftXXxaZH7zswDGv5qANbP1apsTosegChuEP9FOj+8pea7U2hwc3Fx jp0YZMsvTRyt3YTuTSca+6kFW4eu4ARygn0HWh9UtYgJPLy4MTb3JDvnRtaLdpDjDCic m7oMDUVKGalgv8jSSFTOPM5KOKCgZQSTdPpfWev+GivIl+fAmmSsMj4m2oq53Tm2rT8T 8ZsqulcaAkJKFuTNYnnMKJ33iqAOvbhoPVtSlh7JtEMIsEWF/CYFbN4UHhZo99RwUtRV onUEeU4BULdystetNq8d13t6vkdtp1ja92VrSGNWVxmv/nG/ElA0jhDeOajbZqREYS8L 6e7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=ezaTyadfOi9kcEwGFI3M4gMhHH8IqwlOJysS9HSV8Ek=; b=ngqYUf7xCEowPgi+aH623yMnw85GyKYcuujPYzzqXotuicC96X9OVzBPKudmH76Jt9 4wO6u1ee1MYxpBB81u7JZCpjSFpWfRR9QAIzAmintVTlVeBj2um78Vhgx6c+kmvpKVXP /i7BSt0aCPbcR6mruhkEqOprY/o8kn0snUF0vO0bGumWHZxcG7o/i5YmDZDEElIBXF6n xEvHPIH8IMPFMRWoE288TznCKjrRx5RTtcQhN0fixqigSeMyPaQ1TmO7Wp+N+PfUatuQ Dh4qtXJepZsdanpeI2aizhoLf01zVKIQp+1jfoCHKAn1g99dg7O/sHpQgV4w6h41ulZr pBUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=isAtVXMn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 j12-20020a05620a0a4c00b006eed77a7efdsi6678372qka.61.2022.11.15.05.38.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:38:15 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=isAtVXMn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6s-00072n-Da; Tue, 15 Nov 2022 08:36:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5Q-0006II-9s for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:51 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5O-0004J4-1G for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:48 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y16so24277184wrt.12 for ; Tue, 15 Nov 2022 05:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ezaTyadfOi9kcEwGFI3M4gMhHH8IqwlOJysS9HSV8Ek=; b=isAtVXMndF6URNkfyBEL+g1kVjBWc9a05537yYfjX1Qytp9Vqq7hUv03VHg3UV7cHi 2hQlpZZri0MhVGnSipYhedH48T3pxkUj2nO65VhTBjPl7tL25Ql6sC8FmxZqU0A1lQha red8XRZhTaD/1WLsKoqi5XuXVCvnK9xgV/M50sNoRe9/kdnYoXFYs+J+xMj21oO1AIg8 nmOXWlhhHYpHKG9JRDcEANwYn/9WjLITUOla1IV6P3CCvwEZT3FMTn6ojNKhMl/by55e pDVlHk3iKeixaeDwo/FxYTRImWB0WnXLkRfuwa5tQ29wDtywAEvFpymPGElbkrLZmvOE bx0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ezaTyadfOi9kcEwGFI3M4gMhHH8IqwlOJysS9HSV8Ek=; b=J+qGsdYL7kp5XuLiuxD01VKaYIIPWAXc3Vv3XWA2RpgdDcNa5oatZeKuqJpO2psLRL t8j71X092k19hbiZ45lOWUYM5nWLzVGLPeR849g+rguQ65vSTNlckm7QF1gYt2asoTvS mrpOTNgzxQ6bAahbA9Vzah0SYmrh2j1btdWNJ30db58EGEXI2gPOtH5Ai71gXT6YzjbE 5kGd7U84fuyCfQtlSqTBkMJe7j4yMe5LvjNHqUnMzsaWlMMfCb1J+V09G4azDORKAUuo 8aiAvoYmvYT8kMO/QonB6TmOy0i/1FoLgcTA/JU9ACDf7qOjFI+RA1ezc4HcnCY7RAEV NS9w== X-Gm-Message-State: ANoB5pkgTCE8gjbPAM0yatKZ+CvV7RstS3b8F6X2qV0LORSIU0TYVnZo fuR31nGJQ41kfvo4U6cLWRYYpA== X-Received: by 2002:adf:dfc2:0:b0:236:7805:48d3 with SMTP id q2-20020adfdfc2000000b00236780548d3mr10659589wrn.644.1668519284350; Tue, 15 Nov 2022 05:34:44 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q13-20020adfea0d000000b0023677fd2657sm12297579wrm.52.2022.11.15.05.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C02771FFBD; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 05/10] docs/devel: add a maintainers section to development process Date: Tue, 15 Nov 2022 13:34:34 +0000 Message-Id: <20221115133439.2348929-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't currently have a clear place in the documentation to describe the roles and responsibilities of a maintainer. Lets create one so we can. I've moved a few small bits out of other files to try and keep everything in one place. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Message-Id: <20221111145529.4020801-6-alex.bennee@linaro.org> diff --git a/docs/devel/code-of-conduct.rst b/docs/devel/code-of-conduct.rst index 195444d1b4..f734ed0317 100644 --- a/docs/devel/code-of-conduct.rst +++ b/docs/devel/code-of-conduct.rst @@ -1,3 +1,5 @@ +.. _code_of_conduct: + Code of Conduct =============== diff --git a/docs/devel/index-process.rst b/docs/devel/index-process.rst index d0d7a200fd..d50dd74c3e 100644 --- a/docs/devel/index-process.rst +++ b/docs/devel/index-process.rst @@ -8,6 +8,7 @@ Notes about how to interact with the community and how and where to submit patch code-of-conduct conflict-resolution + maintainers style submitting-a-patch trivial-patches diff --git a/docs/devel/maintainers.rst b/docs/devel/maintainers.rst new file mode 100644 index 0000000000..05110909d1 --- /dev/null +++ b/docs/devel/maintainers.rst @@ -0,0 +1,106 @@ +.. _maintainers: + +The Role of Maintainers +======================= + +Maintainers are a critical part of the project's contributor ecosystem. +They come from a wide range of backgrounds from unpaid hobbyists +working in their spare time to employees who work on the project as +part of their job. Maintainer activities include: + + - reviewing patches and suggesting changes + - collecting patches and preparing pull requests + - tending to the long term health of their area + - participating in other project activities + +They are also human and subject to the same pressures as everyone else +including overload and burnout. Like everyone else they are subject +to project's :ref:`code_of_conduct` and should also be exemplars of +excellent community collaborators. + +The MAINTAINERS file +-------------------- + +The `MAINTAINERS +`__ +file contains the canonical list of who is a maintainer. The file +is machine readable so an appropriately configured git (see +:ref:`cc_the_relevant_maintainer`) can automatically Cc them on +patches that touch their area of code. + +The file also describes the status of the area of code to give an idea +of how actively that section is maintained. + +.. list-table:: Meaning of support status in MAINTAINERS + :widths: 25 75 + :header-rows: 1 + + * - Status + - Meaning + * - Supported + - Someone is actually paid to look after this. + * - Maintained + - Someone actually looks after it. + * - Odd Fixes + - It has a maintainer but they don't have time to do + much other than throw the odd patch in. + * - Orphan + - No current maintainer. + * - Obsolete + - Old obsolete code, should use something else. + +Please bear in mind that even if someone is paid to support something +it does not mean they are paid to support you. This is open source and +the code comes with no warranty and the project makes no guarantees +about dealing with bugs or features requests. + + + +Becoming a reviewer +------------------- + +Most maintainers start by becoming subsystem reviewers. While anyone +is welcome to review code on the mailing list getting added to the +MAINTAINERS file with a line like:: + + R: Random Hacker + +will ensure that patches touching a given subsystem will automatically +be CC'd to you. + +Becoming a maintainer +--------------------- + +Maintainers are volunteers who put themselves forward or have been +asked by others to keep an eye on an area of code. They have generally +demonstrated to the community, usually via contributions and code +reviews, that they have a good understanding of the subsystem. They +are also trusted to make a positive contribution to the project and +work well with the other contributors. + +The process is simple - simply send a patch to the list that updates +the ``MAINTAINERS`` file. Sometimes this is done as part of a larger +series when a new sub-system is being added to the code base. This can +also be done by a retiring maintainer who nominates their replacement +after discussion with other contributors. + +Once the patch is reviewed and merged the only other step is to make +sure your GPG key is signed. + +.. _maintainer_keys: + +Maintainer GPG Keys +~~~~~~~~~~~~~~~~~~~ + +GPG is used to sign pull requests so they can be identified as really +coming from the maintainer. If your key is not already signed by +members of the QEMU community, you should make arrangements to attend +a `KeySigningParty `__ (for +example at KVM Forum) or make alternative arrangements to have your +key signed by an attendee. Key signing requires meeting another +community member **in person** [#]_ so please make appropriate +arrangements. + +.. [#] In recent pandemic times we have had to exercise some + flexibility here. Maintainers still need to sign their pull + requests though. diff --git a/docs/devel/submitting-a-pull-request.rst b/docs/devel/submitting-a-pull-request.rst index c9d1e8afd9..a4cd7ebbb6 100644 --- a/docs/devel/submitting-a-pull-request.rst +++ b/docs/devel/submitting-a-pull-request.rst @@ -53,14 +53,10 @@ series) and that "make check" passes before sending out the pull request. As a submaintainer you're one of QEMU's lines of defense against bad code, so double check the details. -**All pull requests must be signed**. If your key is not already signed -by members of the QEMU community, you should make arrangements to attend -a `KeySigningParty `__ (for -example at KVM Forum) or make alternative arrangements to have your key -signed by an attendee. Key signing requires meeting another community -member \*in person\* so please make appropriate arrangements. By -"signed" here we mean that the pullreq email should quote a tag which is -a GPG-signed tag (as created with 'gpg tag -s ...'). +**All pull requests must be signed**. By "signed" here we mean that +the pullreq email should quote a tag which is a GPG-signed tag (as +created with 'gpg tag -s ...'). See :ref:`maintainer_keys` for +details. **Pull requests not for master should say "not for master" and have "PULL SUBSYSTEM whatever" in the subject tag**. If your pull request is From patchwork Tue Nov 15 13:34:35 2022 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: 624827 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2977429pvb; Tue, 15 Nov 2022 05:35:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf47as6Gkjp3Lxuos1sNq575Fsv/GpGZ7Of3yzGyzrOE+dDfy9rDBKgWOAM89RxBqqkH09cg X-Received: by 2002:a05:620a:2692:b0:6fa:b41e:4219 with SMTP id c18-20020a05620a269200b006fab41e4219mr15174730qkp.134.1668519344010; Tue, 15 Nov 2022 05:35:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519344; cv=none; d=google.com; s=arc-20160816; b=fjhWTzOXL1zePqabMRr8X67ZRjvOLG5TgFhy/DHqUmoks3xiQiK+/SUfBPPdA7POFM +i8+kiZoAnbYt16wpB0IakX/WMbNjYhP7IFdeNCPe/IBC+ah1J26ajeNOL3ojDPsTiTR 35VeeC2vLfTCVhVF9jAGXDg0nGc93Bk+CNu290HTRcj38uYXX+xL5jsNktugvKcvRkqf JNH5HOzWkakfg1Dtt1GanHhhLZ8pOvv6RAnMh0cs2rTsFnkeYSSbjZk1224nuo4SLJ+c EGPpDdABXLuLn+nuwLyniSmpDrV9gABT+Tx0hYzJ0LBsku23HsWgjOzn31YQ/COXtLqx aMbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=sww7S1L4kgQAku0tJMD0FzqA1RW7m8mrVqehdeq+qRo=; b=fNNpe9nlzrPlOoRvWDwsS3jiGU9lt0Ar8Tq9f9pzx6L35oKHmbDYt92TKAx+p9zDIk 8jEKzwRHHtM5wrmqXxDumIpt1sAS87776jlSzn5rUEv7bVRaX36moKuwdETKUtLCtBXP eynjMW+9yqvuBsOw1F2WG1D7h3duA2enErb4A3/Yz0fYb3LUs3DR6m3IXNku+fsLtiKt aQ3CWV216xDfKe9x5JLoBgnEStTLL3OZcTA4ffiAKI021TEGoQGiyH5mq/G/QyxNETfD rZgPkFvSWAEPysPa5ThtVbkR4kkObrjiEyIJOVn90+mOUVpKd++gTT08Viqgh6ev8st+ 1caw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=duXxXBbL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 o11-20020ac85a4b000000b003a5092ed97esi7897056qta.465.2022.11.15.05.35.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:35:44 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=duXxXBbL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6B-0006Wk-5o; Tue, 15 Nov 2022 08:35:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5S-0006IK-AI for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:53 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5Q-0004L1-Tu for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:50 -0500 Received: by mail-wr1-x42f.google.com with SMTP id bs21so24290697wrb.4 for ; Tue, 15 Nov 2022 05:34:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sww7S1L4kgQAku0tJMD0FzqA1RW7m8mrVqehdeq+qRo=; b=duXxXBbL5Qh8cwi5tQgBdx+Jg5P20Wv+tAX5bwAJD98fbL+VMU4ttsel7oVDNXC03N pPXEH6+yD18Ge4231W/+PLGfdJQeQmqOixv2uQm05EsZeMUzzKn7fPsLauFCY/zkkg6o sR5sndPfuJn2TusJwMWzNxm2BXnR7Y6v9zQA4llOJYSd+dm1aD0n4TD13GV2aEB3iQIv Sc6/Zdy53f6PkVzMNYOooMa2yddPG47vhf3sWBUd1LKJmuXkIX5fEaNikRd3BexRzr6Q 8jcYEkxfT2yPXttl1ECGm3miFLp1gq2gX0nexf8Wm/2XGsb5qChg3M7tt/0h0W5259vI ZnEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sww7S1L4kgQAku0tJMD0FzqA1RW7m8mrVqehdeq+qRo=; b=BObBIFHhyJzeP7g3+VLeH7ldQDMbV7SptCOVJ3a5s8hR7iJlmoBSI32j06vZKlykrN tILx7CecRHYyHSe5ZTq4BSjwnJ5K+hMuGH69URTuruUqqZ2SubPe/FvZdeH0UTxYlIde 2oAz1x+vF9aJ1KSoqZSudrVgePR2Q1LQJ1zxepEHFw1J3/IabMgofUrJEzgNsL5qWbWM hfPgIBuZlKf0+bCKAgCK2XmVHT/zT838RBeUl3/iJ3enoyHI3TWbEUV9NrzpSYnDgtyj +3A60LKqvgu1AmIj7MO6AOh/LexuUngg18yKx7ao+U/sCAfde7kGzuXqt5KiSvh9ZsJj r8/w== X-Gm-Message-State: ANoB5pkStRM6T41sKse3gNmmDZOZhqokfXWh6Dx5xNTke5MlSlR28Dni IZ/xcdwllv8JS1yBOaC7uwuC9rPNHkRjzw== X-Received: by 2002:a5d:6e07:0:b0:238:3d63:5736 with SMTP id h7-20020a5d6e07000000b002383d635736mr11077813wrz.513.1668519287147; Tue, 15 Nov 2022 05:34:47 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o39-20020a05600c33a700b003b47e75b401sm20164310wmp.37.2022.11.15.05.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:43 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D65A51FFBE; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 06/10] docs/devel: make language a little less code centric Date: Tue, 15 Nov 2022 13:34:35 +0000 Message-Id: <20221115133439.2348929-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We welcome all sorts of patches. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Message-Id: <20221111145529.4020801-7-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index fec33ce148..9c7c4331f3 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -3,11 +3,11 @@ Submitting a Patch ================== -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 submitting patches. If you follow these, you'll help -make our task of code review easier and your patch is likely to be -committed faster. +QEMU welcomes contributions to fix bugs, add functionality or improve +the documentation. However, we get a lot of patches, and so we have +some guidelines about submitting them. If you follow these, you'll +help make our task of code review easier and your patch is likely to +be committed faster. This page seems very long, so if you are only trying to post a quick one-shot fix, the bare minimum we ask is that: From patchwork Tue Nov 15 13:34:36 2022 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: 624831 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2978028pvb; Tue, 15 Nov 2022 05:36:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf7DjWfuT4sYbrxM3RkxHfcPNFT4l1B3+dKvxqXFORs3+PwYzjybtFHgJdmf+7jwCqsm7qyV X-Received: by 2002:a05:622a:4297:b0:3a5:9e4f:9d91 with SMTP id cr23-20020a05622a429700b003a59e4f9d91mr16421789qtb.624.1668519406570; Tue, 15 Nov 2022 05:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519406; cv=none; d=google.com; s=arc-20160816; b=cK4svNJlF9YYoIFeUu/SRf4UBqTZkrYdj4nsF6W0cR6+EJzJvG7lV3YeHeORI48HEw SCYePIZtUECt/0Azh4lqf/vYhoiU72H/il8uxp9iKmMYUDKjguxX1n86v/UseQNShHot 5DC3EmbHyX2v1fTGTd3Xye4Nd9bxbhn0gLXK58UB+PWbAegbpS1h6FU/eTSc3zZmxwp6 P14tpLfjsPzjsnkY39SA4zptvPJWWhK5eB0SgusI6BDzJp9TyVD8wYCNLwb2aAm3/UNY uyguZWGLHDXP4iYnN0maWPwvMSgbP9hD1ZsaQfBpNYEJGPIRvigZsGczvHS45qgRm33h laFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=vFHZHnJKPSci7uDkM2NVwinZ5Gudl28BkgH8YMFGrRU=; b=aKlx5UgdNO3nFMlYNSNhL0RMYphBVICr1BtxUMitHNwgvi81wZGFG3Hfr4lk5xrMT3 U4+WR8d8nHyxjypu/9Vu8tCKayziVTN1RrOQBL/xWYUFJ9rXiIH1IaDlC8AtIf3xqTPt hWEFY9LBJ5ARaoFyjtoV/H6TqXsLnsnp+7ZoyTmaxWaTPJSdEdI59iqhOCd1R9SqvOj8 D/pE+6eY/LYBP16iDTMRIrJrMkQLXcS/1GWCoj0IVPiBhDJ4Szneydt310OxWFAnNCl6 NE7xycxh5nKfQ41lXiZRXw1RwG7IBhcIFymjEuf0X3oPAIwMksWsVtvgPB2Yz99xGGxj cqkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZVL59jkO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 br20-20020a05622a1e1400b0039a1d73d2dcsi7202950qtb.226.2022.11.15.05.36.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:46 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=ZVL59jkO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6d-0006XF-6H; Tue, 15 Nov 2022 08:36:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5U-0006IX-KL for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:54 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5S-0004LA-EX for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:52 -0500 Received: by mail-wr1-x431.google.com with SMTP id d9so19575102wrm.13 for ; Tue, 15 Nov 2022 05:34:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vFHZHnJKPSci7uDkM2NVwinZ5Gudl28BkgH8YMFGrRU=; b=ZVL59jkOKVkXnx6SEWK9U9dTL40k22JvWICIao1xXW6z+SemjxzwUhTL3Q6HefH5sX pK5W3I/0LyFDiXjSDCoup3qQ+yV5Lp4Le/kZgk8Z8kX4ClVGgAyhMOLiCZVW8KUdZBqj PPfP34F4KOaDRCbMZ4PvnzRtb75cPgmss8EvH6/TjvNI7T2QPs8LyhGpgTkEjNNXwF/Y 2oXBijRQ1rqjStQkn/9ZxUqdJHqFdi2w52T9xt+btOXiM79rJTb/Q8QyE1cZXvVweXZq KS2eIQoCZN9R5TDGpbP9PM5uauT3xvsbOZiO4PJYJmoG1tT3cnNz9GODjHDSXw9XiZIJ 6rRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vFHZHnJKPSci7uDkM2NVwinZ5Gudl28BkgH8YMFGrRU=; b=mgqQuTjAmcGcPFGuSxVKBOCImz7b0+oY7Nw5XUo1mpWYsHkc6CVQ7xFSDntyrYIdE9 IssgUGEfoxBcrIQSALMP1AqeUyb4i6PffcLrSvOBV1VNpjl7GXKMfATjedwl5Y7XTbUU Wtkgwc+SYrvgQ84RNCRAOZaMa2+bYPuRSqrr+y8kB/JIwRge0Glch6tEAfwfuqrmvJU/ Vr/CnFvVaZis4I5CR0V0v8l0SttglfMqaK7EFKtcn4OEZ5yX+clmXEmFQjHi/0iqR6v3 VyWKqHwx/qyw3ic0fQnOjoE1di7lq6G0BzICesj9cRn2fIeihixDDy6ZcauQQYALHWTY sqdw== X-Gm-Message-State: ANoB5pminho0tBb8IlJfizoy0oHBdMxcWxWisCqK/TjO4di82eAD3yub Po8vvp/ti1IAirhnkgLXUeoG4nMX98ZMOA== X-Received: by 2002:a5d:4c44:0:b0:236:c45d:e268 with SMTP id n4-20020a5d4c44000000b00236c45de268mr11225596wrt.74.1668519289028; Tue, 15 Nov 2022 05:34:49 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p5-20020a05600c358500b003c6b9749505sm24354238wmq.30.2022.11.15.05.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:43 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ED98E1FFBF; Tue, 15 Nov 2022 13:34:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini Subject: [PULL 07/10] docs/devel: simplify the minimal checklist Date: Tue, 15 Nov 2022 13:34:36 +0000 Message-Id: <20221115133439.2348929-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The bullet points are quite long and contain process tips. Move those bits of the bullet to the relevant sections and link to them. Use a table for nicer formatting of the checklist. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Message-Id: <20221111145529.4020801-8-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 9c7c4331f3..1f2bde0625 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -12,25 +12,18 @@ be committed faster. This page seems very long, so if you are only trying to post a quick one-shot fix, the bare minimum we ask is that: -- You **must** provide a Signed-off-by: line (this is a hard - requirement because it's how you say "I'm legally okay to contribute - this and happy for it to go into QEMU", modeled after the `Linux kernel - `__ - policy.) ``git commit -s`` or ``git format-patch -s`` will add one. -- All contributions to QEMU must be **sent as patches** to the - qemu-devel `mailing list `__. - Patch contributions should not be posted on the bug tracker, posted on - forums, or externally hosted and linked to. (We have other mailing lists too, - but all patches must go to qemu-devel, possibly with a Cc: to another - list.) ``git send-email`` (`step-by-step setup - guide `__ and `hints and - tips `__) - works best for delivering the patch without mangling it, but - attachments can be used as a last resort on a first-time submission. -- You must read replies to your message, and be willing to act on them. - Note, however, that maintainers are often willing to manually fix up - first-time contributions, since there is a learning curve involved in - making an ideal patch submission. +.. list-table:: Minimal Checklist for Patches + :widths: 35 65 + :header-rows: 1 + + * - Check + - Reason + * - Patches contain Signed-off-by: Real Name + - States you are legally able to contribute the code. See :ref:`patch_emails_must_include_a_signed_off_by_line` + * - Sent as patch emails to ``qemu-devel@nongnu.org`` + - The project uses an email list based workflow. See :ref:`submitting_your_patches` + * - Be prepared to respond to review comments + - Code that doesn't pass review will not get merged. See :ref:`participating_in_code_review` You do not have to subscribe to post (list policy is to reply-to-all to preserve CCs and keep non-subscribers in the loop on the threads they @@ -229,6 +222,19 @@ bisection doesn't land on a known-broken state. Submitting your Patches ----------------------- +The QEMU project uses a public email based workflow for reviewing and +merging patches. As a result all contributions to QEMU must be **sent +as patches** to the qemu-devel `mailing list +`__. Patch +contributions should not be posted on the bug tracker, posted on +forums, or externally hosted and linked to. (We have other mailing +lists too, but all patches must go to qemu-devel, possibly with a Cc: +to another list.) ``git send-email`` (`step-by-step setup guide +`__ and `hints and tips +`__) +works best for delivering the patch without mangling it, but +attachments can be used as a last resort on a first-time submission. + .. _if_you_cannot_send_patch_emails: If you cannot send patch emails @@ -314,10 +320,12 @@ git repository to fetch the original commit. Patch emails must include a ``Signed-off-by:`` line ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For more information see `SubmittingPatches 1.12 -`__. -This is vital or we will not be able to apply your patch! Please use -your real name to sign a patch (not an alias or acronym). +Your patches **must** include a Signed-off-by: line. This is a hard +requirement because it's how you say "I'm legally okay to contribute +this and happy for it to go into QEMU". The process is modelled after +the `Linux kernel +`__ +policy. If you wrote the patch, make sure your "From:" and "Signed-off-by:" lines use the same spelling. It's okay if you subscribe or contribute to @@ -327,6 +335,11 @@ include a "From:" line in the body of the email (different from your envelope From:) that will give credit to the correct author; but again, that author's Signed-off-by: line is mandatory, with the same spelling. +There are various tooling options for automatically adding these tags +include using ``git commit -s`` or ``git format-patch -s``. For more +information see `SubmittingPatches 1.12 +`__. + .. _include_a_meaningful_cover_letter: Include a meaningful cover letter @@ -397,9 +410,19 @@ Participating in Code Review ---------------------------- All patches submitted to the QEMU project go through a code review -process before they are accepted. Some areas of code that are well -maintained may review patches quickly, lesser-loved areas of code may -have a longer delay. +process before they are accepted. This will often mean a series will +go through a number of iterations before being picked up by +:ref:`maintainers`. You therefore should be prepared to +read replies to your messages and be willing to act on them. + +Maintainers are often willing to manually fix up first-time +contributions, since there is a learning curve involved in making an +ideal patch submission. However for the best results you should +proactively respond to suggestions with changes or justifications for +your current approach. + +Some areas of code that are well maintained may review patches +quickly, lesser-loved areas of code may have a longer delay. .. _stay_around_to_fix_problems_raised_in_code_review: From patchwork Tue Nov 15 13:34:37 2022 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: 624835 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2979660pvb; Tue, 15 Nov 2022 05:40:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf41LTSe7c/Tr1c0tx3TzCm7noZJ1eBXn4lez/JinxYnuPZ18mM9Mbp1cFVM3gv2K8DWleUI X-Received: by 2002:ad4:5a41:0:b0:4b1:b4fe:fb2 with SMTP id ej1-20020ad45a41000000b004b1b4fe0fb2mr16829834qvb.70.1668519603456; Tue, 15 Nov 2022 05:40:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519603; cv=none; d=google.com; s=arc-20160816; b=yE+L8Hp3+7SvnKUxqj1BKfo22QeZRRUmDZoNT/kL/geymT954FgZOzn4UsEex3Iw5v p9AHxI5QtVSykP57P8IY/z3jjIkeDzZqNF6A71Za/KigPlUs/Ws5wmeUhxvrPZanq/0a Q+4xKvmvkqTvakNH6+xTggjp48WsDz9n8aICvPC/HsTU/b32KIatTWR5Va5Eqo8X40ot ay/weQf1MA28P5e933Z9xaf25KUrL7pP6OOMc1kKTHEQDNfb/zTcsmJeSsmtpYrbb9Y+ AfkKp0xKitF2D6vaE4FlTowRRJgKAqCz8IFoKp9oPG4wUZkrqNMDGcASIZpVx5BrDKhy KeiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=aRZ/eD6ZaUedeEXWQl7NVWa5eF5sUkL83SXNmlmtL6M=; b=XNNAxVGWSfv94V3Vua2BXOZ3NuSdFvCh6NZLRWM9WuLiCdFkeTOJm6vmhUijG49uS2 RDbgurbZzulGxY6x4jsy+nRBOwx0OM2Vh/ftym+Se7EPQeMuio41Kt+aYEB06RG/WGXd GosNum1NjpGisEgncc/wLSYUhYxROgEorhe9b0hkHOwMouwQxbBYgr2JM3qvOC28CzNn 3XhQObtuvuYW0BONsyvRMtI6bPf0h70AmJsebwHNtcmVPXytiGfwg6CL8pGNyJfs3nh8 xCZbddgRkJu5S5Si5KXwe5LBzxOOeL5JIX9sJor3xNVDyY/etIXdMx0sOOtq4JMLCe5Y npRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rnEokUju; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 bt7-20020ac86907000000b003a573ba0b6asi7687912qtb.761.2022.11.15.05.40.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:40:03 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=rnEokUju; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6n-0006rX-SF; Tue, 15 Nov 2022 08:36:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5Y-0006JF-0u for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:58 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5W-0004LV-1L for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:55 -0500 Received: by mail-wm1-x32c.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso13122183wme.5 for ; Tue, 15 Nov 2022 05:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aRZ/eD6ZaUedeEXWQl7NVWa5eF5sUkL83SXNmlmtL6M=; b=rnEokUju9x1/kOw2T+ajwmb79WymaOYNfjgU3wpdoW1bf2srEF6jqXxE1cJ3gjduas 55iBpdr01tqskVYjSeTk0ZuPCkq1GGlDuPqktegNe0yu8ggC//Crzzx54XPaRCbXIDdn julCoznnbK007JwVUzwj/UsuVYVcAWe7kY6DKBOKUekV5QAKvzQC6hODg6s5hW1V6IKi Z6EAB/3Xkvx3sQ3YWvdNP3/f01vN49xRfUJ/tWGbJTn1541KbFFrBNJdKmPZ9SNFrDIT ANf94hcdnZqIFmCrwX2+hq4WkuktrXa16cYIlm+bqSBxQyTiQMjJBwruZ4S8xtbOCWRP 6Ejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aRZ/eD6ZaUedeEXWQl7NVWa5eF5sUkL83SXNmlmtL6M=; b=rRzprAJy7pRZCIZrEoVhaGefsaA9G92epitcInua2JUO5I5YMfYEt7WRQmEFmEg0TU PoYlods14yLXAB+a1uvG+rwwVfCAqvJIBNJb/OGxRzntEIPXeVfiFk3u5bF+xfERiAMY +5P9JAu3ZaJn0oS2AB9+U6R0f00J9kKfaxMxgtFCEwBJ1FgbK28XLCfr51Cwi/DGa6yB HCPp1t4Yskd5F7aqmni8OVB7insTvEZ0MQyAdP51Gh3BQhgpj6YxeOjxymSGEPY/9gzz Fteb58oIDCUPoXt+hrle0hejhNetf2MGGhMM66W4jD3a6nt1s1gEVwxrpHNaUjTCgzRe eEYQ== X-Gm-Message-State: ANoB5pn9NzLJZHSGww2j+pEWZr6JnSQxgdAFzy6ESdn43m68rnTrJlAB hSbewF0Golfil9o4vshYQQ7gWg== X-Received: by 2002:a1c:f204:0:b0:3cf:6fe0:b16a with SMTP id s4-20020a1cf204000000b003cf6fe0b16amr514899wmc.28.1668519291557; Tue, 15 Nov 2022 05:34:51 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id fc18-20020a05600c525200b003b49bd61b19sm23605563wmb.15.2022.11.15.05.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:43 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 119911FFC0; Tue, 15 Nov 2022 13:34:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Markus Armbruster , Paolo Bonzini Subject: [PULL 08/10] docs/devel: try and improve the language around patch review Date: Tue, 15 Nov 2022 13:34:37 +0000 Message-Id: <20221115133439.2348929-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It is important that contributors take the review process seriously and we collaborate in a respectful way while avoiding personal attacks. Try and make this clear in the language. Signed-off-by: Alex Bennée Reviewed-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Message-Id: <20221111145529.4020801-9-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 1f2bde0625..80e8693bb6 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -434,14 +434,20 @@ developers will identify bugs, or suggest a cleaner approach, or even just point out code style issues or commit message typos. You'll need to respond to these, and then send a second version of your patches with the issues fixed. This takes a little time and effort on your part, but -if you don't do it then your changes will never get into QEMU. It's also -just polite -- it is quite disheartening for a developer to spend time -reviewing your code and suggesting improvements, only to find that -you're not going to do anything further and it was all wasted effort. +if you don't do it then your changes will never get into QEMU. + +Remember that a maintainer is under no obligation to take your +patches. If someone has spent the time reviewing your code and +suggesting improvements and you simply re-post without either +addressing the comment directly or providing additional justification +for the change then it becomes wasted effort. You cannot demand others +merge and then fix up your code after the fact. When replying to comments on your patches **reply to all and not just the sender** -- keeping discussion on the mailing list means everybody -can follow it. +can follow it. Remember the spirit of the :ref:`code_of_conduct` and +keep discussions respectful and collaborative and avoid making +personal comments. .. _pay_attention_to_review_comments: From patchwork Tue Nov 15 13:34:38 2022 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: 624832 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2978670pvb; Tue, 15 Nov 2022 05:38:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/MUrzrP3VCbHVZTOPhmvLJuF1oqmtLx5ujKPyeV8Jaa7ZnCX8d3m13aV1OUunqyT2cH+B X-Received: by 2002:a0c:e8c5:0:b0:4bb:e3f4:6ee0 with SMTP id m5-20020a0ce8c5000000b004bbe3f46ee0mr16595906qvo.54.1668519488696; Tue, 15 Nov 2022 05:38:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519488; cv=none; d=google.com; s=arc-20160816; b=u7qhmx0dG2lQK9DFmca3sd7891FfLPxPELz2ZblZQFvs5igwWTsA5bZwU8HkxEkU48 +8T2PM7EKNQRSLu54xQHDXXmiMchC1tkiDrJdM6Li/0Zg0R7cZWV91+m3+2jYGTTeWq5 Y3LWCXnNoGpLZ7cPvum5uuGxe4Z3PGhcfmFa4GbZc9r6zm34bniSgFd0qdOvwLbWP9Xy D3wsd3KegulgVc2OLwCBOmRXYPvxO4WIcAncI+7QYlgnzCypmmFy2sNszSpsyagBWxCm 0usEW//1qM8nHWi9qzbvWhij34PtMz5xU+/Zx8izzwZK6KFB2LX86N5nrRNW+cxIk4Sh 90Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=m8ejrVwLiLoS+pUm7oqY+yG/9wMKF0S3iW/Yln0D5sU=; b=Nm72K6VeNTTPtGr5fhF7971/rV6/Ki8K1kWcX6AA3vgaVPAbGeFPvLGTKx2ONuxWmx vecInB1y31Bch+N3BV+6YfSuqwa3UqIZZVTHTBLFKd28NcjukFZK1MqHmZq/SgkUbNR1 FQ8lZZUI4vHEdJcXrrqioh4FppYYkEjrE2Qv1zu783zj2cCq0qktgmQf2N6gFF/bvGAO JHOmYIyjeOwyDxLR1Zb1ncomG5Y83FTtaDAldEznlQDfuX1u6esdW02jS2BABI3/18O2 2X6EQGdT4t/boseeEB4AppXt3crR731ofrPW26Y72llzvXtsPO0miKkZ0ANeylb21MX2 msYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H4fvM+jc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 o10-20020a05620a2a0a00b006fa98334799si8253450qkp.684.2022.11.15.05.38.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:38:08 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=H4fvM+jc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6p-0006wM-AE; Tue, 15 Nov 2022 08:36:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5a-0006Jp-5m for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:59 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5Y-0004Ll-Nn for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:57 -0500 Received: by mail-wr1-x42f.google.com with SMTP id a14so24304161wru.5 for ; Tue, 15 Nov 2022 05:34:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m8ejrVwLiLoS+pUm7oqY+yG/9wMKF0S3iW/Yln0D5sU=; b=H4fvM+jcpWaWe9EgIc/A338bMvcnlB4oVKZiUfcP8quCr1xxVVUm8bQecjECRuMu2I U9rvqH8owCzhHlL8//nz9zXogsj8adbT6l8y3OA62RpPuKCqZATkF/W4cgZsl0DAZPtf ay4kXBvpdMA+Gtiae2BnnjnsgAoXuZE+UWQRv2hQ84E4GtCpw3QlYeHDDMVGlv/khP7p d7uYtegpvu42aAFa6sQD1SyH1rZrBzj5t4TSxc8rPlEkaTke3BLiJktAe6a2RifN8SYR eYvjLRIFk1CuITJZpw26aol0ums9kRtck+UPICOidMh0WfLPtUekfokshS7ZXHi+Xjpb MfbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m8ejrVwLiLoS+pUm7oqY+yG/9wMKF0S3iW/Yln0D5sU=; b=FNtBJeSwrjC/MAC1WhvtEX7hksoTZPWWaAQekf5YUbxxgLfRJJC6iHsv394E2Sc/vf ZXvooXdzZFB5ZxlG1sbHq/mxfx1oIL5XBFveV4Dt/ViMjmKCEsXZCFVMIEdTt2xEViKD 9S/uG6/2AmkhGfz63w6Y4tOaxEEGUhO9ztcW1pUTkoxy84xegrxqXSqjZBiXKqXaFswv hDuCrgZCxtXWfrDDOkZzY4i0fTCEy6G4vM8fGOIsXUrNW7zV1JTTUpJNCht+aTesNi6B CwxrX63UjbpEa0EIfuVVPF69FF7/CJlNZ7xNP2iF+9OTLlj03I1ONek1929aupvrtwCh nAyg== X-Gm-Message-State: ANoB5plxQI6o5Lk0DOFfN5rh4CrD8wDSXMC3Mb2mEIkJv6wwyPq/dzZq t022DEWpctg+vza5aAeLjY/UVw== X-Received: by 2002:a5d:6289:0:b0:236:ea8:a410 with SMTP id k9-20020a5d6289000000b002360ea8a410mr10256026wru.128.1668519294796; Tue, 15 Nov 2022 05:34:54 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j13-20020a5d452d000000b0022cbf4cda62sm14865421wra.27.2022.11.15.05.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:44 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2A4871FFC1; Tue, 15 Nov 2022 13:34:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/10] tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg Date: Tue, 15 Nov 2022 13:34:38 +0000 Message-Id: <20221115133439.2348929-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell On my machine, a debug build of QEMU takes about 260 seconds to complete this test, so with the current timeout value of 180 seconds it always times out. Double the timeout value to 360 so the test definitely has enough time to complete. Signed-off-by: Peter Maydell Signed-off-by: Alex Bennée Message-Id: <20221110142901.3832318-1-peter.maydell@linaro.org> Message-Id: <20221111145529.4020801-11-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 571d33882a..2be4be395d 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -116,7 +116,7 @@ class BootLinuxPPC64(LinuxTest): :avocado: tags=arch:ppc64 """ - timeout = 180 + timeout = 360 def test_pseries_tcg(self): """ From patchwork Tue Nov 15 13:34:39 2022 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: 624828 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2977601pvb; Tue, 15 Nov 2022 05:36:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf7/QwaQIptylJspJqscVsLVx6SHdmKuSINM4D4E1G/x53gmFZqtynGPFncK2P7U8K2838Zd X-Received: by 2002:a05:6214:2b92:b0:4bb:e8a8:46b7 with SMTP id kr18-20020a0562142b9200b004bbe8a846b7mr17194426qvb.43.1668519364152; Tue, 15 Nov 2022 05:36:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519364; cv=none; d=google.com; s=arc-20160816; b=Sq1la2AKBSX8VM1GofGfvKF3juWgga+euYISplMAIHYtwcvSQZZICYPEaTtujb7Uzt VvBrXopy6KzC3Xi5V/WzbkbiRHalKqxEK0MXs4UqMYLPVsBFMS9jtc1QDpZKJaKTmx8W Z19YrOye0sa0elh4a+DLrQ0AGz/W91M5uxzLqCGrYSj1IULRf8F6uu5u2LhUP3Typ8Ul Iyyonj7Zut0NYBnjy+H82C5MjfI5qxBBESP0ix44SyLsvU8LYZY2VkdptPEPH67uIZTH zrfRjTbADccyY/CPmmiTdZ9R/QzAL4c0t9d24LHrKYj9CSohnbT/SK+kGjN3luxf+Vae z/Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=y/ae5vrQTt28MH0oBWTUQhGDSwBFm3CuIig1VKCkfko=; b=bBbmPdb1i5i/bmTNtsIuyZz98mRc0aIRTfUcy7hbihgO3g4+xnxk/Kn9/cXFyC2SUZ x0HlfjG86x49atmZymX48ZkGe2D8QDiewVXeVs5mTwc2Ww6cY5iFHdBYiGxC+gXQKYTe F2l3u/GUmmi1J3YKLIBznVVYKmG8VAx+KzWWF/L5+RTl7YS0QSCnWTifgWTkDxSe0og7 +UkG3aGTYQvMfllNgdP91G++g5xallutvN1p08ZSUkbsVXceHiXxUVOyFf6xkzCY8Hzv dk2TVQcd/vnewBiLeyfmrdxbkhDdAqwrcBJ/8Oe9EeSsnxbBFRB4JE4dXyG+xzL0y9xy xjCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VbhstaIG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (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 q12-20020a056214194c00b004b3f74336adsi7516868qvk.279.2022.11.15.05.36.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:04 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=VbhstaIG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouw6A-0006WK-VC; Tue, 15 Nov 2022 08:35:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouw5Y-0006JR-UW for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:59 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5W-0004Lf-Nm for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:55 -0500 Received: by mail-wr1-x42e.google.com with SMTP id w14so24273448wru.8 for ; Tue, 15 Nov 2022 05:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y/ae5vrQTt28MH0oBWTUQhGDSwBFm3CuIig1VKCkfko=; b=VbhstaIGZSoipOm6VtzHLRWCMMPE+qGdt9UAk6pQtmLhP08uqG+TOM64tLI1RGhIoe +o86PjLoAs3nCMvC7DRj3mBtgNY02x+8HyGAX3xC+tJItB/xOnF5PHZ8Rc0QrI8Y9ByP B6Oeqiy/PK41wcpcSjUChA5imKerQTItV3/Rts+HmvUzeYXF2i0rBXvcCSG9ISCHSPgq jouz/OdzFTv5Y/l4wNUlSuMVQ2zyrXZH009CWUkSfj/fP44DVeRH70qtsCEluD+lnIAe G9qolV2wA1DcwjVW/q9YSAf+JEAC1RwaYS4vPAfCepEfZny8XMOEah2YU6wmnwFTqMtW Z4Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y/ae5vrQTt28MH0oBWTUQhGDSwBFm3CuIig1VKCkfko=; b=6laLkot7v3vItAwBOFYqjwdGT2+30rwxp8f+nUfdfV98owwPm665ioOmG3jW5iWRue g14jB7o0kItlljdSX8tPIwtkk8CBMlv6z8GoKJYi3wX8kf+P5L5pqTt1L6+eOBCpyE7w 0uqSCWBmmrdZyg76rqID0MYBKm5k6V4DjCVrdIE9qL9mSvjDhH7qQL+FS7V75fZwfuIT toN/ncn4j1/Z5b3AzolqGTDSBwgTzhmF15gP6QcskT5PO+NPyWKBfyLQPK1QZEUSazP3 QiWI/SBiMu5QQ5pxlw0qXJSJAQB3ONw+MJT+aDPu9ZJv0KyR1GFHaXKihfG3gOWF3fWf lLMg== X-Gm-Message-State: ANoB5pkEE+saCLuLgVr2g6VAP4a6T5LmwCs3MIwFnW/V4LQu9yPnnHeQ V0hQlmpsoKsUqD/U8ykjh6eGBw== X-Received: by 2002:adf:e552:0:b0:236:7a97:12da with SMTP id z18-20020adfe552000000b002367a9712damr10691495wrm.237.1668519293233; Tue, 15 Nov 2022 05:34:53 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n13-20020adff08d000000b002364c77bcacsm12435054wro.38.2022.11.15.05.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:44 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 407751FFC2; Tue, 15 Nov 2022 13:34:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 10/10] gitlab: integrate coverage report Date: Tue, 15 Nov 2022 13:34:39 +0000 Message-Id: <20221115133439.2348929-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This should hopefully give is nice coverage information about what our tests (or at least the subset we are running) have hit. Ideally we would want a way to trigger coverage on tests likely to be affected by the current commit. Signed-off-by: Alex Bennée Acked-by: Stefan Hajnoczi Message-Id: <20221111145529.4020801-12-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 7173749c52..d21b4a1fd4 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -494,7 +494,17 @@ check-gprof-gcov: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check after_script: - - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh + - cd build + - gcovr --xml-pretty --exclude-unreachable-branches --print-summary + -o coverage.xml --root ${CI_PROJECT_DIR} . *.p + coverage: /^\s*lines:\s*\d+.\d+\%/ + artifacts: + name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} + expire_in: 2 days + reports: + coverage_report: + coverage_format: cobertura + path: build/coverage.xml build-oss-fuzz: extends: .native_build_job_template