Re: [PATCH] hw/riscv/numa.c: Supplement cpu topology arguments

[Alistair Francis]

On Fri, May 29, 2026 at 8:19 PM <liu.xuem...@zte.com.cn> wrote:
>
> From: Xuemei Liu <liu.xuem...@zte.com.cn>
>
> Supplement RISC-V cpu topology arguments, including support socket
> cluster and threads per core.
>
> Signed-off-by: Xuemei Liu <liu.xuem...@zte.com.cn>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  hw/riscv/numa.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
> index 24a803f7fa..8a144925c1 100644
> --- a/hw/riscv/numa.c
> +++ b/hw/riscv/numa.c
> @@ -239,8 +239,18 @@ const CPUArchIdList 
> *riscv_numa_possible_cpu_arch_ids(MachineState *ms)
>      for (n = 0; n < ms->possible_cpus->len; n++) {
>          ms->possible_cpus->cpus[n].type = ms->cpu_type;
>          ms->possible_cpus->cpus[n].arch_id = n;
> +        ms->possible_cpus->cpus[n].props.has_socket_id = true;
> +        ms->possible_cpus->cpus[n].props.socket_id =
> +            n / (ms->smp.clusters * ms->smp.cores * ms->smp.threads);
> +        ms->possible_cpus->cpus[n].props.has_cluster_id = true;
> +        ms->possible_cpus->cpus[n].props.cluster_id =
> +            (n / (ms->smp.cores * ms->smp.threads)) % ms->smp.clusters;
>          ms->possible_cpus->cpus[n].props.has_core_id = true;
> -        ms->possible_cpus->cpus[n].props.core_id = n;
> +        ms->possible_cpus->cpus[n].props.core_id =
> +            (n / ms->smp.threads) % ms->smp.cores;
> +        ms->possible_cpus->cpus[n].props.has_thread_id = true;
> +        ms->possible_cpus->cpus[n].props.thread_id =
> +            n % ms->smp.threads;
>      }
>
>      return ms->possible_cpus;
> --
> 2.27.0
>