From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvGv-0002px-2i for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvGt-000686-VZ for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:33 -0400 From: Kevin Wolf Date: Tue, 29 Mar 2016 17:08:11 +0200 Message-Id: <1459264128-12761-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1459264128-12761-1-git-send-email-kwolf@redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 11/48] block/qapi: Set s->device in bdrv_query_stats() 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 From: Max Reitz 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 Signed-off-by: Kevin Wolf --- block/qapi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 775dcf5..c5a696a 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -364,9 +364,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]; @@ -461,6 +458,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) { -- 1.8.3.1