summary refs log tree commit diff stats
path: root/hw/core/machine-hmp-cmds.c
diff options
context:
space:
mode:
authorGavin Shan <gshan@redhat.com>2022-05-03 22:02:59 +0800
committerPeter Maydell <peter.maydell@linaro.org>2022-05-09 11:47:54 +0100
commit1dcf7001d4bae651129d46d5628b29e93a411d0b (patch)
treebe87a9da1a0b5b8b8ac0398452d6e5a164db4689 /hw/core/machine-hmp-cmds.c
parent90ea2cceb286c66b8460725f5573d8a157e65bdf (diff)
downloadfocaccia-qemu-1dcf7001d4bae651129d46d5628b29e93a411d0b.tar.gz
focaccia-qemu-1dcf7001d4bae651129d46d5628b29e93a411d0b.zip
qapi/machine.json: Add cluster-id
This adds cluster-id in CPU instance properties, which will be used
by arm/virt machine. Besides, the cluster-id is also verified or
dumped in various spots:

  * hw/core/machine.c::machine_set_cpu_numa_node() to associate
    CPU with its NUMA node.

  * hw/core/machine.c::machine_numa_finish_cpu_init() to record
    CPU slots with no NUMA mapping set.

  * hw/core/machine-hmp-cmds.c::hmp_hotpluggable_cpus() to dump
    cluster-id.

Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20220503140304.855514-2-gshan@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine-hmp-cmds.c')
-rw-r--r--hw/core/machine-hmp-cmds.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index 4e2f319aeb..5cb5eecbfc 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -77,6 +77,10 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
         if (c->has_die_id) {
             monitor_printf(mon, "    die-id: \"%" PRIu64 "\"\n", c->die_id);
         }
+        if (c->has_cluster_id) {
+            monitor_printf(mon, "    cluster-id: \"%" PRIu64 "\"\n",
+                           c->cluster_id);
+        }
         if (c->has_core_id) {
             monitor_printf(mon, "    core-id: \"%" PRIu64 "\"\n", c->core_id);
         }