block/qapi: Factor out bdrv_query_bds_stats()

The new functions handles the data that is taken from the
BlockDriverState.

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:03:01 +01:00
parent 2b77e60ab8
commit b07363a1a3

View file

@ -355,6 +355,9 @@ 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,
bool query_backing);
static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk) static void bdrv_query_blk_stats(BlockStats *s, BlockBackend *blk)
{ {
BlockAcctStats *stats = blk_get_stats(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, static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs,
bool query_backing) bool query_backing)
{ {
BlockStats *s;
s = g_malloc0(sizeof(*s));
if (bdrv_get_device_name(bs)[0]) { if (bdrv_get_device_name(bs)[0]) {
s->has_device = true; s->has_device = true;
s->device = g_strdup(bdrv_get_device_name(bs)); 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->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; s->stats->wr_highest_offset = bs->wr_highest_offset;
if (bs->file) { 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); 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; return s;
} }