From patchwork Mon Dec 6 18:23:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74446 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 8602CB708B for ; Tue, 7 Dec 2010 05:43:26 +1100 (EST) Received: from localhost ([127.0.0.1]:40560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPg1z-0003tc-Eu for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:43:23 -0500 Received: from [140.186.70.92] (port=35879 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjm-00035h-Ri for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjk-00049h-L4 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjk-00049b-Cq for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:32 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOVlI012192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:31 -0500 Received: from localhost ([10.3.113.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOU1F030018; Mon, 6 Dec 2010 13:24:30 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:55 -0200 Message-Id: <1291659852-23028-9-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.67 on 10.5.11.12 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 08/25] Monitor: Convert bdrv_stats_print() into bdrv_stats() 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_blockstats() 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 2eadd70..5b89790 100644 --- a/block.c +++ b/block.c @@ -1671,9 +1671,13 @@ static void bdrv_stats_iter(QObject *data, void *opaque) qdict_get_int(qdict, "wr_operations")); } -void bdrv_stats_print(Monitor *mon, const QObject *data) +void bdrv_stats(Monitor *mon) { + QObject *data; + + qmp_query_blockstats(NULL, &data); qlist_iter(qobject_to_qlist(data), bdrv_stats_iter, mon); + qobject_decref(data); } static QObject* bdrv_info_stats_bs(BlockDriverState *bs) diff --git a/block.h b/block.h index e71b6ad..ff79f02 100644 --- a/block.h +++ b/block.h @@ -54,7 +54,7 @@ void bdrv_mon_event(const BlockDriverState *bdrv, BlockMonEventAction action, int is_read); void qmp_query_block(Monitor *mon, QObject **ret_data); void bdrv_info(Monitor *mon); -void bdrv_stats_print(Monitor *mon, const QObject *data); +void bdrv_stats(Monitor *mon); void qmp_query_blockstats(Monitor *mon, QObject **ret_data); void bdrv_init(void); diff --git a/monitor.c b/monitor.c index 2bdaf03..3091a1a 100644 --- a/monitor.c +++ b/monitor.c @@ -2416,8 +2416,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show block device statistics", - .user_print = bdrv_stats_print, - .mhandler.info_new = qmp_query_blockstats, + .mhandler.info = bdrv_stats, }, { .name = "registers",