From patchwork Tue Nov 10 19:23:07 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: 11895095 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BC2F921 for ; Tue, 10 Nov 2020 19:31:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FA5020781 for ; Tue, 10 Nov 2020 19:31:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zAEKC5V3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FA5020781 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZMa-0007mX-HR for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:31:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEl-0002O6-1K for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:27 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEf-0007Z4-G1 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:26 -0500 Received: by mail-wm1-x343.google.com with SMTP id d142so4321248wmd.4 for ; Tue, 10 Nov 2020 11:23:20 -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=4DPZPtXUvB06zElsXfuHMXGbHWSkYGyuZGmF6mMO7E8=; b=zAEKC5V3yTNdyoHS/6/vzFcBKZDgvgraajbwyQrCZU6BSUGaRX4+K2PqzAQBOJvDQN A4ANkZ+b5ABLVXU8zvjzovfHB4OVx2H545FDnqMESIE5ceN07AWOYMq9hQSCf5AQqxnO nQt7C2Zp8BadnPtX3Y82qmYizm664Vd8+1uUjODotzyq2/VKIYt0L6XIcYH44dUhoddI 4nI6k5emJkZUtMOI3hmLgL7EGobE8opOsACdzAk/Nk9KC6TybIYCFRiuvj//OxWjpy04 KGrDSuMXgkGRO120kIr2EYASkdKdJb6KAqCU6P7IuXEi8yGM3Upmk+dTGlQyVlbjoOR8 v5aQ== 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=4DPZPtXUvB06zElsXfuHMXGbHWSkYGyuZGmF6mMO7E8=; b=n9PeT4mrGry0tplePggLMyI5qDxTiyHuSUV9G80uExRmduyplSuxbiHqH7qOQChsD1 QhfPWzRSOqOqtu3R2cae8ILMjyjf+7OOfKOaGMFL/C4uWAr4I0EULGSviBHLvi3De1cz iZbLIXSh1MUDmS6mID7b9+DbNWOdBX636V1Kot5K4VLo6MjNlIh2Vwh6ic8+JqadcfBm Tf21p5uYTcB7x1cv3mgxSAVPlIY3z4Ui7fcw9GGJQv4gdIEhk8+ZkyuSBo79yxZ9GWQ7 aY6zKojBvWmTA9g99JDiuXcX3JlJllatCX33BouNhJc9/HgiBbyRp2V9V5vQ5/piS7il j3uA== X-Gm-Message-State: AOAM532uAF4U/K5fToNwlJoH/75Bk3FbPn5AIgWc/xYjYx6NcfNujJ2u T87MDjcAjpMKJHNrYF12zJ7B+A== X-Google-Smtp-Source: ABdhPJywP/GD7giOwI1frBJ2P9EiazjT8pBcGUU9SV9xDOsB2u9MpSoj9ngNFnWiBRbZbw0uGbGW3w== X-Received: by 2002:a7b:c3d2:: with SMTP id t18mr741564wmj.112.1605036199502; Tue, 10 Nov 2020 11:23:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 35sm16140929wro.71.2020.11.10.11.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5DBC11FF87; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/10] plugins: Fix resource leak in connect_socket() Date: Tue, 10 Nov 2020 19:23:07 +0000 Message-Id: <20201110192316.26397-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.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 , peter.maydell@linaro.org, =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Euler Robot Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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 Message-Id: <20201109082829.87496-2-alex.chen@huawei.com> Signed-off-by: Alex Bennée --- contrib/plugins/lockstep.c | 1 + 1 file changed, 1 insertion(+) 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 Tue Nov 10 19:23:08 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: 11895089 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B26851668 for ; Tue, 10 Nov 2020 19:25:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 421A82064B for ; Tue, 10 Nov 2020 19:25:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="k96OPj2l" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 421A82064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZGp-0003qC-MS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:25:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEm-0002QB-Bc for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:28 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEk-0007Zo-My for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:28 -0500 Received: by mail-wm1-x341.google.com with SMTP id 10so4331375wml.2 for ; Tue, 10 Nov 2020 11:23: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=jpVEDWP3gfYFFtNFcdA/65BvVndU1vlolgIAVjnzgOg=; b=k96OPj2lfAGXvYOAUo1TF25grRbkg25ULq+/aeOZDHp/Xkrp/BdkO5V3HEOq2akAEJ dOx2ZRRiNsb2LfEmLjcHAcgARqWhDso+WkBILSCXTvCqe9OVMSwvglVKWYii0SkXkAh+ 4qUYEzeHEyOKYsRW/embGlOSLWUT8cMGDoRumw50D9bt8NdmeM/aotIgTtb5V6l+jyTd zP9S8v1ECNYJ/3GRsQZbAS+7ExZxZzaJ4GzxOdRNm9YGetu5gHcKPri9PHpx6J7Ju5Qr 0NntDRNNYGjX1FKGQOVxH6yCp6uyIMXEoPtl826oNVS5+juhDfp8/R1IyHVCn12mqkvz PpoQ== 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=jpVEDWP3gfYFFtNFcdA/65BvVndU1vlolgIAVjnzgOg=; b=s8n7u1JbFvVy23/px6msWnVKlN/KGe2TQYG6QW7/QP0dRDfTMGekSvxnDmXwA+nXX/ X5k/kzMzRaawVYCRJH1mk7Xps51Z5VhLuNbG+pPAFMjiLVEHYbT0OGqv/kht3sWY/9s/ xvF7c7O5xbIbenQjGmDcLc/v09J0m1nQebLdDjEvroyJ8AnK2m2ZnnSiKVXe7Kst8FMo xolJfeaUvtxLDexplWuqWwcdflQRZY3uI/zMppRanq6R9g5DdfKO6DP1jUMiNvIdWEVG w74/0HT3QajL/x8lHlJ+s6eznj8podplpU7M+DfYKX9MSFQpHO/y24PmT40DTVXKBpqT Qr2g== X-Gm-Message-State: AOAM530z3X/xdDz19JN4t+4Q4wqIuwQR5EAoJ1DsaZz297btlmeEM+lo /ez3B2TQ2B4eegsN8hRXNPqHsw== X-Google-Smtp-Source: ABdhPJwX6um96NoI9RclGyJFIX79WTehg7an52FgaBfA99rPPw02m4RrUah+xUAtCWpKfK4Q8hx89g== X-Received: by 2002:a1c:3c44:: with SMTP id j65mr724220wma.13.1605036202249; Tue, 10 Nov 2020 11:23:22 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u5sm3933272wml.13.2020.11.10.11.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 739701FF8C; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/10] plugins: Fix two resource leaks in setup_socket() Date: Tue, 10 Nov 2020 19:23:08 +0000 Message-Id: <20201110192316.26397-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.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 , peter.maydell@linaro.org, =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Euler Robot Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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 Message-Id: <20201109082829.87496-3-alex.chen@huawei.com> Signed-off-by: Alex Bennée --- contrib/plugins/lockstep.c | 2 ++ 1 file changed, 2 insertions(+) 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 Tue Nov 10 19:23: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: 11895185 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 700DF15E6 for ; Tue, 10 Nov 2020 19:37:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1680920678 for ; Tue, 10 Nov 2020 19:37:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WMad8QEf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1680920678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZSA-0003HG-ON for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:37:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEn-0002Ra-Ab for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:31 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEk-0007Zx-OD for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:28 -0500 Received: by mail-wm1-x342.google.com with SMTP id p22so4313714wmg.3 for ; Tue, 10 Nov 2020 11:23: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=Q6f5NplGvUZpqMcUD/6cwL2MqHQLbfGj/tCEmONpAIk=; b=WMad8QEfoDpxvFs8qTHWUIH/mNnx02ac2SrUVKr/6RgNegQbl9DtjHOHjiK6xUbimx vSEmsm7/Oa99+PT1YjoMwYnJkFx0wCdt9zlSpnWRXVKLHKmMSh97FTS2BsEBA0uZ94dl u7b5JVNw2sGJeWGaTG+y77VoUGV1mLrJAXAQnYDvwg/R1sCQPtZ4jTB2sOMvHcGrXWbg FrpfqUHZXw4q+Ua7SenmKXABB0LwbAbpK0stZoy4UNBcZ0XG33RxGG4x2PKv10+Kl0w0 Ef6C2TjOHn/wE1JYhRqrWO2Qs3Di5JrIaTdoQw29RcAqJJuemVK6Gkt3CDKlPxrTSOfA Wdvw== 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=Q6f5NplGvUZpqMcUD/6cwL2MqHQLbfGj/tCEmONpAIk=; b=ZyrJm/GCCfrlwCnXwOWYOoYD4jQ+a50wikLYFA+91I6Bhlc41p9sn1mtcXmsqfNuzX 7sy8X+R5md+XPLMyiez0d61IHBPgz5lTOklZVl1X7YszNCOBb9xUnz8IGgvHoOed4WcJ Z8Nslgr5yPprAEQQTAMtuVv/Rreix3c1mqFKB5eyJHE3L7IHbF9px3P9FfeXKLPeJVYf CQTarH6MCvQ6sNpnS36jpTuc92oTAFb0v6dQPff+Pt9S0rRW+59Seq/fB1QSaIQEZak8 guuToVC0G9mpnbP0LQJhYPAuerU6k7TIH04n0cB+9mnAriLf8L99FVIKEgJDfQM+5J// 0vqQ== X-Gm-Message-State: AOAM532mSs+mYW2YXNxVDJ7PrmnnXnRIqOlSo+5WJc5ulJ4xFB41g1qZ i5IH8hVJW6uBexAVK+ktqUqbBQ== X-Google-Smtp-Source: ABdhPJy9GQvg4GRiygxKMaZOBm+jRtUinB3C0yszrMhDo1FhEUW+Ix1IFr7ILU2qlfv4VOdZMl/s2A== X-Received: by 2002:a1c:7215:: with SMTP id n21mr642417wmc.173.1605036203143; Tue, 10 Nov 2020 11:23:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c8sm18139524wrv.26.2020.11.10.11.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:18 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 89E5E1FF8F; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/10] meson.build: fix building of Xen support for aarch64 Date: Tue, 10 Nov 2020 19:23:09 +0000 Message-Id: <20201110192316.26397-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.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: peter.maydell@linaro.org, Stefano Stabellini , Masami Hiramatsu , Paul Durrant , =?utf-8?q?Alex_Benn=C3=A9e?= , Anthony Perard , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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: <20201105175153.30489-9-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b473620321..ef197f9a6b 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 Tue Nov 10 19:23: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: 11895165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 76493921 for ; Tue, 10 Nov 2020 19:33:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1421220678 for ; Tue, 10 Nov 2020 19:33:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eiSuFCpk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1421220678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZO1-0000Sc-N1 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:33:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEo-0002S8-6w for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:31 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:37242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEl-0007a4-Sq for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:29 -0500 Received: by mail-wr1-x42d.google.com with SMTP id b6so2645292wrt.4 for ; Tue, 10 Nov 2020 11:23:27 -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=gBkEgjV7awvtEg/RUlUyLYVtc42f18uJSH1j4TZVeBA=; b=eiSuFCpkFUCvuaKxPzO1vnOi1gud/W7G7GTv6WfIN6CALMklhYzvmAaHZGhY9HIZf5 WqKRHudZ8IL+U8FIve9wdULV/KdmA1+R64lV9664NK5ozYDA3vYtGs8eBmpJm0u6D1Zr E841WUtTp0iCQNT0qvBF+bVffGVzntKBWuWdM05af4wouBq0nvSPL7rR76rYmsVQU8Rk KqrZGfdDQcegSk4rz/jnXjh+dcwIYVznj0IKuKwYwDgLN1dhNVZTiTCKFNeFnByFGfec ESHxG7w8B1UAdhKgGRN56Dh4C61M3dcDUFBuWsiDvOK6+AeCdnlxAVOwaBuPrGl99mvW SxQg== 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=gBkEgjV7awvtEg/RUlUyLYVtc42f18uJSH1j4TZVeBA=; b=YicJURTEM04KiwwJv+0t8itnSKFf3NnzdrG3U/9ATgxyChQRcEhlG3d6F5PFj9GMPX 9WDY/SzbYtoBEWBkZ+m4xCD3n5eUxtORu1lluplIMcZvIMSy8GBfd47Yv6eC//ixZi64 DXH63jSGqNMo4l9HZ86Korz0IwFeeXwtN1nc1ie0lApqLrUDROBQt18xCGBfkZyAfVu+ ZkhK8yG/YJvLdOGBS2ZPVQw6x78+SsCmTTzA1FGu5S/Q8rRdrO9JcvbuAdvVcZjeSmqc j2byTASr/K9ed5kAPds7PN+9262rs9sjYMRQkPLfGGxIRf8bUqtHgO1I+Scy9Lv1Je3w 5ACg== X-Gm-Message-State: AOAM532cbNUAI0g+IPmY2LexOp+CMjLmshUnLgdUSMHiIBu9gVuC4Q5q iLFAvX+ti1oo/38qT4TNLlErXQ== X-Google-Smtp-Source: ABdhPJxa3cy975GPrMS66E+XZOpqdG7rl0e9DLYbMS13M4jWqT5KLVU3E0q/DBVsCPGl9Li+10Sakw== X-Received: by 2002:a5d:474f:: with SMTP id o15mr24752225wrs.377.1605036206523; Tue, 10 Nov 2020 11:23:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c62sm3929964wme.22.2020.11.10.11.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A08201FF90; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/10] include/hw/xen.h: drop superfluous struct Date: Tue, 10 Nov 2020 19:23:10 +0000 Message-Id: <20201110192316.26397-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-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-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: peter.maydell@linaro.org, Stefano Stabellini , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony Perard , "open list:X86 Xen CPUs" , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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: <20201105175153.30489-12-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- include/hw/xen/xen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Nov 10 19:23: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: 11895187 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCC84921 for ; Tue, 10 Nov 2020 19:37:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 528E120678 for ; Tue, 10 Nov 2020 19:37:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BYj3pLZX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 528E120678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZSE-0003NA-BL for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:37:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEr-0002Sv-5c for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:34 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEn-0007aI-8O for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:32 -0500 Received: by mail-wr1-x434.google.com with SMTP id o15so6143683wru.6 for ; Tue, 10 Nov 2020 11:23: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=OhJqzhnruESxyQBsuUBkTpXlj1KG2mpYOvcyz9G88Zg=; b=BYj3pLZXVoexXGwdJoXo1ydbNurkgF3mKNmPDG3Is3roLOOYY61mRZaAeKYdfR2SjW KxSfs6RQULqqvPzSFB6PN1DtWt5qXqNyLLD5MZlJHlewRYGyEPll6BUdFyVkwmtctZHJ Yq6WfWMDUmfhzZXQGnMOV0Mr5xZQDi3gXQHPL86mry8dGE8K0QCsj+F2vDaaVgKpDWOv gYGBrfXitnqfpKOWTZERUH6IU7koDoj4/oQf2QIKlCNkjqh6I3A1nvV4K1mGZ50cEUSX 5zNzMZi7Y2Y+0Kch7/mDjmE/EyZ5cDSI9Zd+nUqgSxMUxDW963aHU9n0xlCSohwJr2hQ DBrQ== 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=OhJqzhnruESxyQBsuUBkTpXlj1KG2mpYOvcyz9G88Zg=; b=KLLFLoVlbCQ4S/ZXh7ElGiq7nhjd9whaF/5J5Mhrm7Cz+Cl8gA1ZsxTjVtcdr2pqlu +lYAttsZ9sJ5VlPwYnyLusiY14adGqtQsHDVBtSts2lIrVq6VtDwwPgOyCk4ew0M4URS Dqszr7Qd3gGPQSwdtoJzWRiQMVAopcwHCdoWeIG23yq/pjVSV94g/lrI17Y5QF12CUjI 0i02c418xNCxQpadCXwUm7LBi2OL+9z1OeUe5y0j41xVjHuOB0OmXt4UgKI2VZ+EsAoe bl3SVd22JU2sAclrfVT5PqcE/ebONHPVtvodvYgmGo9BAc2u/7CVPQ2TsVF6NlO3fzaJ gWCg== X-Gm-Message-State: AOAM533H8q+HLEsZAb25j1tD8rFNGi9H89tCYBC5KxSWt965+3O/rtte hOhwLsvC/Kz9vMkRN9gu0RGT0Q== X-Google-Smtp-Source: ABdhPJzVSbE+5KXb+q3qWvL34oqGwQ/Ri7FBsgcn0thcQllMwFwg5o7MK5c47Opz1q4GH2WYIiwDzQ== X-Received: by 2002:a5d:4d86:: with SMTP id b6mr25370577wru.369.1605036207888; Tue, 10 Nov 2020 11:23:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p13sm18180232wrt.73.2020.11.10.11.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B762B1FF91; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/10] stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub Date: Tue, 10 Nov 2020 19:23:11 +0000 Message-Id: <20201110192316.26397-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Stefano Stabellini , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:X86 Xen CPUs" , Anthony Perard , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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: <20201105175153.30489-13-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- stubs/xen-hw-stub.c | 4 ---- 1 file changed, 4 deletions(-) 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 Tue Nov 10 19:23: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: 11895183 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A414315E6 for ; Tue, 10 Nov 2020 19:34:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5182420665 for ; Tue, 10 Nov 2020 19:34:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TgCeMwZg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5182420665 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZPd-00021t-Br for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:34:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEz-0002WO-4O for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:41 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEt-0007bL-2Y for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:40 -0500 Received: by mail-wm1-x343.google.com with SMTP id c16so4288093wmd.2 for ; Tue, 10 Nov 2020 11:23: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=gyLb9ojs6jXl39zOSmf/3xCnTbh+0xT1wLgMD2FgmNg=; b=TgCeMwZgYthPT2CYIyIsHA/8KWF6hUEhh46qNeYsNMvJEFeQfH5OkgU2chXSkBP65Y mIkQNVrSwdm4W1EV36HC43kj47jWRS+wvxMpWUKr29k+MsLmVuiKINgg1ogUSVqej5Ia TXPJthw+RjNe9386aGa4d5RHk/JBErTxtkICwKTAwClRxr+j9bqrvTbGZMFv9k+2X/oz ewjSaZhtIkk9zPUYYqr72o0U9BC8GuJBU0NMoiNxSzLAM75EYCLzARhuqkmxoJAfLmsK DcpRWCGgdYALf5kTYTH+yfEdAjUR+gpqAYokXMmz2XRIyMsOyNw0G5anXkk/qTRtyTyV CVsA== 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=gyLb9ojs6jXl39zOSmf/3xCnTbh+0xT1wLgMD2FgmNg=; b=g78Imd1AFYmNhfhhz/SSKAFrPU81TVn8JVbrJeeR+Sj73fHFYqSMpNtU+8wxp0BQFC NSbJPNCzuvnyd8h+7f8WL1/Zq65PojQQCjH16Gve0gp47xQPhOGxme2qf7cRU19c9X9z SCxarFgNLlrRrTBnNVUmaE8XeteMkuVy8JAGkoulGQsWTF2F7nD9WO5Ju/61RB+N1Wnd bBD8wgvGt9waSIzsJeUv+HzuBurDwz2PTwvm+C4xeVe0T7UCfc09/wej7NcBxFN4EPq+ z4l0cFZoce8vl4PM9FQf0TpJdOBec5AGenBeMO+Sj7Hr1VLyJBVyuhA7Ut5T1KxrALOa Q9Gg== X-Gm-Message-State: AOAM531qLY/H7urfWkEdCK/rjMQE1Ff5K0c6sEGrw6vO2jjlF9skDIli MkMRSD47hdQTjuFjCZ45anKPMC4uegdd3g== X-Google-Smtp-Source: ABdhPJyh4gjGskuU7uCLQdkr41ec4qyF/dL30LaToayS9VsvE3BzDFahttSiMOglF0fpj83LZycd/w== X-Received: by 2002:a7b:ce0e:: with SMTP id m14mr660911wmc.111.1605036213760; Tue, 10 Nov 2020 11:23:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g131sm4002025wma.35.2020.11.10.11.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CE59B1FF92; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/10] accel/stubs: drop unused cpu.h include Date: Tue, 10 Nov 2020 19:23:12 +0000 Message-Id: <20201110192316.26397-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:X86 HAXM CPUs" , Wenchao Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , Colin Xu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201105175153.30489-14-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- accel/stubs/hax-stub.c | 1 - 1 file changed, 1 deletion(-) 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 Tue Nov 10 19:23: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: 11895093 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DD9315E6 for ; Tue, 10 Nov 2020 19:30:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2BC2920656 for ; Tue, 10 Nov 2020 19:30:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kwUSvW+t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BC2920656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZLo-0007KN-QJ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:30:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEy-0002Vd-Oi for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:40 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEr-0007bB-VC for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:40 -0500 Received: by mail-wm1-x342.google.com with SMTP id 23so2640745wmg.1 for ; Tue, 10 Nov 2020 11:23:33 -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=NZGUFpHc6p1UXjjAZYXBSVeb29gQwXoQ3S3CSsvSPdw=; b=kwUSvW+tKKQKyQL48r4FCx8pLtKb6SgdfQyEd0PQtdc5nQEO+inke66g02nz6lsjm2 /TKXK1MKbKAn/7FqwMiBVpz33PKYSU0WEa6Kb+I91M/4ZAmavD5o1JmEyUtRyIJipp+q HGKeS9G14IfusMx9s7jC7su1IlVwgs5LomCLt6qlYKagDQsXbODnth4ykGbcfKPiMgLy dlHdevkwUtBwO4dRUIMKweYTUEcl1iPCHEHwkrG4fGBnrJlxOU2X+Cf6NjMDgiNktp97 1Z4omdGzaDJopRFXfazzGfaBuWJjiI24Wee1UiDk91ZkAhY98eSGHfr9JqppuPv/stvf a2kg== 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=NZGUFpHc6p1UXjjAZYXBSVeb29gQwXoQ3S3CSsvSPdw=; b=g+kgho93cjGQxPg4WYDGfOfwscAolz7Ia9ZtvCKqACFKrjKzQDfMtnGNtqJT3xkOjI se90CgMuORhyTllYXFGkplz9otKm0tc1/VIjP6wt2QI5vhYSbzqOD6TFYb1qlp7kQ/ns UHzdpDvim74TQSCPLJnEeRlXdZdiXuR7+rWdlrDBXD1UacJy/gEKK6buX8bHaRCTO78r hvyVSgfW3cAfgj+J407T8pfnPp4Nr22D3Me/qun7Nj69UHDZGdk3ydABa3IdHjsZH1xP ybivu//VQmijo+SDeir0hYTWdmNfzIXxt2939FoTXn94QllvNlR5VWc9Idhby04iukXj RwCA== X-Gm-Message-State: AOAM531oVkdJmJhhVxswfdcUAtd0CG2tFPiogaDivrek+Io+Yev3GIUU 8A4fT+V5VPqD8uxVocYIMzDmyA== X-Google-Smtp-Source: ABdhPJxRuwcwx6f08ZteIQpj1mo35k3WHS7u8kv+roCQkkiN4iGIYzSGHaB06HcD6YiY0yFq4LksdQ== X-Received: by 2002:a1c:bbc4:: with SMTP id l187mr703460wmf.133.1605036212593; Tue, 10 Nov 2020 11:23:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o197sm3917557wme.17.2020.11.10.11.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E76D51FF93; Tue, 10 Nov 2020 19:23:16 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/10] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off Date: Tue, 10 Nov 2020 19:23:13 +0000 Message-Id: <20201110192316.26397-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.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: peter.maydell@linaro.org, Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Igor Mammedov , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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é Message-Id: <20201108204535.2319870-4-philmd@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) 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 Tue Nov 10 19:23: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: 11895197 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 483B91746 for ; Tue, 10 Nov 2020 19:39:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D026D20678 for ; Tue, 10 Nov 2020 19:39:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XKuqi6t+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D026D20678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZUd-00062G-JV for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:39:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZEt-0002UX-C3 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:40 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEq-0007b1-8J for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:35 -0500 Received: by mail-wr1-x432.google.com with SMTP id j7so6732327wrp.3 for ; Tue, 10 Nov 2020 11:23:31 -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=uzzvm2OB2T7zjQdwXywRM7z/pkFqmZxSoEM/blZsIyc=; b=XKuqi6t+CnqFPIo13edi6WVFdfB58wvldnAswk2uqc7WQ3X7srkfDgLYdqOcwMTIOV zBgUBRX7+kYNsG6NDgLCJZqSwqqsgTIZyFMgc18FnnAjWo11wTzk60K384ExTj2DW5uv SKVG20YGybH7hvwczZ/s/VZEOzbQzQt7yTzAUl2FIA5BM/fimB8P7JzdYrgkyUAaWv35 3V6Xxy0XNaXeA9OHHWf2yNv50xnhpoZyOue2ShVai69nikK5mCSKV7gak8REO7MIHd6t NwCjX5TFxwL6bOavM+5j5NhdSVE4REnN0ks8KoZHqMhhkzbDU3CX8yFVUZiheUDOtOcP pjhg== 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=uzzvm2OB2T7zjQdwXywRM7z/pkFqmZxSoEM/blZsIyc=; b=O7cIRsLCgIprQVuocXVxOwg9Z1uo8ql0oQgcWwjSaJ6/9NPelQkV80NOnh/XuuNisU xsfAUfBTqk2Lt8A0T58YzcEMoQrOaoP0C6vqm6DODmpbRo8mB1FdPeK+Py5975Sbmaqy 7ia1FiFYdkJwCfbVq7inIMwgFmhY4Vu1i2bJnctcvv7iGBQMtd0GO6C45VjqwfqBqTfW ATVSwEOXlk0a+XLoKzYFPEgQkM+A8ICPvxmspErj9bV2v0c+rxzdLfckBs15G3BxaW9B dOSOtEjc/LNVDuOsPxUQf/Rp+vY9kMlj+Mhj2qr1YLCC1dhY+OJlND8tZOUDayfpNt/1 XykA== X-Gm-Message-State: AOAM531Ci5BJS/SAzAkpygHpkb37UH8rIGuv5n8jneDy+xW6jCctyMcH YocvO0XReutF4s+6wtdQcTVdhg== X-Google-Smtp-Source: ABdhPJxDTP0Ly9+kJ3j/1ZCKcJjPxiV3MFpxGIjxYBl+BMCKr4bdppifJotC0C4+6Cdwdd0feY4E4g== X-Received: by 2002:a5d:60c4:: with SMTP id x4mr27294841wrt.175.1605036210350; Tue, 10 Nov 2020 11:23:30 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b1sm4071959wmd.43.2020.11.10.11.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0D4DE1FF96; Tue, 10 Nov 2020 19:23:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/10] tests/acceptance: Disable Spartan-3A DSP 1800A test Date: Tue, 10 Nov 2020 19:23:14 +0000 Message-Id: <20201110192316.26397-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Pavel Dovgalyuk , Cleber Rosa , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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é Acked-by: Thomas Huth Message-Id: <20201109091719.2449141-1-f4bug@amsat.org> Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux_console.py | 2 ++ tests/acceptance/replay_kernel.py | 2 ++ 2 files changed, 4 insertions(+) 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 Tue Nov 10 19:23: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: 11895195 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 747F815E6 for ; Tue, 10 Nov 2020 19:39:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F17B520678 for ; Tue, 10 Nov 2020 19:39:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="C6LH6+H2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F17B520678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZUV-0005xp-O2 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:39:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZF1-0002Y7-L4 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:43 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEy-0007cY-DE for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:43 -0500 Received: by mail-wm1-x341.google.com with SMTP id c16so4288176wmd.2 for ; Tue, 10 Nov 2020 11:23:36 -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=cKItzTtEufAj0TqMJC6HYLGD6eMVh7nt9js/sJnXYio=; b=C6LH6+H23xSSfj6iYXw+5oOIL/uQsbIgK91TKj7I7+JqMAzYXYAPCw/3Qry7EvKl5D gS/uBg30PTqXXaSYnV7oHy4XiPsA+QF71px17RcTP8rvs0f1GjUtDWb8cKNdBHhehkd3 R2dMr4iPF/R1UJPCY6U5koHVXHLoWVgGx3qBdQdlNOM4FSR3uFTRVCki3IHn8nZ/5obw rZ2ZTcWIzgnDxm6dS/zs1hBkKANjezF4mhidgm0dXJnyk6TMjxuSQ6QBFZRpTa7vyRIW VFqY4Vr1aTjPiKB3Bv4SZ2R99D+vFRgxaBC3m0PLPNbrbJDw7AIcqr1SK3SMmw0XXiD3 9dxg== 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=cKItzTtEufAj0TqMJC6HYLGD6eMVh7nt9js/sJnXYio=; b=qqhOqSnbbldpdZhZTU+XhikVQbRlebwzLCvDRDiGmz4GbDI/F2xwGhgQhdy51tsSXq Tw5MVRsG7zl2qtZmkBwh2iB5Nmrj2QKlO/yn2TMsoDo1l1G28CBQYTia1RHHNSrLjrpF j/refvnnR1e74PHl4PGIAW33tes6aUQsDlQQaF/IudKze+EvI0QhHm9mudKrpgYwDv0z wbhziGY8ZCVG72Yw/nWyTBVUQ9/Si/ZdrqPOW7+0C56hL4O/5i9Pi3JMgIa9uJUw97Ed FZz8TdkitnxWNYL+Uapy/+r4ziR59pReXposUhrDub6YaEMVF9ihSx5tKjD7eja538Jb 1oEw== X-Gm-Message-State: AOAM533wd8HjZ4Bh7AVb5/z8Mjs5z5rKeQWifAFv6XLaeEzwjJ891tOw Qq9Bz8Y4FwLWExUAwmn4efyqZQ== X-Google-Smtp-Source: ABdhPJzE67kJTaUfIEk0iQwRIas221owoLop/lVzZJ8zwSg3uYOzckbp/UK7IX1EhPEPeG991YrCaQ== X-Received: by 2002:a1c:4808:: with SMTP id v8mr261395wma.110.1605036216081; Tue, 10 Nov 2020 11:23:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k84sm4147143wmf.42.2020.11.10.11.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 270241FF98; Tue, 10 Nov 2020 19:23:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/10] gitlab: move remaining x86 check-tcg targets to gitlab Date: Tue, 10 Nov 2020 19:23:15 +0000 Message-Id: <20201110192316.26397-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The GCC check-tcg (user) test in particular was very prone to timing out on Travis. We only actually need to move the some-softmmu builds across as we already have coverage for linux-user. As --enable-debug-tcg does increase the run time somewhat as more debug is put in let's restrict that to just the plugins build. It's unlikely that a plugins enabled build is going to hide a sanity failure in core TCG code so let the plugin builds do the heavy lifting on checking TCG sanity so the non-plugin builds can run swiftly. Now the only remaining check-tcg builds on Travis are for the various non-x86 arches. Signed-off-by: Alex Bennée --- .gitlab-ci.yml | 17 +++++++++++++++++ .travis.yml | 26 -------------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a8b375188..b406027a55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,6 +247,15 @@ build-user: CONFIGURE_ARGS: --disable-tools --disable-system MAKE_CHECK_ARGS: check-tcg +# Only build the softmmu targets we have check-tcg tests for +build-some-softmmu: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + # Run check-tcg against linux-user (with plugins) # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop @@ -258,6 +267,14 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m +build-some-softmmu-plugins: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enable-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + build-clang: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index a3d78171ca..bac085f800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -301,32 +301,6 @@ jobs: - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; } - # Run check-tcg against linux-user - - name: "GCC check-tcg (user)" - env: - - CONFIG="--disable-system --enable-debug-tcg" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets - - name: "GCC check-tcg (some-softmmu)" - env: - - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - - # Run check-tcg against softmmu targets (with plugins) - - name: "GCC plugins check-tcg (some-softmmu)" - env: - - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_BUILD_CMD="make build-tcg" - - TEST_CMD="make check-tcg" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - - name: "[aarch64] GCC check-tcg" arch: arm64 dist: focal From patchwork Tue Nov 10 19:23: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: 11895199 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26E47921 for ; Tue, 10 Nov 2020 19:42:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC79820809 for ; Tue, 10 Nov 2020 19:42:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yLUW3RcD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC79820809 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcZXJ-0008JI-MU for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 14:42:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcZF4-0002ZG-U9 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:47 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcZEy-0007cd-Di for qemu-devel@nongnu.org; Tue, 10 Nov 2020 14:23:46 -0500 Received: by mail-wm1-x341.google.com with SMTP id 23so2640844wmg.1 for ; Tue, 10 Nov 2020 11:23:37 -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=4bxNoNpIYS1T/aRH111mxpGinkwiUwBd/6PUA0HCz5Y=; b=yLUW3RcDI4qspd0U6HYrXHkLHQhVmITafMXMnTsjCDClvU/k8YdknhQ2P+0KVnKUG9 WRxvfqUyOtXHqM2C/J/TDOy72DtKbo0LaiNdRmLXOTAOOq5CgupJ28DRVATENvl3UF1B v21lMQE25oEMi1pjSLzDdqNpX1forSe4dQs76gF2ANYPiXs7Z+PxWWJ6ONnxiQzlk8fu /TLcj/xdGD20iW61phkY1QWq/KdCHKLM0/fo3O18Y3zyL4PiAGYU5ms6W7J4IsysPDtH idcvqfs9OKijYJu/J7dYPHTWrg5Jj2HPn8K4qcetuk23/99TkXGKgPRtflu8F2oovzLl SN0A== 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=4bxNoNpIYS1T/aRH111mxpGinkwiUwBd/6PUA0HCz5Y=; b=HU4ARdUvY5iKRl2NZbdjowG0bmdZhm4SzZzmK6RlgUkMIcU3q5pRWxE6XRuiat81xE 5tLZv9l114y5IwAqSO30RSRpufGWhwZOpJXOELMDMvpaw7L2IA73U9XIMFyYDwadyBbC TRXjcZQyY+2l8l7+xJCcZJg8NC2VAUG7XyseSC6fWnmkhfk44Zb1YohbT1LycIwwTyBX iV7ywahiTJdCOjuF30pIzg6PBgebkwXI6ANMtdN9tfYSZiJRLkTlNKsvX7O6GaR4yCJi tjce5dNyzsT1hVnZygAdljGzE1tcqeUOOrc6/u+RyZm9j9M6zfftYja4HADs0Q3ZZpN3 d+fw== X-Gm-Message-State: AOAM533RVB47e98DLA57rqATY1y/+geeHzdb0GMe+J28FxxSkCgOhxOf 7XVsGjezc4kutpPP1KFjoOlsgg== X-Google-Smtp-Source: ABdhPJwDSRx3QpwqBiQcG/lI9FY6FRSgbY4QO/g8nLTOeyzQHsnHlmpjHuVbO+W7GH9i+9HvNMXjdQ== X-Received: by 2002:a05:600c:2282:: with SMTP id 2mr751738wmf.154.1605036217038; Tue, 10 Nov 2020 11:23:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o205sm4136738wma.25.2020.11.10.11.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 11:23:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3D8D81FF99; Tue, 10 Nov 2020 19:23:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/10] scripts/ci: clean up default args logic a little Date: Tue, 10 Nov 2020 19:23:16 +0000 Message-Id: <20201110192316.26397-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110192316.26397-1-alex.bennee@linaro.org> References: <20201110192316.26397-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.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: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This allows us to do: ./scripts/ci/gitlab-pipeline-status -w -b HEAD -p 2961854 to check out own pipeline status of a recently pushed branch. Signed-off-by: Alex Bennée --- scripts/ci/gitlab-pipeline-status | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/ci/gitlab-pipeline-status b/scripts/ci/gitlab-pipeline-status index bac8233079..78e72f6008 100755 --- a/scripts/ci/gitlab-pipeline-status +++ b/scripts/ci/gitlab-pipeline-status @@ -31,7 +31,7 @@ class NoPipelineFound(Exception): """Communication is successfull but pipeline is not found.""" -def get_local_branch_commit(branch='staging'): +def get_local_branch_commit(branch): """ Returns the commit sha1 for the *local* branch named "staging" """ @@ -126,18 +126,16 @@ def create_parser(): help=('The GitLab project ID. Defaults to the project ' 'for https://gitlab.com/qemu-project/qemu, that ' 'is, "%(default)s"')) - try: - default_commit = get_local_branch_commit() - commit_required = False - except ValueError: - default_commit = '' - commit_required = True - parser.add_argument('-c', '--commit', required=commit_required, - default=default_commit, + parser.add_argument('-b', '--branch', type=str, default="staging", + help=('Specify the branch to check. ' + 'Use HEAD for your current branch. ' + 'Otherwise looks at "%(default)s"')) + parser.add_argument('-c', '--commit', + default=None, help=('Look for a pipeline associated with the given ' 'commit. If one is not explicitly given, the ' - 'commit associated with the local branch named ' - '"staging" is used. Default: %(default)s')) + 'commit associated with the default branch ' + 'is used.')) parser.add_argument('--verbose', action='store_true', default=False, help=('A minimal verbosity level that prints the ' 'overall result of the check/wait')) @@ -149,6 +147,10 @@ def main(): """ parser = create_parser() args = parser.parse_args() + + if not args.commit: + args.commit = get_local_branch_commit(args.branch) + success = False try: if args.wait: