From patchwork Tue May 30 13:26:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 686876 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp737570wru; Tue, 30 May 2023 06:30:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72/IdAZvUpciw1iYseC2K+1Ik19h8Np8zjJRCNxVbg2HDo+WJmMwR8DSv/vYVWPYrQ2eQV X-Received: by 2002:ac8:5953:0:b0:3f1:f14f:9fd2 with SMTP id 19-20020ac85953000000b003f1f14f9fd2mr1996297qtz.48.1685453417573; Tue, 30 May 2023 06:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685453417; cv=none; d=google.com; s=arc-20160816; b=1E//O54JSma6MxdBy3eRWBiJbc4g1jy9n+VvbBxSNJwAEBlP+7xADPorKh19wgNSfl Ng6vSyi/vRoV0ytnFYavOEE4CUKcvw54QdxE7YdsD4QOUc68kE+Io4+DWHjrihpa03Vi +ZheE2tZ5rFDZCKlDhHW8SbX0iqpPY+e+VvpdzTXO47v1h8x+hVJaEM7+sJ8P2Z2f5QW T6Q60tClIPM2BOvL933EnmbgrW20JOqNsSr6gERBlx+Hxwe9lvR90+3iVe2MGpIOGukg mHtV/pkVuOavJ5+/cMD46B7RxriPAGe45Mj9xhn/fNh+87wq/Yh9FREqdDQ5AJ84ZdTQ V6aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wHGJTqnWnJZeP8ddXaC5XrHOdzJhFhTnUrSm1b3ujFA=; b=x6nT4Gct4N9uB2W8teL8soxnhvh8QLaXw12T8V0tMBf92VkSDOhMpqyUpIWt39em1J bGsbmcTz7eDYdzmQ9l5V1tZgTkx1fxrGP9x/bKJdMxF3O6WJO/YApiMVAdoNt7qa3zfq FDo3vtlrpzqjZc0OvNRN0Gm8wCMMOqMCbB3FgkphU6z004lAQ7RQSW0fd7IGKEgg1wqE oM02cmCDoTPF9LhVuolXzBwEWpmrw301if4nuOxTSMhNzdPyfCaDlFAlHyF0rrtC9UB5 1n3dTZYWP3fHFcYOXoDCxBiI6DIk6ng9YpGzFD1nrD22QNPCckIse1CjAGRSVAnTG8u3 DzfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hrrlmmut; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f14-20020ac87f0e000000b003f6b1049714si6183402qtk.806.2023.05.30.06.30.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 May 2023 06:30:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hrrlmmut; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3zOd-000192-02; Tue, 30 May 2023 09:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3zMy-0005hh-AS for qemu-devel@nongnu.org; Tue, 30 May 2023 09:26:38 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3zMr-0001QF-C2 for qemu-devel@nongnu.org; Tue, 30 May 2023 09:26:33 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f6e1393f13so30781065e9.0 for ; Tue, 30 May 2023 06:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685453188; x=1688045188; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wHGJTqnWnJZeP8ddXaC5XrHOdzJhFhTnUrSm1b3ujFA=; b=hrrlmmutANBkVOrC18nFaM1oCZ7ykvTYKLmU/o1OSch8cZJNM+dVCrQxsQ1DdsaNm6 Y3GqfW5CsuRfootSNndjF6I1vYWGG9Oo3GU6DWLm/tZdeBpWE7000O7k1LWM+zZ9AeWj 5B02W8KvMLWvpKGOlcuE3Ad7HDcxIEG3EZRClQlbjdsWCEA74HPoP7sSAe9LaGVAZ5Zk r3oLkGkhQOaoKRgG2ggR8J6NpfA/pjvAgcTb5oIUUA1Ppw/zttVl+V2KnmBSsGRy8CD1 qAD2dUELW5GjEO5+JVtJOFoCa9H8Ez8Lw2v+IVUG0DeZgIHfqERCWUJr0rF1iIoALbzZ iRMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685453188; x=1688045188; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wHGJTqnWnJZeP8ddXaC5XrHOdzJhFhTnUrSm1b3ujFA=; b=SQzcd8Q0jSrTISc2z7gzweqpHxW3+7VHldhiwtGNCu4///JV3iYO8SyxUftNAVO06g I+CoBTgD7OblcLptXPWXT2pI/2A9NXYevgx2o/qBHyUR+T0r6MQPsF74HnogGoGqvaov oIJq7LNhsltXGnAzawXWqT0WsqzbVM0eWZ0NSc/UIEYQgxcPBxDSEqS6yd5aKDdKmc74 1XG96ZtRtNZhrRd5ln9Iaspy6O3/Rv4VVeAnPFvtkM7Dwwu+UGRoFIQrbugBeBDJNDbp 90DCS1/9lWY84CbzLWn6KhCF45CkFIgMOkWXvcGGJbKj3m+LBjgoDpKgppCk8j/aSehU qKNA== X-Gm-Message-State: AC+VfDzU6UKmn16RVUEf5qF71iRr4IsteOqqZEX8emADfrPZi5shIBqI GZp9nhpG7EyHyuMO1UbwBVSJ8mA7Eox1vBt3bxg= X-Received: by 2002:a05:600c:2296:b0:3f4:bb58:d174 with SMTP id 22-20020a05600c229600b003f4bb58d174mr1695974wmf.22.1685453187903; Tue, 30 May 2023 06:26:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p19-20020a1c7413000000b003f60e143d38sm17463615wmc.11.2023.05.30.06.26.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 06:26:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/21] hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number Date: Tue, 30 May 2023 14:26:12 +0100 Message-Id: <20230530132620.1583658-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230530132620.1583658-1-peter.maydell@linaro.org> References: <20230530132620.1583658-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Clément Chigot When passing --smp with a number lower than XLNX_ZYNQMP_NUM_APU_CPUS, the expression (ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS) will result in a positive number as ms->smp.cpus is a unsigned int. This will raise the following error afterwards, as Qemu will try to instantiate some additional RPUs. | $ qemu-system-aarch64 --smp 1 -M xlnx-zcu102 | ** | ERROR:../src/tcg/tcg.c:777:tcg_register_thread: | assertion failed: (n < tcg_max_ctxs) Signed-off-by: Clément Chigot Reviewed-by: Francisco Iglesias Tested-by: Francisco Iglesias Message-id: 20230524143714.565792-1-chigot@adacore.com Signed-off-by: Peter Maydell --- hw/arm/xlnx-zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 335cfc417d7..5905a330151 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -213,7 +213,7 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, const char *boot_cpu, Error **errp) { int i; - int num_rpus = MIN(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS, + int num_rpus = MIN((int)(ms->smp.cpus - XLNX_ZYNQMP_NUM_APU_CPUS), XLNX_ZYNQMP_NUM_RPU_CPUS); if (num_rpus <= 0) {