mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-31 12:07:31 +00:00 
			
		
		
		
	 1dcf7001d4
			
		
	
	
		1dcf7001d4
		
	
	
	
	
		
			
			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>
		
	
			
		
			
				
	
	
		
			137 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			137 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * HMP commands related to machines and CPUs
 | |
|  *
 | |
|  * Copyright IBM, Corp. 2011
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Anthony Liguori   <aliguori@us.ibm.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2.  See
 | |
|  * the COPYING file in the top-level directory.
 | |
|  *
 | |
|  * Contributions after 2012-01-13 are licensed under the terms of the
 | |
|  * GNU GPL, version 2 or (at your option) any later version.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "monitor/hmp.h"
 | |
| #include "monitor/monitor.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qapi/qapi-builtin-visit.h"
 | |
| #include "qapi/qapi-commands-machine.h"
 | |
| #include "qapi/qmp/qdict.h"
 | |
| #include "qapi/string-output-visitor.h"
 | |
| #include "qemu/error-report.h"
 | |
| #include "sysemu/numa.h"
 | |
| #include "hw/boards.h"
 | |
| 
 | |
| void hmp_info_cpus(Monitor *mon, const QDict *qdict)
 | |
| {
 | |
|     CpuInfoFastList *cpu_list, *cpu;
 | |
| 
 | |
|     cpu_list = qmp_query_cpus_fast(NULL);
 | |
| 
 | |
|     for (cpu = cpu_list; cpu; cpu = cpu->next) {
 | |
|         int active = ' ';
 | |
| 
 | |
|         if (cpu->value->cpu_index == monitor_get_cpu_index(mon)) {
 | |
|             active = '*';
 | |
|         }
 | |
| 
 | |
|         monitor_printf(mon, "%c CPU #%" PRId64 ":", active,
 | |
|                        cpu->value->cpu_index);
 | |
|         monitor_printf(mon, " thread_id=%" PRId64 "\n", cpu->value->thread_id);
 | |
|     }
 | |
| 
 | |
|     qapi_free_CpuInfoFastList(cpu_list);
 | |
| }
 | |
| 
 | |
| void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     HotpluggableCPUList *l = qmp_query_hotpluggable_cpus(&err);
 | |
|     HotpluggableCPUList *saved = l;
 | |
|     CpuInstanceProperties *c;
 | |
| 
 | |
|     if (hmp_handle_error(mon, err)) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     monitor_printf(mon, "Hotpluggable CPUs:\n");
 | |
|     while (l) {
 | |
|         monitor_printf(mon, "  type: \"%s\"\n", l->value->type);
 | |
|         monitor_printf(mon, "  vcpus_count: \"%" PRIu64 "\"\n",
 | |
|                        l->value->vcpus_count);
 | |
|         if (l->value->has_qom_path) {
 | |
|             monitor_printf(mon, "  qom_path: \"%s\"\n", l->value->qom_path);
 | |
|         }
 | |
| 
 | |
|         c = l->value->props;
 | |
|         monitor_printf(mon, "  CPUInstance Properties:\n");
 | |
|         if (c->has_node_id) {
 | |
|             monitor_printf(mon, "    node-id: \"%" PRIu64 "\"\n", c->node_id);
 | |
|         }
 | |
|         if (c->has_socket_id) {
 | |
|             monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", c->socket_id);
 | |
|         }
 | |
|         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);
 | |
|         }
 | |
|         if (c->has_thread_id) {
 | |
|             monitor_printf(mon, "    thread-id: \"%" PRIu64 "\"\n", c->thread_id);
 | |
|         }
 | |
| 
 | |
|         l = l->next;
 | |
|     }
 | |
| 
 | |
|     qapi_free_HotpluggableCPUList(saved);
 | |
| }
 | |
| 
 | |
| void hmp_info_memdev(Monitor *mon, const QDict *qdict)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     MemdevList *memdev_list = qmp_query_memdev(&err);
 | |
|     MemdevList *m = memdev_list;
 | |
|     Visitor *v;
 | |
|     char *str;
 | |
| 
 | |
|     while (m) {
 | |
|         v = string_output_visitor_new(false, &str);
 | |
|         visit_type_uint16List(v, NULL, &m->value->host_nodes, &error_abort);
 | |
|         monitor_printf(mon, "memory backend: %s\n", m->value->id);
 | |
|         monitor_printf(mon, "  size:  %" PRId64 "\n", m->value->size);
 | |
|         monitor_printf(mon, "  merge: %s\n",
 | |
|                        m->value->merge ? "true" : "false");
 | |
|         monitor_printf(mon, "  dump: %s\n",
 | |
|                        m->value->dump ? "true" : "false");
 | |
|         monitor_printf(mon, "  prealloc: %s\n",
 | |
|                        m->value->prealloc ? "true" : "false");
 | |
|         monitor_printf(mon, "  share: %s\n",
 | |
|                        m->value->share ? "true" : "false");
 | |
|         if (m->value->has_reserve) {
 | |
|             monitor_printf(mon, "  reserve: %s\n",
 | |
|                            m->value->reserve ? "true" : "false");
 | |
|         }
 | |
|         monitor_printf(mon, "  policy: %s\n",
 | |
|                        HostMemPolicy_str(m->value->policy));
 | |
|         visit_complete(v, &str);
 | |
|         monitor_printf(mon, "  host nodes: %s\n", str);
 | |
| 
 | |
|         g_free(str);
 | |
|         visit_free(v);
 | |
|         m = m->next;
 | |
|     }
 | |
| 
 | |
|     monitor_printf(mon, "\n");
 | |
| 
 | |
|     qapi_free_MemdevList(memdev_list);
 | |
|     hmp_handle_error(mon, err);
 | |
| }
 |