From patchwork Wed Mar 2 17:31:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 591051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 770C4140B9C for ; Thu, 3 Mar 2016 04:32:23 +1100 (AEDT) Received: from localhost ([::1]:57970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abAdJ-0006pD-JM for incoming@patchwork.ozlabs.org; Wed, 02 Mar 2016 12:32:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abAcH-0005Xf-MS for qemu-devel@nongnu.org; Wed, 02 Mar 2016 12:31:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abAcG-0002ra-UL for qemu-devel@nongnu.org; Wed, 02 Mar 2016 12:31:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abAcF-0002qt-8Y; Wed, 02 Mar 2016 12:31:15 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id E160B8050D; Wed, 2 Mar 2016 17:31:14 +0000 (UTC) Received: from localhost (ovpn-116-86.ams2.redhat.com [10.36.116.86]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u22HVDMQ022397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 2 Mar 2016 12:31:14 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 2 Mar 2016 18:31:08 +0100 Message-Id: <1456939869-529-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1456939869-529-1-git-send-email-mreitz@redhat.com> References: <1456939869-529-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH 1/2] block/qapi: Set s->device in bdrv_query_stats() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block/qapi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 6a4869a..d391cf9 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) {