Message ID | 20220509115848.3521805-32-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 4c18bc192386dfbca530e7f550e0992df657818a |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp3943028mal; Mon, 9 May 2022 05:24:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxE+ocJSvMdxVVB7OtBqTpy4xWXe2g432RHfyA6yX+KGyvX8nCWZQcaTpD3gfHXKbzNfsnJ X-Received: by 2002:a05:620a:2590:b0:680:f8c3:582 with SMTP id x16-20020a05620a259000b00680f8c30582mr10998400qko.723.1652099070490; Mon, 09 May 2022 05:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652099070; cv=none; d=google.com; s=arc-20160816; b=ZPy2GdnH8w0/J7A40D08ohbBqrSH2zwaKbfu+uONyKFpyuaX6Fb2a+up5vE3/P8ZUI P4J5XHoO6N2rCJC6DG74BNB2c9AW5A5KgYNi0N31WMZcpJ7LzjlYBtHd1r9wmk3M6QX5 Rh5QIzuk72DTRy28TeFIV9VStrYmRScPI7O2MgQ/8w1LGqNzQhtj5Sgg5sqbq30p+wmR aXT/85aDAtnVYlraWA8Bl2OHUWGk3Rc0dmfhip+zyImwiYlP7/rlgWjVRD05NeyoMTV9 VxE+NKocA81oY3ItMhCMXotm0txOyR6WRtTviHy6vGv+rqlDjB+5UsfzKjbb53EZo/Xh 6Fzw== 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=GAKojUArTipjlz2CUBGk94csiNAnp/cdOHeIZmJ/G7k=; b=nLp7jWYIuJHsirEqonWDc5jBQ5lNKRX4xCu6N1aKl3uEVfpbxlUOXP8Iw0L63aunPM +DgvCY2V+x75NuCVhnjZ2mq3CLUS/JVvuNR+HCJ+pwN5x86bIMbYOsiPzcu0OzYxKCsH 3RL+DKcpokRV5TfHVmpdDgzj5TDIV8fK6+ICvLJcQrN8HpIM3HS9LbkjBBuHDpSSUxA8 cMo10J1OokiElH/CJOO9ZkWrCUZ/DQlLFKS7089T1uSBKuovpXYRHgxdsILeD28AmOQa 0mVFOye0y/DNxOWgUf8WCJlEcm+R1luSQNHT1zbnZWBQ/uX+yvPJtNjNiUmW09Dq3n5w RPQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a6suQOZd; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w7-20020a05622a134700b002f3d5a78975si2517044qtk.724.2022.05.09.05.24.30 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 May 2022 05:24:30 -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=a6suQOZd; 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]:39746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1no2RC-0007Yn-16 for patch@linaro.org; Mon, 09 May 2022 08:24:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1no22o-00086r-U2 for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:18 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:39715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1no22n-0001MO-C1 for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:18 -0400 Received: by mail-wm1-x332.google.com with SMTP id 125-20020a1c0283000000b003946c466c17so47404wmc.4 for <qemu-devel@nongnu.org>; Mon, 09 May 2022 04:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GAKojUArTipjlz2CUBGk94csiNAnp/cdOHeIZmJ/G7k=; b=a6suQOZdhGln2FMk/CT5buKH0UElF3/j1XNo9et4bw33WoQtHs4W0LXGF2Nxbi38Nv QerNQEpYthuSNLAfG33r2xsoUC9758SOHyGsAwgDGkypkmkq2DBN+iTmH5tgKzIqro+A epWR1XBsRnX7cf5rHiwEWDnzjx2wo96AVSS4FjWJPfyfLEohlzdljuFp0qcovJeWUs4j /XlxKatr/9HIgPLH2md2hYz+NbPcWy6DJG/s12nCCZCKed+D2N1mJwtP2U81wo/2JsyK +9au6IS+aoQLua9+xgTApDvN7QojDaN6vu2hV8fZWE0LrPxNzvEKvKrrIsibFbFXX4Ep 60Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GAKojUArTipjlz2CUBGk94csiNAnp/cdOHeIZmJ/G7k=; b=3OHzU8sEUsLhuK9TqGByiuLXNrrN+GQkv4IEslA6fsBfLgLTxjm+NpTmnqKiOFGNHB +zLaHhXhqDw8l525HxrX3fYNtk4jdzSfplSb1fyL1YKPTQGbe0wBp39aqZe19uqxaAXc m0GR5q9f1Yze00btmwEiOJcDJwndIL2HYauAKUYeUShg8PoQ2/uWcc61TPiopT/FdrGH crC7EqqEUr+CkMwGeRttLMuyOhvfC1Ah/yGb/gx+JUhYlFrRMZM5kFnHAD/D32tpt98L HDgJOItX8SndP4mUQNOVjCtD+z0hD0N0sUMwPtNRM5L0wtH0i6/RqNaIMhTqRonZSEKr Gm9A== X-Gm-Message-State: AOAM5333ThC4wrKKWfYAUkDM30Rrfv8kCUKyCpnNY1QGlI+eRWhyzyeW kp4w7kPz8YxrXO/Bv4CzZH/3HjtM/5sF8g== X-Received: by 2002:a1c:4b12:0:b0:394:3558:a95e with SMTP id y18-20020a1c4b12000000b003943558a95emr15556137wma.147.1652097556035; Mon, 09 May 2022 04:59:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bs6-20020a056000070600b0020c5253d8bdsm12199928wrb.9.2022.05.09.04.59.15 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:59:15 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 31/32] hw/arm/virt: Fix CPU's default NUMA node ID Date: Mon, 9 May 2022 12:58:47 +0100 Message-Id: <20220509115848.3521805-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509115848.3521805-1-peter.maydell@linaro.org> References: <20220509115848.3521805-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
[PULL,01/32] MAINTAINERS/.mailmap: update email for Leif Lindholm
|
expand
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c25023a083a..1a45f44435e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2554,7 +2554,9 @@ virt_cpu_index_to_props(MachineState *ms, unsigned cpu_index) static int64_t virt_get_default_cpu_node_id(const MachineState *ms, int idx) { - return idx % ms->numa_state->num_nodes; + int64_t socket_id = ms->possible_cpus->cpus[idx].props.socket_id; + + return socket_id % ms->numa_state->num_nodes; } static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)