[v4] Support smp.clusters for x86 in QEMU

[PATCH v4 04/21] hw/cpu: Update the comments of nr_cores and nr_dies

Posted by Zhao Liu 2 years, 4 months ago

From: Zhao Liu <zhao1.liu@intel.com>

In the nr_threads' comment, specify it represents the
number of threads in the "core" to avoid confusion.

Also add comment for nr_dies in CPUX86State.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Changes since v3:
 * The new patch split out of CPUSTATE.nr_cores' fix. (Xiaoyao)
---
 include/hw/core/cpu.h | 2 +-
 target/i386/cpu.h     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 92a4234439a3..df908b23c692 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -277,7 +277,7 @@ struct qemu_work_item;
  *   See TranslationBlock::TCG CF_CLUSTER_MASK.
  * @tcg_cflags: Pre-computed cflags for this cpu.
  * @nr_cores: Number of cores within this CPU package.
- * @nr_threads: Number of threads within this CPU.
+ * @nr_threads: Number of threads within this CPU core.
  * @running: #true if CPU is currently running (lockless).
  * @has_waiter: #true if a CPU is currently waiting for the cpu_exec_end;
  * valid under cpu_list_lock.
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index fbb05eace57e..70eb3bc23eb8 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1881,6 +1881,7 @@ typedef struct CPUArchState {
 
     TPRAccess tpr_access_type;
 
+    /* Number of dies within this CPU package. */
     unsigned nr_dies;
 } CPUX86State;
 
-- 
2.34.1

Re: [PATCH v4 04/21] hw/cpu: Update the comments of nr_cores and nr_dies

Posted by Philippe Mathieu-Daudé 2 years, 4 months ago

On 14/9/23 09:21, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> In the nr_threads' comment, specify it represents the
> number of threads in the "core" to avoid confusion.
> 
> Also add comment for nr_dies in CPUX86State.
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> Changes since v3:
>   * The new patch split out of CPUSTATE.nr_cores' fix. (Xiaoyao)
> ---
>   include/hw/core/cpu.h | 2 +-
>   target/i386/cpu.h     | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH v4 04/21] hw/cpu: Update the comments of nr_cores and nr_dies

Posted by Zhao Liu 2 years, 4 months ago

On Thu, Sep 14, 2023 at 09:32:31AM +0200, Philippe Mathieu-Daudé wrote:
> Date: Thu, 14 Sep 2023 09:32:31 +0200
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: Re: [PATCH v4 04/21] hw/cpu: Update the comments of nr_cores and
>  nr_dies
> 
> On 14/9/23 09:21, Zhao Liu wrote:
> > From: Zhao Liu <zhao1.liu@intel.com>
> > 
> > In the nr_threads' comment, specify it represents the
> > number of threads in the "core" to avoid confusion.
> > 
> > Also add comment for nr_dies in CPUX86State.
> > 
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> > Changes since v3:
> >   * The new patch split out of CPUSTATE.nr_cores' fix. (Xiaoyao)
> > ---
> >   include/hw/core/cpu.h | 2 +-
> >   target/i386/cpu.h     | 1 +
> >   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>

Thanks!

-Zhao