From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A947BC61DA4 for ; Thu, 2 Feb 2023 09:44:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNW7p-0006Se-7G; Thu, 02 Feb 2023 04:43:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNW7m-0006Rm-Of for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:23 -0500 Received: from mga02.intel.com ([134.134.136.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNW7k-0006ND-Ow for qemu-devel@nongnu.org; Thu, 02 Feb 2023 04:43:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675331000; x=1706867000; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=atvZGepej5YcLFtx3mYUNr9UNgjfXy1ME0XpKL0DymQ=; b=baNB6jqnvooBC028OvVj+kV3EURuTfOg3s5P/D3vcQBn4hAHXZRQC/vg 1UsZVPKd2pZXZrdHn4JhrD/koGD56ZKkgDqSQH7bVrN1Cjcg5pVkdhJD+ 0v44vj4q7sHBw9p4o0Ssu/btq352rZ83CDIze91Gt+jPY2qguFGRjs6AJ 2ErzST4DzHFLX3nRgsFLxN9uQYPELIGJ+ecA/VnFhfvUegESZhR/w7/u5 /VU8ej1fWNbieS5jiSPjh7nh/zoJyszC0dZWuG68zeQrVb8LxRsRvx+ri brSCEBJq2VVY5V2R6gomwgpPWHtsBopO/RnwSuGSAxWodOXnBsAJrwPTl Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="316401881" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="316401881" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2023 01:42:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="807909371" X-IronPort-AV: E=Sophos;i="5.97,267,1669104000"; d="scan'208";a="807909371" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.112]) by fmsmga001.fm.intel.com with ESMTP; 02 Feb 2023 01:41:57 -0800 From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , "Michael S . Tsirkin" , Richard Henderson , Paolo Bonzini Cc: qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu , Robert Hoo Subject: [PATCH 01/18] machine: Fix comment of machine_parse_smp_config() Date: Thu, 2 Feb 2023 17:49:12 +0800 Message-Id: <20230202094929.343799-2-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202094929.343799-1-zhao1.liu@linux.intel.com> References: <20230202094929.343799-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=134.134.136.20; envelope-from=zhao1.liu@linux.intel.com; helo=mga02.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Zhao Liu Now smp supports dies and clusters, so add description about these 2 levels in the comment of machine_parse_smp_config(). Fixes: 864c3b5 (hw/core/machine: Introduce CPU cluster topology support) Suggested-by: Robert Hoo Signed-off-by: Zhao Liu --- hw/core/machine-smp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index c3dab007dadc..3fd9e641efde 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -51,8 +51,8 @@ static char *cpu_hierarchy_to_string(MachineState *ms) * machine_parse_smp_config: Generic function used to parse the given * SMP configuration * - * Any missing parameter in "cpus/maxcpus/sockets/cores/threads" will be - * automatically computed based on the provided ones. + * Any missing parameter in "cpus/maxcpus/sockets/dies/clusters/cores/threads" + * will be automatically computed based on the provided ones. * * In the calculation of omitted sockets/cores/threads: we prefer sockets * over cores over threads before 6.2, while preferring cores over sockets @@ -66,7 +66,8 @@ static char *cpu_hierarchy_to_string(MachineState *ms) * * For compatibility, apart from the parameters that will be computed, newly * introduced topology members which are likely to be target specific should - * be directly set as 1 if they are omitted (e.g. dies for PC since 4.1). + * be directly set as 1 if they are omitted (e.g. dies for PC since v4.1 and + * clusters for arm since v7.0). */ void machine_parse_smp_config(MachineState *ms, const SMPConfiguration *config, Error **errp) -- 2.34.1