david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/qapi: Include empty drives in query-blockstats

Browse Source 
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 <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Kevin Wolf 2016-02-26 21:16:38 +01:00
parent b07363a1a3
commit c21cc6ca98
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
block/qapi.c
View File

@ -355,7 +355,8 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
qapi_free_BlockInfo(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); bool query_backing);
static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) 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); BlockAcctStats *stats = blk_get_stats(blk);
BlockAcctTimedStats *ts = NULL; 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->rd_bytes = stats->nr_bytes[BLOCK_ACCT_READ];
s->stats->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE]; s->stats->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE];
s->stats->rd_operations = stats->nr_ops[BLOCK_ACCT_READ]; 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, static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs,
bool query_backing) 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]) { if (bdrv_get_node_name(bs)[0]) {
s->has_node_name = true; s->has_node_name = true;
s->node_name = g_strdup(bdrv_get_node_name(bs)); 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) { if (bs->file) {
s->has_parent = true; 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) { if (query_backing && bs->backing) {
s->has_backing = true; 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) bool query_backing)
{ {
BlockStats *s; BlockStats *s;
@ -460,10 +460,12 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs,
s = g_malloc0(sizeof(*s)); s = g_malloc0(sizeof(*s));
s->stats = g_malloc0(sizeof(*s->stats)); s->stats = g_malloc0(sizeof(*s->stats));
if (bs->blk) { if (blk) {
bdrv_query_blk_stats(s, bs->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; return s;
} }
@ -491,22 +493,38 @@ BlockInfoList *qmp_query_block(Error **errp)
return head; 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, BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
bool query_nodes, bool query_nodes,
Error **errp) Error **errp)
{ {
BlockStatsList *head = NULL, **p_next = &head; BlockStatsList *head = NULL, **p_next = &head;
BlockBackend *blk = NULL;
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
/* Just to be safe if query_nodes is not always initialized */ /* Just to be safe if query_nodes is not always initialized */
query_nodes = has_query_nodes && query_nodes; 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)); 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); 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); aio_context_release(ctx);
*p_next = info; *p_next = info;