OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

docs/s390: Fix wrong command example in s390-cpu-topology.rst

Browse Source 
From s390_possible_cpu_arch_ids() in hw/s390x/s390-virtio-ccw.c, the
"core-id" is the index of possible_cpus->cpus[], so it should only be
less than possible_cpus->len, which is equal to ms->smp.max_cpus.

Fix the wrong "core-id" 112, because it isn't less than maxcpus (36) in
-smp, and the valid core ids are 0-35 inclusive.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Message-ID: <20231127134917.568552-1-zhao1.liu@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Zhao Liu 2023-11-27 21:49:17 +08:00 committed by Philippe Mathieu-Daudé
parent 235948bf53
commit 0180a74463
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/devel/s390-cpu-topology.rst
View File

@ -15,7 +15,7 @@ have default values:
-smp 1,drawers=3,books=3,sockets=2,cores=2,maxcpus=36 \ -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=19,entitlement=high \
-device z14-s390x-cpu,core-id=11,entitlement=low \ -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 Additions to query-cpus-fast
@ -78,7 +78,7 @@ modifiers for all configured vCPUs.
"dedicated": true, "dedicated": true,
"thread-id": 537005, "thread-id": 537005,
"props": { "props": {
"core-id": 112, "core-id": 12,
"socket-id": 0, "socket-id": 0,
"drawer-id": 3, "drawer-id": 3,
"book-id": 2 "book-id": 2
@ -86,7 +86,7 @@ modifiers for all configured vCPUs.
"cpu-state": "operating", "cpu-state": "operating",
"entitlement": "high", "entitlement": "high",
"qom-path": "/machine/peripheral-anon/device[2]", "qom-path": "/machine/peripheral-anon/device[2]",
"cpu-index": 112, "cpu-index": 12,
"target": "s390x" "target": "s390x"
} }
] ]