On Mon, 2023-11-27 at 17:39 +0800, Zhao Liu wrote:
> From: Zhao Liu <zhao1....@intel.com>
>
> From s390_possible_cpu_arch_ids() in hw/s390x/s390-virtio-ccw.c, the
> "core-id" is the index of pssible_cpus->cpus[], so it should only be
s/pssible_cpus/possible_cpus/
> less than possible_cpus->len, which is equal to ms->smp.max_cpus.
>
> Fix the wrong "core-id" 112 because it is greater than maxcpus (36) in
Maybe s/is greater/isn't less/ since the valid ids are 0-35 inclusive.
> -smp.
>
> Cc: Nina Schoetterl-Glausch <n...@linux.ibm.com>
> Signed-off-by: Zhao Liu <zhao1....@intel.com>
Reviewed-by: Nina Schoetterl-Glausch <n...@linux.ibm.com>
Thanks!
> ---
> RFC: Not tested on S390 machine, just code reading.
> ---
> docs/devel/s390-cpu-topology.rst | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/docs/devel/s390-cpu-topology.rst
> b/docs/devel/s390-cpu-topology.rst
> index 9eab28d5e5d8..48313b92d417 100644
> --- a/docs/devel/s390-cpu-topology.rst
> +++ b/docs/devel/s390-cpu-topology.rst
> @@ -15,7 +15,7 @@ have default values:
> -smp 1,drawers=3,books=3,sockets=2,cores=2,maxcpus=36 \
> -device z14-s390x-cpu,core-id=19,entitlement=high \
> -device z14-s390x-cpu,core-id=11,entitlement=low \
> - -device z14-s390x-cpu,core-id=112,entitlement=high \
> + -device z14-s390x-cpu,core-id=12,entitlement=high \
> ...
>
> Additions to query-cpus-fast
> @@ -78,7 +78,7 @@ modifiers for all configured vCPUs.
> "dedicated": true,
> "thread-id": 537005,
> "props": {
> - "core-id": 112,
> + "core-id": 12,
> "socket-id": 0,
> "drawer-id": 3,
> "book-id": 2
> @@ -86,7 +86,7 @@ modifiers for all configured vCPUs.
> "cpu-state": "operating",
> "entitlement": "high",
> "qom-path": "/machine/peripheral-anon/device[2]",
> - "cpu-index": 112,
> + "cpu-index": 12,
> "target": "s390x"
> }
> ]
