diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-03-02 18:31:08 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-30 11:59:32 +0200 |
| commit | 0e8f44bee998ba7711b77efee7aee0aee688b4ad (patch) | |
| tree | a01c81e3acdc7e61d2b362d65aa8982dba6f3449 /block | |
| parent | 5eda622768a2162993e50275b325125d4485757d (diff) | |
| download | qemu-0e8f44bee998ba7711b77efee7aee0aee688b4ad.zip qemu-0e8f44bee998ba7711b77efee7aee0aee688b4ad.tar.gz qemu-0e8f44bee998ba7711b77efee7aee0aee688b4ad.tar.bz2 | |
block/qapi: Set s->device in bdrv_query_stats()
This is the only instance of bdrv_query_blk_stats() accessing anything
in the BlockStats structure other than s->stats, so let us move it to
its caller (where it makes just as much sense) allowing us to make
bdrv_query_blk_stats() take a pointer to the BlockDeviceStats instead of
BlockStats.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qapi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/qapi.c b/block/qapi.c index 1961cdf..627ef57 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -365,9 +365,6 @@ 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]; @@ -462,6 +459,8 @@ static BlockStats *bdrv_query_stats(BlockBackend *blk, s->stats = g_malloc0(sizeof(*s->stats)); if (blk) { + s->has_device = true; + s->device = g_strdup(blk_name(blk)); bdrv_query_blk_stats(s, blk); } if (bs) { |