From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35900 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjo-00037R-OP for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjn-0004AO-Nx for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjn-0004AH-GY for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:35 -0500 From: Luiz Capitulino Date: Mon, 6 Dec 2010 16:23:57 -0200 Message-Id: <1291659852-23028-11-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> References: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 10/25] Monitor: Convert monitor_print_cpus() into do_info_cpus() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, armbru@redhat.com The new handler directly calls qmp_query_cpus() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- monitor.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/monitor.c b/monitor.c index f067d07..2164853 100644 --- a/monitor.c +++ b/monitor.c @@ -931,13 +931,13 @@ static void print_cpu_iter(QObject *obj, void *opaque) monitor_printf(mon, "\n"); } -static void monitor_print_cpus(Monitor *mon, const QObject *data) +static void do_info_cpus(Monitor *mon) { - QList *cpu_list; + QObject *data; - assert(qobject_type(data) == QTYPE_QLIST); - cpu_list = qobject_to_qlist(data); - qlist_iter(cpu_list, print_cpu_iter, mon); + qmp_query_cpus(mon, &data); + qlist_iter(qobject_to_qlist(data), print_cpu_iter, mon); + qobject_decref(data); } static int do_cpu_set(Monitor *mon, const QDict *qdict, QObject **ret_data) @@ -2430,8 +2430,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show infos for each CPU", - .user_print = monitor_print_cpus, - .mhandler.info_new = qmp_query_cpus, + .mhandler.info = do_info_cpus, }, { .name = "history", -- 1.7.3.3.398.g0b0cd