From patchwork Sun Jun 9 19:12:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 250131 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 A91B82C0359 for ; Mon, 10 Jun 2013 06:15:29 +1000 (EST) Received: from localhost ([::1]:49305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UllKk-0002D4-Hg for incoming@patchwork.ozlabs.org; Sun, 09 Jun 2013 15:31:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4K-0000Sw-NS for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull4J-0000ip-M0 for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44431 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4J-0000ig-Eh for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:23 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0F4F4A41E0; Sun, 9 Jun 2013 21:14:23 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 9 Jun 2013 21:12:58 +0200 Message-Id: <1370805206-26574-32-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Luiz Capitulino Subject: [Qemu-devel] [PATCH qom-cpu 31/59] monitor: Simplify do_info_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 Use new qemu_for_each_cpu(). Signed-off-by: Andreas Färber --- monitor.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index 9be515c..f37bf3d 100644 --- a/monitor.c +++ b/monitor.c @@ -1803,21 +1803,32 @@ static void do_info_mtree(Monitor *mon, const QDict *qdict) mtree_info((fprintf_function)monitor_printf, mon); } +typedef struct DoInfoNUMAData { + Monitor *mon; + int numa_node; +} DoInfoNUMAData; + +static void do_info_numa_one(CPUState *cpu, void *data) +{ + DoInfoNUMAData *s = data; + + if (cpu->numa_node == s->numa_node) { + monitor_printf(s->mon, " %d", cpu->cpu_index); + } +} + static void do_info_numa(Monitor *mon, const QDict *qdict) { int i; - CPUArchState *env; - CPUState *cpu; + DoInfoNUMAData s = { + .mon = mon, + }; 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 (env = first_cpu; env != NULL; env = env->next_cpu) { - cpu = ENV_GET_CPU(env); - if (cpu->numa_node == i) { - monitor_printf(mon, " %d", cpu->cpu_index); - } - } + s.numa_node = i; + qemu_for_each_cpu(do_info_numa_one, &s); monitor_printf(mon, "\n"); monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i, node_mem[i] >> 20);