qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>,
	"BALATON Zoltan" <balaton@eik.bme.hu>,
	"Zhao Liu" <zhao1.liu@intel.com>,
	"Nina Schoetterl-Glausch" <nsg@linux.ibm.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>
Subject: [PULL 7/7] docs/s390: Fix wrong command example in s390-cpu-topology.rst
Date: Tue, 28 Nov 2023 14:37:40 +0100	[thread overview]
Message-ID: <20231128133740.64525-8-philmd@linaro.org> (raw)
In-Reply-To: <20231128133740.64525-1-philmd@linaro.org>

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>
Message-ID: <20231127134917.568552-1-zhao1.liu@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 9eab28d5e5..48313b92d4 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"
     }
   ]
-- 
2.41.0



  parent reply	other threads:[~2023-11-28 13:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-28 13:37 [PULL 0/7] Misc fixes for 2023-11-28 Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 1/7] target/hexagon/idef-parser/prepare: use env to invoke bash Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 2/7] hw/isa/vt82c686: Bring back via_isa_set_irq() Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 3/7] hw/usb/vt82c686-uhci-pci: Use ISA instead of PCI interrupts Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 4/7] hw/isa/vt82c686: Route PIRQ inputs using via_isa_set_irq() Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 5/7] hw/audio/via-ac97: Route interrupts " Philippe Mathieu-Daudé
2023-11-28 13:37 ` [PULL 6/7] hw/avr/atmega: Fix wrong initial value of stack pointer Philippe Mathieu-Daudé
2023-11-28 13:37 ` Philippe Mathieu-Daudé [this message]
2023-11-28 23:14 ` [PULL 0/7] Misc fixes for 2023-11-28 Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231128133740.64525-8-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=balaton@eik.bme.hu \
    --cc=mrolnik@gmail.com \
    --cc=nsg@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=zhao1.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).