From patchwork Mon Dec 6 18:23:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4E678B70EE for ; Tue, 7 Dec 2010 05:40:16 +1100 (EST) Received: from localhost ([127.0.0.1]:52496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfyv-0001xC-Hw for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:40:13 -0500 Received: from [140.186.70.92] (port=35860 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjj-00032t-St for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfji-00049M-NV for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfji-000497-5l for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:30 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOTkf005874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:29 -0500 Received: from localhost ([10.3.113.17]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6IOSNk002827; Mon, 6 Dec 2010 13:24:28 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:54 -0200 Message-Id: <1291659852-23028-8-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_info() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The new handler directly calls qmp_query_block() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- block.c | 6 +++++- block.h | 2 +- monitor.c | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index a5d865b..2eadd70 100644 --- a/block.c +++ b/block.c @@ -1591,9 +1591,13 @@ static void bdrv_print_dict(QObject *obj, void *opaque) monitor_printf(mon, "\n"); } -void bdrv_info_print(Monitor *mon, const QObject *data) +void bdrv_info(Monitor *mon) { + QObject *data; + + qmp_query_block(NULL, &data); qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon); + qobject_decref(data); } void qmp_query_block(Monitor *mon, QObject **ret_data) diff --git a/block.h b/block.h index a979d5b..e71b6ad 100644 --- a/block.h +++ b/block.h @@ -52,8 +52,8 @@ typedef enum { void bdrv_mon_event(const BlockDriverState *bdrv, BlockMonEventAction action, int is_read); -void bdrv_info_print(Monitor *mon, const QObject *data); void qmp_query_block(Monitor *mon, QObject **ret_data); +void bdrv_info(Monitor *mon); void bdrv_stats_print(Monitor *mon, const QObject *data); void qmp_query_blockstats(Monitor *mon, QObject **ret_data); diff --git a/monitor.c b/monitor.c index d48c137..2bdaf03 100644 --- a/monitor.c +++ b/monitor.c @@ -2409,8 +2409,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the block devices", - .user_print = bdrv_info_print, - .mhandler.info_new = qmp_query_block, + .mhandler.info = bdrv_info, }, { .name = "blockstats",