From patchwork Mon Nov 16 12:24:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=cQEEMK3h; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZSwM1Z9Qz9sSn for ; Mon, 16 Nov 2020 23:25:53 +1100 (AEDT) Received: from localhost ([::1]:51502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedZu-0001Vc-7I for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:25:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYX-0001Th-Tp for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:25 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:51103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYW-00037o-8n for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:25 -0500 Received: by mail-wm1-x335.google.com with SMTP id h2so23567988wmm.0 for ; Mon, 16 Nov 2020 04:24:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vHv4EHcIqVjX/nk8AgqAMkp9FkP1WHOt6fzSvyu1HXc=; b=cQEEMK3h469kTNKn+cv+AOMt5eP0GBBv7ROtsjqyUby9+ebseIjkMAOT19cBFMgLQ/ p0rlk2EKbmjb61rpxVbl5Gweq8u3/m6Tzp/Ys1BPn24iiNR3ys23qPjqmHM8yGKGbWhx ac1GyJ+u5sHU4gHrjVSpS/1AgY8seaCgV5pjWv5txsRdRJ7esfwTzV2adHj2AJ7oAKdm d9w9gC2Z60TnfaDYaWUxt1yhCptvlW2c2+SFcFb+FwFjoJEo4LSteqcvemYXl7wZCPxL PoSlTr19wo6hMJTaMLsKKBCeApzqU8lNs2Z8jkZtsjZnbG1WaB37+6LfMbXlpu54h8LY K3Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vHv4EHcIqVjX/nk8AgqAMkp9FkP1WHOt6fzSvyu1HXc=; b=N7BDPitqUqJtPSLOPCI5ExBpSKQntojKAjvOs64RSBUS6XpJJgdYxC1Vjx+BnmbFyg COfU+zcp+PnWsp0dG0ZYJxq7HbQL9+jQS65uQGjzntea1itHIzlK1+p1pygKI4to7bPo xWMlfOlpNUFRYdCdWkEZINuq2QbOKP4DCE6rNhWXbdjpDmB9lcgHIUPd5E0l9jvxy4qM wMPHOsThkk8FDyE8+jwFgGNcziHyRTIAv/8j33PwcqGSROm/raPdIOQ7EqGbTDfuxuZZ Au0CBnb7KVO5tvk8rGYCi0I5ZMmPurZAOCqLiNsoyh20dOXvSnUoNHUphbByMObors23 ArRQ== X-Gm-Message-State: AOAM530z3VEpreI36jxAT9lsp0STQbQPYRHQVnIxehmRFyfA44TXe+ny 5xwIJJyETucj0P3+5mqzv1Ommw== X-Google-Smtp-Source: ABdhPJxbwWRk6RY9E2tws1WsjJHbJOzUnonsWnD0joOlbeNDW+0cMMCNrND/mDURqN/rSkdcS+FtsA== X-Received: by 2002:a7b:c202:: with SMTP id x2mr14950568wmi.48.1605529460860; Mon, 16 Nov 2020 04:24:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t74sm20045679wmt.8.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:18 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF03F1FF87; Mon, 16 Nov 2020 12:24:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/9] plugins: Fix resource leak in connect_socket() Date: Mon, 16 Nov 2020 12:24:09 +0000 Message-Id: <20201116122417.28346-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Euler Robot Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alex Chen Close the fd when the connect() fails. Reported-by: Euler Robot Signed-off-by: Alex Chen Signed-off-by: Alex Bennée Message-Id: <20201109082829.87496-2-alex.chen@huawei.com> Message-Id: <20201110192316.26397-2-alex.bennee@linaro.org> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index a696673dff..319bd44b83 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -292,6 +292,7 @@ static bool connect_socket(const char *path) if (connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) < 0) { perror("failed to connect"); + close(fd); return false; } From patchwork Mon Nov 16 12:24:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=lxXzheFI; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZSx55Yhqz9sSs for ; Mon, 16 Nov 2020 23:26:33 +1100 (AEDT) Received: from localhost ([::1]:54116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedaZ-0002ge-J7 for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:26:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYY-0001UV-Lg for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:26 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYW-00037t-AF for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:26 -0500 Received: by mail-wr1-x42c.google.com with SMTP id p1so18439349wrf.12 for ; Mon, 16 Nov 2020 04:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zd36bEnryeQaHWHJSjvHzqGrH8fim6jYM/QnIrK9Ve4=; b=lxXzheFIEfvO5COIsQ4JTCW6OMHJlZ0ihB8+YzY4xHU6fRQXDMk4EwX1tmiwwZG0RK qGTCdjUyGDUPu3ou1QPtsFo6MmA3j2VETNW1TX4xI7gPsUfXymIubQc64y+ixtwD59Ei IG4M9VX+3QIbu+vAGlr7KuhEcfYV54qOXuD634yxC9n/HdvQhLPSFDByVgYIneqG3j0X GZ7pq8tr4U7UZue4SKht+LrM3zSvX5xHSopqoOr+B1j9UXdcxyCV+7u+SJlSM/2vL1mH kLYUd7msDlVlLNmm7XNbV095l7pm68ZQQMWMPFIRZ16+GJJ8+GRhsjMRyxal+Vv+WfXv BqSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zd36bEnryeQaHWHJSjvHzqGrH8fim6jYM/QnIrK9Ve4=; b=ugc1pjV4HPdcpFe0i/ignADL75TWBDgbdNeymFV0ghcIc4pK6XToFFxczR5SXvd4la BFptrkEmpAvz50KQMBmmM1TwH/7yESjGoxpVugpbn/GBgjxbMhzWUsCd/KkEIqOJAJGj KZF14BBdoLY7aiwUVMWkg+4bK3JhE585lmBjnYdT2WXqTwymsvRBn2C5iWWD03fM4AKo r7Wx0/QndDjj0cAm30vcob/c8RhzMxR7DJ8fuwaoeJp03y91NS+e9g5Zb0hwpzdgyQHV 8guk2b0u54hvlnSaMLoCdFcV13JAmq2GEdyOKJU/1XHYKpo0vjDeza5W2DC0j82rMnKb MRrQ== X-Gm-Message-State: AOAM531eMZIVJKtlSO2ZzAG5TtihXLwrzJUZ6veL2jBeEfkCTi8RKAHe On3HZ2ruDss/seXbVvZEGUyH0A== X-Google-Smtp-Source: ABdhPJz4ZglpDKLLsYXA8f9PIdny4WK+1yZd2OG+M8QRXE9zLQhokRx1lpT76IoQPCNWkfC+0wXccA== X-Received: by 2002:adf:f852:: with SMTP id d18mr18270630wrq.232.1605529462406; Mon, 16 Nov 2020 04:24:22 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q17sm26118448wro.36.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 013761FF8C; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/9] plugins: Fix two resource leaks in setup_socket() Date: Mon, 16 Nov 2020 12:24:10 +0000 Message-Id: <20201116122417.28346-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Euler Robot Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alex Chen Either accept() fails or exits normally, we need to close the fd. Reported-by: Euler Robot Signed-off-by: Alex Chen Signed-off-by: Alex Bennée Message-Id: <20201109082829.87496-3-alex.chen@huawei.com> Message-Id: <20201110192316.26397-3-alex.bennee@linaro.org> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index 319bd44b83..5aad50869d 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -268,11 +268,13 @@ static bool setup_socket(const char *path) socket_fd = accept(fd, NULL, NULL); if (socket_fd < 0 && errno != EINTR) { perror("accept socket"); + close(fd); return false; } qemu_plugin_outs("setup_socket::ready\n"); + close(fd); return true; } From patchwork Mon Nov 16 12:24:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=b1pQUa2E; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZSwf25CPz9sSn for ; Mon, 16 Nov 2020 23:26:10 +1100 (AEDT) Received: from localhost ([::1]:51646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedaB-0001ZB-Rv for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:26:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYa-0001WQ-19 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:28 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYX-00037x-1T for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:27 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 19so23545578wmf.1 for ; Mon, 16 Nov 2020 04:24:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q0zxAwcwYBxpBHl7aUkK6beKSxBJqCkVvaQ7o3vFSac=; b=b1pQUa2E9nj/YN9o0VLCOXTzklCK3hPL0MK+radCP2iofi+zq1ECqT9GuIdQrA+z3F r7406UPfMi+lMQiabjxqng4HMCAgSTCcyJhm0+Z/yNvWuhG7wo5/r0pI9sZjA+uLTi5e 0jukkH0W5XGY4UHlE5FRIZCdmbaRVWWjgDT3qhS5WeqD74wmGZP5RdYXMno2yHk5KTUU AUKA2bhqDAatPx143RRAfeRl9oJDaCmROu72xhZdNgrs3YwC7SHIAu+Z/IJFWHKNJV8h keEU96AzRFW4OALXIKoOGV/4XYwN987L5CeBIKx/392SYxvZyKUWJLLhy//yGzEUfDlr M/lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q0zxAwcwYBxpBHl7aUkK6beKSxBJqCkVvaQ7o3vFSac=; b=ah6uZLBS+TEoxYcivryg1z8jobuKxG4N6i5Imeeat0WR3jiNs/QCwRmyUwonTixAd7 DzAy98hTn31B85E4DPkj3dEZEz4OOo9XbBdSEyPgGf4KxarFTxt+3OY9LBmNSBnWHYcM kJsZrd/798tJU2zw6mjdmTjGLYpw+SMaCi1qeJVwyCfDHs13jscT3sFlfNbXwlSruBFI 4Be7+q8AzJ3gi52/D0/vZVJyRFFFeximRX/uilg0geMjnWqkZEI2NGv2ul4q/xV33q0V ZvwWHwpmGSS0aZfYW38RA63WYSDhTTX0BaVmcnG37HCCD6o7GUv5on2we3hYcjg7MJlz Qfcw== X-Gm-Message-State: AOAM531avbGwSL3CrR1JgTa1OvxfH8Fj8z/iGWJEWVJQJsc5QJNns+ld p267JIZXQS+r9tBOGDln4JCQdg== X-Google-Smtp-Source: ABdhPJxu1hy4uYb/msZFzu/9hW0DfcuaLovCxFGTZ+DIgZSw0sF2PYfOWlYKeVr7VzuVbK32WJ7Abw== X-Received: by 2002:a7b:c77a:: with SMTP id x26mr15262421wmk.63.1605529463753; Mon, 16 Nov 2020 04:24:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e3sm6017716wro.90.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 171EB1FF8F; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/9] meson.build: fix building of Xen support for aarch64 Date: Mon, 16 Nov 2020 12:24:11 +0000 Message-Id: <20201116122417.28346-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Masami Hiramatsu , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Anthony Perard , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Xen is supported on ARM although weirdly using the i386-softmmu model. Checking based on the host CPU meant we never enabled Xen support. It would be nice to enable CONFIG_XEN for aarch64-softmmu to make it not seem weird but that will require further build surgery. Fixes: 8a19980e3f ("configure: move accelerator logic to meson") Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Cc: Masami Hiramatsu Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paul Durrant Message-Id: <20201110192316.26397-4-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 61d883bc07..132bc49782 100644 --- a/meson.build +++ b/meson.build @@ -74,10 +74,15 @@ else endif accelerator_targets = { 'CONFIG_KVM': kvm_targets } +if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] + # i368 emulator provides xenpv machine type for multiple architectures + accelerator_targets += { + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + } +endif if cpu in ['x86', 'x86_64'] accelerator_targets += { 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], } From patchwork Mon Nov 16 12:24:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=d5pz22vL; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZT0s4yPgz9sRK for ; Mon, 16 Nov 2020 23:29:49 +1100 (AEDT) Received: from localhost ([::1]:38736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keddj-0007rv-J3 for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:29:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYc-0001bc-NF for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:30 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYa-00039s-VO for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:30 -0500 Received: by mail-wr1-x42f.google.com with SMTP id s8so18457407wrw.10 for ; Mon, 16 Nov 2020 04:24:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=25kCBizsj7x/H9MBq/7Zh8HdKyedfrYbs0Sj7nFGxRg=; b=d5pz22vLeXK1wHTPtF+ZsxVIjXGA8gl6Tp/KPuXBtayrc3ZztGUFqO9NqNNtYCD6S9 GIqQTWfi7rk11d3aNpYM5Sovu1nZQUg4k78J8N0ovb1RP8rhqjz2ziat2y93gTIR19az oIzdPJAEHeOZ+1ho5ixYDxsdnnSTsvLBGvo0C1S/ZpaCfzu60H/ZhbVXIE/Fz6X2rnuz bGp+15bJpLSMupv0X7HDh/jbzWyiTXsvLQDjR/xUxuiuAC0BgRnrEMAv7S86N9y/PO/J YZ30NYDyOCbsIzdK53/YmkNgrvXL1/EPIj5xyUtm8/JL1r8SstFTI9HT3CYaUmH7ZgB5 9gbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=25kCBizsj7x/H9MBq/7Zh8HdKyedfrYbs0Sj7nFGxRg=; b=WgYb77hUljanm44NEFfMj0gewISzPej0M8/Xhy7zWvcINZq2ijCG4WpYCojTf0peYN kRh4fLfsFxGnO5LuOBKojEczIhAi6PbEpEnNdACHTd/ZqKb5kxwYI5tk5Ky94+SGB7HJ xaAak5bDv2Sxf3vMyUSbgAnY/g+nFEYmbIT57YadDVkngzusNJr46sBggLbQJxW1Qtpj QqdhXHi8ERrh2uv7Di2OuN0dzOV/1syWYPRHUVb53e8iMr+DxWSaELajIWZ8Z3vc99Lu EWxPZ8pZjsSc6y5CltOFJ7WhRn61C387wYzveeqt1nP3tYWh40BnRuui2uR5EDNhSzMD R5hQ== X-Gm-Message-State: AOAM531BtFiESpHNwU8q9rfAFVzhHPq+N7FSJy5G8ML78Bl3tXRsoZ3e IJtJnlUxQlePOO698OI79qLQMw== X-Google-Smtp-Source: ABdhPJwEtjSnLzfG0Ucc13bL7SYSntZMRHeMdUmK/XWx+GdI3vGIWCG0T5avbmxz2LXh+UgnrJ3RnQ== X-Received: by 2002:adf:d84b:: with SMTP id k11mr18703530wrl.305.1605529467569; Mon, 16 Nov 2020 04:24:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t5sm19671024wmg.19.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2DD991FF90; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/9] include/hw/xen.h: drop superfluous struct Date: Mon, 16 Nov 2020 12:24:12 +0000 Message-Id: <20201116122417.28346-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Paul Durrant , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Anthony Perard , "open list:X86 Xen CPUs" , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Chardev is already a typedef'ed struct. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201110192316.26397-5-alex.bennee@linaro.org> diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 1406648ca5..0f9962b1c1 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -28,7 +28,7 @@ int xen_is_pirq_msi(uint32_t msi_data); qemu_irq *xen_interrupt_controller_init(void); -void xenstore_store_pv_console_info(int i, struct Chardev *chr); +void xenstore_store_pv_console_info(int i, Chardev *chr); void xen_register_framebuffer(struct MemoryRegion *mr); From patchwork Mon Nov 16 12:24:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=kUv5YnOu; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZSyC0nqkz9sRK for ; Mon, 16 Nov 2020 23:27:31 +1100 (AEDT) Received: from localhost ([::1]:58646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedbV-0004W5-3m for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:27:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYe-0001gp-LI for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:32 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYc-0003A1-Fd for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:32 -0500 Received: by mail-wr1-x42f.google.com with SMTP id d12so18441991wrr.13 for ; Mon, 16 Nov 2020 04:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5N/dAQ0srBictVseT2rP2fA4AanR0t+DIq+DoGQDUA=; b=kUv5YnOumF/Ptfw2eqBb3oW9vbtrXH2sp4GACYHhA96xfqkjYNrDu1E4hPFaiMhABN 5r6Bp5+qFL+41JkZts4NLOMDU+BOZ7f+B3OxTSrsN4NMQ1sCmvnPaCAgK7AUxbRQBHMz 2eie64PA2/H4D4HRatmXT07ZJAMsiUF2S2iEBlis90fJOUM3ifH+NgoBJ7NHRUe5GSxJ 51rArOQXs0dhUX8EN7kitzVSfDEdlKri/ftf2l6VWkJuIkLMNx4oHB7NGAIgPePTFDsa KOcaFHJBgMjEndAwhqkKbtIf/jfW3DQ88lvtkMKy0vdV8Oahf+jklSClwHom/imIJJtL QtGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I5N/dAQ0srBictVseT2rP2fA4AanR0t+DIq+DoGQDUA=; b=c7ZowIQ3w4lIOBqbiyu1POkv9owjC/uv2Azfn3kcEeos/u64f1DWXK7HGvoN3iopJh CWGTqT4wDrLM62iA+UJ4B9CnsU4EIxXHOlLRJHNf966+43ua0jQ2KnZsWTtmF3alASFX dHVbw/4qLIefc1fSYxvTb08LNAdJLpM75kjar8ObDEoy101rHhlEaYLCQ+1c+UBxhiA1 xxNoGL/DpU1eEf86hrIB4IzQUnGJmzNoBj6N/wJaOPzhJt18cB83R/72fDs3oNmn9YNW XWpKaivVPFrYESX9kjS9Hwp8stDWPjF67fE53+QsAagBUqI1uWm2v8uanEqZqHZ1qusj fAtw== X-Gm-Message-State: AOAM530cgChzkcTXj8tDolOyboIV63Av0NyD0c9T2GYWjiYqxSQCSrg6 j02gh1I2UAcvrWpcLzS4o1BJzA== X-Google-Smtp-Source: ABdhPJxEtcR4ZeY941H3WHkpWZMVMIuDrHc4wCNctDwDHmfdBIFTxqjPSisyc+pQG175SXdcSQDB4A== X-Received: by 2002:adf:e74d:: with SMTP id c13mr19836328wrn.277.1605529469173; Mon, 16 Nov 2020 04:24:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w15sm23012424wrp.52.2020.11.16.04.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4553E1FF91; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/9] stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub Date: Mon, 16 Nov 2020 12:24:13 +0000 Message-Id: <20201116122417.28346-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Paul Durrant , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, "open list:X86 Xen CPUs" , Anthony Perard , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We should never build something that calls this without having it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201110192316.26397-6-alex.bennee@linaro.org> diff --git a/stubs/xen-hw-stub.c b/stubs/xen-hw-stub.c index 2ea8190921..15f3921a76 100644 --- a/stubs/xen-hw-stub.c +++ b/stubs/xen-hw-stub.c @@ -10,10 +10,6 @@ #include "hw/xen/xen.h" #include "hw/xen/xen-x86.h" -void xenstore_store_pv_console_info(int i, Chardev *chr) -{ -} - int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num) { return -1; From patchwork Mon Nov 16 12:24:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=TGSxyuJr; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZSyB1F3mz9sTL for ; Mon, 16 Nov 2020 23:27:30 +1100 (AEDT) Received: from localhost ([::1]:58598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedbU-0004Ut-7T for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:27:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYl-0001oN-DH for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:39 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYj-0003B1-MK for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:39 -0500 Received: by mail-wm1-x332.google.com with SMTP id m125so12184261wmm.3 for ; Mon, 16 Nov 2020 04:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/2liRrUwUK/XXyLL2k39bK5WwC6hOMXMLxY6QbrHJfg=; b=TGSxyuJroYeBgN20M1A9yZqN45c1gb85AebozfWmW+aCLT9YOx0Zaz+qLhD5pHApRW MAkTzxoGGmuf4znMwPIDjZ3xQ16UtFC2UAmFPjC+VdA7OCIIdZjRMIKTZG53EezyfbOU NOkJBPGQpCckVBJnYU3Hptvr8dLhPnpvQzq7gnSqsiqQ3xRvgsdPaRdXh0kCi3ziZY3b 4EeXsy3tQmst6oyMD8A85vUlE+W9ojkH5+DSpNWat8bXwnbgS67pYVw6/maGYRgd9PBT NSUMwp4XQk4TkZxzuAeREzNcmsqXbjcC2glsZUmrufiuf0kp4pYjzkNDB0ovP154aF3b Cw0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/2liRrUwUK/XXyLL2k39bK5WwC6hOMXMLxY6QbrHJfg=; b=q2lO53nlC5Y9wNPmnT+PvAC1IBzyk6qRiBwkMECRzeBKSUNeEbMxKl1RyX7EEuB5Bp or/qBQvKC2s8yNY/DUvtEKltqrCmicqVa3FGh08ujZw/MhHKJRMi1Y/UGVm1SFr7q1NO pBKVgdzbi1smPX+gqHKWXN3TuboshhRTBbkjmv218k73rgxtJsXoKXHvuA39WI/HXlwR eBtsm0HNfQ9W4CgGIssq191rGqplAIhA6JsrHzsMHJml5qeyF7o5u2wKeAJROHXZA7FX qnk510IKSj7iBHLQVzn/h2D2FgQhNLg0fEydIVRPcZTP/pjtKiSPoS1yjIftJrZY5HBn EYZw== X-Gm-Message-State: AOAM530caLyAEjThpvBPGgsO7Ku2p1E6q7kmBemoEyO0jeaLshMoF2mP HzgHFSaFsdm7M9DHEFdDEXdkUw== X-Google-Smtp-Source: ABdhPJx1E1G0J1VrnrHvywFD7YEQ6RNUvRvywroyxiH0X7Rxdu5BkMBvk/u04t/XorehEMZhgbZmiQ== X-Received: by 2002:a1c:3d02:: with SMTP id k2mr15760536wma.183.1605529474027; Mon, 16 Nov 2020 04:24:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s188sm19922233wmf.45.2020.11.16.04.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 598491FF92; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/9] accel/stubs: drop unused cpu.h include Date: Mon, 16 Nov 2020 12:24:14 +0000 Message-Id: <20201116122417.28346-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, "open list:X86 HAXM CPUs" , Colin Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wenchao Wang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201110192316.26397-7-alex.bennee@linaro.org> diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c index 1a9da83185..49077f88e3 100644 --- a/accel/stubs/hax-stub.c +++ b/accel/stubs/hax-stub.c @@ -14,7 +14,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "sysemu/hax.h" int hax_sync_vcpus(void) From patchwork Mon Nov 16 12:24:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=yJAFf4qq; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZT0F3nG7z9sSn for ; Mon, 16 Nov 2020 23:29:16 +1100 (AEDT) Received: from localhost ([::1]:36672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keddC-00070o-IN for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYo-0001vg-EI for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:42 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYm-0003CC-D8 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:42 -0500 Received: by mail-wr1-x435.google.com with SMTP id r17so18509407wrw.1 for ; Mon, 16 Nov 2020 04:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OUmMobUpj5JXbp+PLsouZvAX3qQPm1cOEtWl7FIgmgA=; b=yJAFf4qqdOvgvwzFs6bvcMu9vnX9hnsmc+UxrpNTIqugeXjRxj2R3b1IAPlTZGxcFL Qpf7+RYD0ZghQjwQe4P9s+0M1GFAfpy9LYQZo41QrCCcexPE7uitTHuCVJ/mFSISgO7k gTFp/xUuZD6nseUlaanCfsIL5fRvKiGGuYYxAnzOPiL9/uIpN014FrUE38gT9Zxroe1Z z6giYXLU5K8OKEuSe9gHCoK4qe1h7eLfo087A9sHPVjiIHFjMXv9dKq1j9YZZm5Vbfxg hPKm8gO1Bt+j/ALLuPOnZ2mdST3S08i82bpH4wPZEwK8+Af7oYUp0sEDP9MuaRP2G6jS ry+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OUmMobUpj5JXbp+PLsouZvAX3qQPm1cOEtWl7FIgmgA=; b=ZK/bheaMPxQPhpBivovRHXlz738egVry4MAzMRkA+88PL9ncwla7hSS3/QwCBvl73V 3ioZcMTD9jlgUx2KfucEufjeXlDaN5KVCsC2IyadYbbwoPIYE7Q0t1jKucMRltuKkJTj dvVjFFBqFJbg22CR3sNGlxzX/9+j51Zky4URXatBuq6QcNw8EtOoZK610mXxGyF0vAFe lCpCZp06eP6NOFO3rTA3CxGho7C2uzrroF3l4Kid4gnPuc15yBCSn2vzmm4JCu5+O/2u ZiSb3lNckxuuZBnVbxmNHWafd0XyJYMpFzH0E4HXbzY7ZbA1uvee2afMFw62T7fuqLIs xsyw== X-Gm-Message-State: AOAM531vK8nwpGmbyakcGZ9qFxW8bveRzHd3rm0qsq7OOmjV3Azah1rq u1H1kmdRwr6+QwgHeg6vioEXnm2JRiyyDA== X-Google-Smtp-Source: ABdhPJzr9jQpyYIq2xkNLeR2hKgWRuKgwVI4ytoJB1AHcqbwRFdp9ESOfMJ4QMNiao2XaLb/xaiGdA== X-Received: by 2002:a5d:6992:: with SMTP id g18mr18880546wru.362.1605529478899; Mon, 16 Nov 2020 04:24:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z3sm21650510wrw.87.2020.11.16.04.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F1551FF93; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/9] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off Date: Mon, 16 Nov 2020 12:24:15 +0000 Message-Id: <20201116122417.28346-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Igor Mammedov , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé GCC 9.3.0 thinks that 'method' can be left uninitialized. This code is already in the "if (bsel || pcihp_bridge_en)" block statement, but it isn't smart enough to figure it out. Restrict the code to be used only in the "if (bsel || pcihp_bridge_en)" block statement to fix (on Ubuntu): ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices': ../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized] 496 | aml_append(parent_scope, method); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Fixes: df4008c9c59 ("piix4: don't reserve hw resources when hotplug is off globally") Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Igor Mammedov Message-Id: <20201108204535.2319870-4-philmd@redhat.com> Message-Id: <20201110192316.26397-8-alex.bennee@linaro.org> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4f66642d88..1f5c211245 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -465,34 +465,31 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, */ if (bsel || pcihp_bridge_en) { method = aml_method("PCNT", 0, AML_NOTSERIALIZED); - } - /* If bus supports hotplug select it and notify about local events */ - if (bsel) { - uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel)); - aml_append(method, aml_store(aml_int(bsel_val), aml_name("BNUM"))); - aml_append(method, - aml_call2("DVNT", aml_name("PCIU"), aml_int(1) /* Device Check */) - ); - aml_append(method, - aml_call2("DVNT", aml_name("PCID"), aml_int(3)/* Eject Request */) - ); - } + /* If bus supports hotplug select it and notify about local events */ + if (bsel) { + uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel)); - /* Notify about child bus events in any case */ - if (pcihp_bridge_en) { - QLIST_FOREACH(sec, &bus->child, sibling) { - int32_t devfn = sec->parent_dev->devfn; + aml_append(method, aml_store(aml_int(bsel_val), aml_name("BNUM"))); + aml_append(method, aml_call2("DVNT", aml_name("PCIU"), + aml_int(1))); /* Device Check */ + aml_append(method, aml_call2("DVNT", aml_name("PCID"), + aml_int(3))); /* Eject Request */ + } - if (pci_bus_is_root(sec) || pci_bus_is_express(sec)) { - continue; - } + /* Notify about child bus events in any case */ + if (pcihp_bridge_en) { + QLIST_FOREACH(sec, &bus->child, sibling) { + int32_t devfn = sec->parent_dev->devfn; + + if (pci_bus_is_root(sec) || pci_bus_is_express(sec)) { + continue; + } - aml_append(method, aml_name("^S%.02X.PCNT", devfn)); + aml_append(method, aml_name("^S%.02X.PCNT", devfn)); + } } - } - if (bsel || pcihp_bridge_en) { aml_append(parent_scope, method); } qobject_unref(bsel); From patchwork Mon Nov 16 12:24:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400883 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=y/ltc9Xc; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZT0F1Lw1z9sRK for ; Mon, 16 Nov 2020 23:29:16 +1100 (AEDT) Received: from localhost ([::1]:36746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keddC-00072e-Jw for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYn-0001sP-1W for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:41 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYk-0003BF-QT for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:40 -0500 Received: by mail-wr1-x429.google.com with SMTP id u12so11265673wrt.0 for ; Mon, 16 Nov 2020 04:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=28K6JTDfvyt129r+I2Y/ffL4NilW+jIaq7T324O7hUA=; b=y/ltc9XcSx/9PJfDpz32Bs0tIHeZjqxWILWrGLIQR85yd04f1X1OW5el0sGwiIVJQn 418IUL703JAEAyXMymmwQZiJtlpuM2iqESVfKQcOk8Vi/UdQKYzxehq7pL3Oil1eBe8U uzhQbaG9GYLFDDC0hQEn5ql2I/EuWwNB7yWsy0UmVO2XJTNiHH3RdplwJxyLN8ttBsgO Klxsq29/c8PSUYC1LD1trSfGWbu8EadGMXpjoUi6Xy1A/9yhryBimKgEjiVvfv6OGrzX mAsNKe6sN2LPAo5SwPYDCMOXORF1j3zplrbLXyr0RoNhsGQuAM5rbCmRevLrhvQ6wyQk Go3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=28K6JTDfvyt129r+I2Y/ffL4NilW+jIaq7T324O7hUA=; b=VVhYjjGp0ihLyW8c2h1jD3DdOsu5Pe+L9TfUxowKUyVkUL5msujp7d9zN0nKlwKqoW SFl7JRqT7QmFr/Fu9wfApeAI9yw1D1mudvG7VJYA1rge+42BedyL337vfOifgZfFF2Ah Vmfyv91TFtFuKRwg/sui+6RsRnD2UjQUGeObUvBLw/u4zW9PwL8qSFTbJLfvZETA0F21 TJ0UIG6IdpTwcA+j4ktGG09KxZC3sXNXpk7ioJtLSU+P0WFv69yFXHjRzV4TjgJ6MWRr wggussVmmL5GezjIMYIqY9nav4KygrzaqbSDjSCPKxEC1O6jigZ8xbfEPDkaRtXOhUe4 kSLA== X-Gm-Message-State: AOAM532eGQkICuGtcQ7VE+LkZmrZSgTzm7K3WS54zPTP2MqxWoPh11XI kB6XgfBflChXPP81uwvVhHPQaA== X-Google-Smtp-Source: ABdhPJygdntTybNKUSY3XdieZFgMpvPVxBftljabWbO7MJBIjwSt49trkc3KSCLeTMjIsxY9v1CvGg== X-Received: by 2002:a5d:488f:: with SMTP id g15mr18952642wrq.151.1605529477384; Mon, 16 Nov 2020 04:24:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d134sm19429705wmd.8.2020.11.16.04.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8634E1FF96; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/9] tests/acceptance: Disable Spartan-3A DSP 1800A test Date: Mon, 16 Nov 2020 12:24:16 +0000 Message-Id: <20201116122417.28346-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pavel Dovgalyuk , Cleber Rosa , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This test is regularly failing on CI: (05/34) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_microblaze_s3adsp1800: Linux version 4.11.3 (thuth@thuth.remote.csb) (gcc version 6.4.0 (Buildroot 2018.05.2) ) #5 Tue Dec 11 11:56:23 CET 2018 ... Freeing unused kernel memory: 1444K This architecture does not have kernel memory protection. [nothing happens here] Runner error occurred: Timeout reached (90.91 s) This is a regression. Until someone figure out the problem, disable the test to keep CI pipeline useful. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Acked-by: Thomas Huth Message-Id: <20201109091719.2449141-1-f4bug@amsat.org> Message-Id: <20201110192316.26397-9-alex.bennee@linaro.org> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 8f433a67f8..cc6ec0f8c1 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -13,6 +13,7 @@ import lzma import gzip import shutil +from avocado import skip from avocado import skipUnless from avocado_qemu import Test from avocado_qemu import exec_command_and_wait_for_pattern @@ -1025,6 +1026,7 @@ class BootLinuxConsole(LinuxKernelTest): tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') + @skip("Test currently broken") # Console stuck as of 5.2-rc1 def test_microblaze_s3adsp1800(self): """ :avocado: tags=arch:microblaze diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py index 00c228382b..772633b01d 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -14,6 +14,7 @@ import shutil import logging import time +from avocado import skip from avocado import skipIf from avocado import skipUnless from avocado_qemu import wait_for_console_pattern @@ -280,6 +281,7 @@ class ReplayKernelNormal(ReplayKernelBase): file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'sanity-clause.elf') + @skip("Test currently broken") # Console stuck as of 5.2-rc1 def test_microblaze_s3adsp1800(self): """ :avocado: tags=arch:microblaze From patchwork Mon Nov 16 12:24:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1400887 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=UJKMFjbM; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZT3Y1B9Bz9sPB for ; Mon, 16 Nov 2020 23:32:01 +1100 (AEDT) Received: from localhost ([::1]:43908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedfq-0001d9-MX for incoming@patchwork.ozlabs.org; Mon, 16 Nov 2020 07:31:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYo-0001wD-M5 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:42 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:35292) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYm-0003CH-LP for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:42 -0500 Received: by mail-wr1-x42b.google.com with SMTP id k2so18519840wrx.2 for ; Mon, 16 Nov 2020 04:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B18e+BpFDaCqmpOB60TiGLIYa4fVaamK8mnIgG8BoPM=; b=UJKMFjbMkrTGlQQ91HviaPQUqV+pml8l7ZJulRi/4OjlL1Mi4R2y98n9G3QgMiPyo4 A258JSnUuLOXR9z4LGqVGxpEZmDvzWW/1spkXJYh+hZbg2Iw1C+Ghw+g/Z3TT17DHy2v x6J2nw11VyqPx46fCnBlab1stW4LCJseNmfKB5r8dUKRurVuznU1nNDFanQEj2iXyQDh XNv5qmGhSCq30OJGW+yFy8VYZ4ThZqGzX9WNUIPH3o9Ru+OZgtDefU95Bvb1F5ZH66B6 ocGDxX5x24B+b1WPoB4VPDzbAZ2bc655AxaNTiFbHxzslqur7nrD/J/kzMOvsh7Nwlt4 R8gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B18e+BpFDaCqmpOB60TiGLIYa4fVaamK8mnIgG8BoPM=; b=cVn/2BHLtD4YiQ1SadypS8+ty1F+HVFS4R6o53c/Dwf9kMTcCl/6Z5CKmLwzTXWveW 643LFjz/6lLdRLtSS4XnjA1n+tsx34r2vqorfRE7Lith73fFQX8IO1M7d+9EbPLdJefb Jq0+b9qCGKtmohztAf0oNPzc9e6sXo3iFySOkFYx19usZkf7d1djMVTk0i1dOdH7RhYX 0t0FYtaf40v++ooBXdX7NAEHaMWpzC/XabiPdln0104hcISBXG3PKwR3iHvfzlhJa57C Oenu7jjRv3tleCszLX/Z5d8r4+Gkul4ybdBAKMvKdQlHb9Yd3E3kaOrXl2+zkpKHo4oe fVAA== X-Gm-Message-State: AOAM531MiB6YTx95vdkm20msT25lpZFsk9guvjpkI9W2kqaKmCUGbvtJ NnHqEn+uXw2oFwXMLPCp5WcZzg== X-Google-Smtp-Source: ABdhPJzpevC7AmiT4rtExbt9gGp2z3nzNd+hJVRlxla5ILVpLJ/IXt34NAIA2XpahW/CVSJcApiIjw== X-Received: by 2002:a5d:46c6:: with SMTP id g6mr20048789wrs.170.1605529479146; Mon, 16 Nov 2020 04:24:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u7sm553018wmb.20.2020.11.16.04.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:34 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9D6441FF98; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 9/9] .gitlab-ci.d/check-patch: tweak output for CI logs Date: Mon, 16 Nov 2020 12:24:17 +0000 Message-Id: <20201116122417.28346-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We don't need running commentary for the CI logs and by keeping it short we might just see the problem on the first page. While we are at it flush the previous line so order is maintained between script and sub process. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Message-Id: <20201113174404.19608-1-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py index 0ff30ee077..39e2b403c9 100755 --- a/.gitlab-ci.d/check-patch.py +++ b/.gitlab-ci.d/check-patch.py @@ -45,9 +45,9 @@ if log == "": errors = False -print("\nChecking all commits since %s...\n" % ancestor) +print("\nChecking all commits since %s...\n" % ancestor, flush=True) -ret = subprocess.run(["scripts/checkpatch.pl", ancestor + "..."]) +ret = subprocess.run(["scripts/checkpatch.pl", "--terse", ancestor + "..."]) if ret.returncode != 0: print(" ❌ FAIL one or more commits failed scripts/checkpatch.pl")