@@ -24,6 +24,7 @@
#include "ui/console.h"
#include "block/qapi.h"
#include "qemu-io.h"
+#include "sysemu/sysemu.h"
static void hmp_handle_error(Monitor *mon, Error **errp)
{
@@ -1546,3 +1547,36 @@ void hmp_set_mem_policy(Monitor *mon, const QDict *qdict)
qmp_set_mem_policy(nodeid, has_policy, policy, has_host_nodes, host_nodes, &local_err);
hmp_handle_error(mon, &local_err);
}
+
+void hmp_info_numa(Monitor *mon, const QDict *qdict)
+{
+ NUMAInfoList *node_list, *node;
+ intList *head;
+ int nodeid;
+
+ node_list = qmp_query_numa(NULL);
+
+ monitor_printf(mon, "%d nodes\n", nb_numa_nodes);
+ for (node = node_list; node; node = node->next) {
+ nodeid = node->value->nodeid;
+ monitor_printf(mon, "node %d cpus:", nodeid);
+ head = node->value->cpus;
+ for (head = node->value->cpus; head != NULL; head = head->next) {
+ monitor_printf(mon, " %d", (int)head->value);
+ }
+ monitor_printf(mon, "\n");
+ monitor_printf(mon, "node %d size: %" PRId64 " MB\n",
+ nodeid, node->value->memory);
+ monitor_printf(mon, "node %d policy: %s\n",
+ nodeid, node->value->policy ? : " ");
+ monitor_printf(mon, "node %d relative: %s\n", nodeid,
+ node->value->relative ? "true" : "false");
+ monitor_printf(mon, "node %d host-nodes:", nodeid);
+ for (head = node->value->host_nodes; head != NULL; head = head->next) {
+ monitor_printf(mon, " %d", (int)head->value);
+ }
+ monitor_printf(mon, "\n");
+ }
+
+ qapi_free_NUMAInfoList(node_list);
+}
@@ -37,6 +37,7 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict);
void hmp_info_pci(Monitor *mon, const QDict *qdict);
void hmp_info_block_jobs(Monitor *mon, const QDict *qdict);
void hmp_info_tpm(Monitor *mon, const QDict *qdict);
+void hmp_info_numa(Monitor *mon, const QDict *qdict);
void hmp_quit(Monitor *mon, const QDict *qdict);
void hmp_stop(Monitor *mon, const QDict *qdict);
void hmp_system_reset(Monitor *mon, const QDict *qdict);
@@ -1803,25 +1803,6 @@ static void do_info_mtree(Monitor *mon, const QDict *qdict)
mtree_info((fprintf_function)monitor_printf, mon);
}
-static void do_info_numa(Monitor *mon, const QDict *qdict)
-{
- int i;
- CPUState *cpu;
-
- monitor_printf(mon, "%d nodes\n", nb_numa_nodes);
- for (i = 0; i < nb_numa_nodes; i++) {
- monitor_printf(mon, "node %d cpus:", i);
- for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) {
- if (cpu->numa_node == i) {
- monitor_printf(mon, " %d", cpu->cpu_index);
- }
- }
- monitor_printf(mon, "\n");
- monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i,
- numa_info[i].node_mem >> 20);
- }
-}
-
#ifdef CONFIG_PROFILER
int64_t qemu_time;
@@ -2589,7 +2570,7 @@ static mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show NUMA information",
- .mhandler.cmd = do_info_numa,
+ .mhandler.cmd = hmp_info_numa,
},
{
.name = "usb",
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- hmp.c | 34 ++++++++++++++++++++++++++++++++++ hmp.h | 1 + monitor.c | 21 +-------------------- 3 files changed, 36 insertions(+), 20 deletions(-)