From: Zhao Liu <zhao1....@intel.com>
Add module-id in CpuInstanceProperties, to locate the CPU with module
level.
Suggested-by: Xiaoyao Li <xiaoyao...@intel.com>
Tested-by: Yongwei Ma <yongwei...@intel.com>
Signed-off-by: Zhao Liu <zhao1....@intel.com>
Tested-by: Babu Moger <babu.mo...@amd.com>
Acked-by: Markus Armbruster <arm...@redhat.com>
Message-ID: <20240424154929.1487382-4-zhao1....@intel.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
qapi/machine.json | 4 ++++
hw/core/machine-hmp-cmds.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/qapi/machine.json b/qapi/machine.json
index 48f98e7d9f..bce6e1bbc4 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -988,6 +988,9 @@
# @cluster-id: cluster number within the parent container the CPU
# belongs to (since 7.1)
#
+# @module-id: module number within the parent container the CPU belongs
+# to (since 9.1)
+#
# @core-id: core number within the parent container the CPU belongs to
#
# @thread-id: thread number within the core the CPU belongs to
@@ -1005,6 +1008,7 @@
'*socket-id': 'int',
'*die-id': 'int',
'*cluster-id': 'int',
+ '*module-id': 'int',
'*core-id': 'int',
'*thread-id': 'int'
}
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index a6ff6a4875..8701f00cc7 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -87,6 +87,10 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
monitor_printf(mon, " cluster-id: \"%" PRIu64 "\"\n",
c->cluster_id);
}
+ if (c->has_module_id) {
+ monitor_printf(mon, " module-id: \"%" PRIu64 "\"\n",
+ c->module_id);
+ }
if (c->has_core_id) {
monitor_printf(mon, " core-id: \"%" PRIu64 "\"\n", c->core_id);
}
--
2.41.0
