From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWRG-0004WX-Uo for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afWRF-0000pP-RT for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:37:54 -0400 From: Kevin Wolf Date: Mon, 14 Mar 2016 18:37:05 +0100 Message-Id: <1457977061-28087-5-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> Subject: [Qemu-devel] [PULL 04/40] block/qapi: Include empty drives in query-blockstats List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Since commit 5ec18f8c, query-blockstats didn't return the statistics of drives without media any more because such drives have only a BB now, but not a BDS any more. This patch fixes the regression so that query-blockstats iterates over BBs by default and empty drives are displayed again. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/qapi.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 31ae879..6a4869a 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -355,7 +355,8 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, qapi_free_BlockInfo(info); } -static BlockStats *bdrv_query_stats(const BlockDriverState *bs, +static BlockStats *bdrv_query_stats(BlockBackend *blk, + const BlockDriverState *bs, bool query_backing); static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) @@ -363,6 +364,9 @@ static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) BlockAcctStats *stats = blk_get_stats(blk); BlockAcctTimedStats *ts = NULL; + s->has_device = true; + s->device = g_strdup(blk_name(blk)); + s->stats->rd_bytes = stats->nr_bytes[BLOCK_ACCT_READ]; s->stats->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE]; s->stats->rd_operations = stats->nr_ops[BLOCK_ACCT_READ]; @@ -428,11 +432,6 @@ static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, bool query_backing) { - if (bdrv_get_device_name(bs)[0]) { - s->has_device = true; - s->device = g_strdup(bdrv_get_device_name(bs)); - } - if (bdrv_get_node_name(bs)[0]) { s->has_node_name = true; s->node_name = g_strdup(bdrv_get_node_name(bs)); @@ -442,17 +441,18 @@ static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_stats(bs->file->bs, query_backing); + s->parent = bdrv_query_stats(NULL, bs->file->bs, query_backing); } if (query_backing && bs->backing) { s->has_backing = true; - s->backing = bdrv_query_stats(bs->backing->bs, query_backing); + s->backing = bdrv_query_stats(NULL, bs->backing->bs, query_backing); } } -static BlockStats *bdrv_query_stats(const BlockDriverState *bs, +static BlockStats *bdrv_query_stats(BlockBackend *blk, + const BlockDriverState *bs, bool query_backing) { BlockStats *s; @@ -460,10 +460,12 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs, s = g_malloc0(sizeof(*s)); s->stats = g_malloc0(sizeof(*s->stats)); - if (bs->blk) { - bdrv_query_blk_stats(s, bs->blk); + if (blk) { + bdrv_query_blk_stats(s, blk); + } + if (bs) { + bdrv_query_bds_stats(s, bs, query_backing); } - bdrv_query_bds_stats(s, bs, query_backing); return s; } @@ -491,22 +493,38 @@ BlockInfoList *qmp_query_block(Error **errp) return head; } +static bool next_query_bds(BlockBackend **blk, BlockDriverState **bs, + bool query_nodes) +{ + if (query_nodes) { + *bs = bdrv_next_node(*bs); + return !!*bs; + } + + *blk = blk_next(*blk); + *bs = *blk ? blk_bs(*blk) : NULL; + + return !!*blk; +} + BlockStatsList *qmp_query_blockstats(bool has_query_nodes, bool query_nodes, Error **errp) { BlockStatsList *head = NULL, **p_next = &head; + BlockBackend *blk = NULL; BlockDriverState *bs = NULL; /* Just to be safe if query_nodes is not always initialized */ query_nodes = has_query_nodes && query_nodes; - while ((bs = query_nodes ? bdrv_next_node(bs) : bdrv_next(bs))) { + while (next_query_bds(&blk, &bs, query_nodes)) { BlockStatsList *info = g_malloc0(sizeof(*info)); - AioContext *ctx = bdrv_get_aio_context(bs); + AioContext *ctx = blk ? blk_get_aio_context(blk) + : bdrv_get_aio_context(bs); aio_context_acquire(ctx); - info->value = bdrv_query_stats(bs, !query_nodes); + info->value = bdrv_query_stats(blk, bs, !query_nodes); aio_context_release(ctx); *p_next = info; -- 1.8.3.1