On 9/6/22 10:59, Markus Armbruster wrote:
Pierre Morel <pmorel@xxxxxxxxxxxxx> writes:
S390x defines two topology levels above sockets: nbooks and drawers.
nbooks or books?
Let's add these two levels inside the CPU topology implementation.
Signed-off-by: Pierre Morel <pmorel@xxxxxxxxxxxxx>
---
[...]
diff --git a/qapi/machine.json b/qapi/machine.json
index 6afd1936b0..bdd92e3cb1 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -900,13 +900,15 @@
# a CPU is being hotplugged.
#
# @node-id: NUMA node ID the CPU belongs to
-# @socket-id: socket number within node/board the CPU belongs to
+# @drawer-id: drawer number within node/board the CPU belongs to
+# @book-id: book number within drawer/node/board the CPU belongs to
+# @socket-id: socket number within book/node/board the CPU belongs to
# @die-id: die number within socket the CPU belongs to (since 4.1)
# @cluster-id: cluster number within die the CPU belongs to (since 7.1)
# @core-id: core number within cluster the CPU belongs to
# @thread-id: thread number within core the CPU belongs to
#
-# Note: currently there are 6 properties that could be present
+# Note: currently there are 7 properties that could be present
Should this be 8?
when one can count .. yes :)
Thanks, I will update in next spin
# but management should be prepared to pass through other
# properties with device_add command to allow for future
# interface extension. This also requires the filed names to be kept in
# sync with the properties passed to -device/device_add.
Not your patch's fault, but the second sentence is less than clear.
What are "the filed names"? A typo perhaps?
I understood that it means the names in the structure here under which
are filed inside the single quotes.
In this case, may be "filed names" should be replaced by
"names in the CpuInstanceProperties structure"
@@ -916,6 +918,8 @@
##
{ 'struct': 'CpuInstanceProperties',
'data': { '*node-id': 'int',
+ '*drawer-id': 'int',
+ '*book-id': 'int',
'*socket-id': 'int',
'*die-id': 'int',
'*cluster-id': 'int',
@@ -1465,6 +1469,10 @@
#
Regards,
Pierre
--
Pierre Morel
IBM Lab Boeblingen
