| Message ID | 20231127134917.568552-1-zhao1.liu@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] docs/s390: Fix wrong command example in s390-cpu-topology.rst | expand |
On 27/11/23 14:49, Zhao Liu wrote: > From: Zhao Liu <zhao1.liu@intel.com> > > 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> > --- > Changes since v1 RFC: > * Fixed typo. (Nina) > * Polished the description of the reason for fixing the wrong core-id. > (Nina) > --- > docs/devel/s390-cpu-topology.rst | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Patch queued, thanks! Phil.
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" } ]