From patchwork Mon Mar 14 17:37:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8581811 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 467A9C0553 for ; Mon, 14 Mar 2016 17:38:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A908B201DD for ; Mon, 14 Mar 2016 17:38:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1C79203A4 for ; Mon, 14 Mar 2016 17:38:11 +0000 (UTC) Received: from localhost ([::1]:42780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWRX-0004YY-8Q for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 13:38:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWRF-0004TK-08 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:37:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afWRE-0000nm-3O for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:37:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWRC-0000lq-36; Mon, 14 Mar 2016 13:37:50 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id B29138F4E2; Mon, 14 Mar 2016 17:37:49 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2EHbi4Z014408; Mon, 14 Mar 2016 13:37:48 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 14 Mar 2016 18:37:04 +0100 Message-Id: <1457977061-28087-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1457977061-28087-1-git-send-email-kwolf@redhat.com> References: <1457977061-28087-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 03/40] block/qapi: Factor out bdrv_query_bds_stats() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new functions handles the data that is taken from the BlockDriverState. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/qapi.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index c04f1d8..31ae879 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -355,6 +355,9 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, qapi_free_BlockInfo(info); } +static BlockStats *bdrv_query_stats(const BlockDriverState *bs, + bool query_backing); + static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) { BlockAcctStats *stats = blk_get_stats(blk); @@ -422,13 +425,9 @@ static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) } } -static BlockStats *bdrv_query_stats(const BlockDriverState *bs, - bool query_backing) +static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, + bool query_backing) { - BlockStats *s; - - s = g_malloc0(sizeof(*s)); - if (bdrv_get_device_name(bs)[0]) { s->has_device = true; s->device = g_strdup(bdrv_get_device_name(bs)); @@ -439,11 +438,6 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs, s->node_name = g_strdup(bdrv_get_node_name(bs)); } - s->stats = g_malloc0(sizeof(*s->stats)); - if (bs->blk) { - bdrv_query_blk_stats(s, bs->blk); - } - s->stats->wr_highest_offset = bs->wr_highest_offset; if (bs->file) { @@ -456,6 +450,21 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs, s->backing = bdrv_query_stats(bs->backing->bs, query_backing); } +} + +static BlockStats *bdrv_query_stats(const BlockDriverState *bs, + bool query_backing) +{ + BlockStats *s; + + s = g_malloc0(sizeof(*s)); + s->stats = g_malloc0(sizeof(*s->stats)); + + if (bs->blk) { + bdrv_query_blk_stats(s, bs->blk); + } + bdrv_query_bds_stats(s, bs, query_backing); + return s; }