From patchwork Fri Nov 22 02:08:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 293309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1EDCB2C0082 for ; Fri, 22 Nov 2013 13:15:34 +1100 (EST) Received: from localhost ([::1]:36311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjgHL-0002Lx-Eb for incoming@patchwork.ozlabs.org; Thu, 21 Nov 2013 21:15:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjgCI-0003YQ-2W for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjgCD-00020h-GS for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:10:18 -0500 Received: from [222.73.24.84] (port=44249 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjgCC-0001fT-Po for qemu-devel@nongnu.org; Thu, 21 Nov 2013 21:10:13 -0500 X-IronPort-AV: E=Sophos;i="4.93,748,1378828800"; d="scan'208";a="9098197" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 22 Nov 2013 10:06:34 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id rAM29jng032628; Fri, 22 Nov 2013 10:09:55 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.226.75]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013112210074259-327145 ; Fri, 22 Nov 2013 10:07:42 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Fri, 22 Nov 2013 10:08:38 +0800 Message-Id: <1385086118-11699-13-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.rc3 In-Reply-To: <1385086118-11699-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1385086118-11699-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/22 10:07:42, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/11/22 10:08:01, Serialize complete at 2013/11/22 10:08:01 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: drjones@redhat.com, ehabkost@redhat.com, lersek@redhat.com, hutao@cn.fujitsu.com, mtosatti@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, anthony@codemonkey.ws, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V16 11/11] NUMA: convert hmp command info_numa to use qmp command query_numa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Luiz Capitulino Signed-off-by: Wanlong Gao --- hmp.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hmp.h | 1 + monitor.c | 21 +-------------------- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/hmp.c b/hmp.c index 32ee285..d6dedd2 100644 --- a/hmp.c +++ b/hmp.c @@ -24,6 +24,10 @@ #include "ui/console.h" #include "block/qapi.h" #include "qemu-io.h" +#include "qapi-visit.h" +#include "qapi/opts-visitor.h" +#include "qapi/dealloc-visitor.h" +#include "sysemu/sysemu.h" static void hmp_handle_error(Monitor *mon, Error **errp) { @@ -1564,3 +1568,56 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } + +void hmp_info_numa(Monitor *mon, const QDict *qdict) +{ + NUMANodeList *node_list, *node; + uint16List *head; + int nodeid; + char *policy_str = NULL; + + 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 >> 20); + switch (node->value->policy) { + case NUMA_NODE_POLICY_DEFAULT: + policy_str = g_strdup("default"); + break; + case NUMA_NODE_POLICY_PREFERRED: + policy_str = g_strdup("preferred"); + break; + case NUMA_NODE_POLICY_MEMBIND: + policy_str = g_strdup("membind"); + break; + case NUMA_NODE_POLICY_INTERLEAVE: + policy_str = g_strdup("interleave"); + break; + default: + break; + } + monitor_printf(mon, "node %d policy: %s\n", + nodeid, policy_str ? : " "); + if (policy_str) { + free(policy_str); + } + 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_NUMANodeList(node_list); +} diff --git a/hmp.h b/hmp.h index 54cf71f..4f8d39b 100644 --- a/hmp.h +++ b/hmp.h @@ -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); diff --git a/monitor.c b/monitor.c index b97b7d3..f747a48 100644 --- a/monitor.c +++ b/monitor.c @@ -1989,25 +1989,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); - CPU_FOREACH(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; @@ -2775,7 +2756,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",