From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMS5G-0004qL-T9 for qemu-devel@nongnu.org; Thu, 21 Jan 2016 22:08:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMS5G-0000pV-33 for qemu-devel@nongnu.org; Thu, 21 Jan 2016 22:08:22 -0500 From: Fam Zheng Date: Fri, 22 Jan 2016 11:06:33 +0800 Message-Id: <1453431996-27764-13-git-send-email-famz@redhat.com> In-Reply-To: <1453431996-27764-1-git-send-email-famz@redhat.com> References: <1453431996-27764-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v7 12/15] block: Use returned *file in bdrv_co_get_block_status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, mreitz@redhat.com, Stefan Hajnoczi , pbonzini@redhat.com Now that all drivers return the right "file" pointer, we can use it. Signed-off-by: Fam Zheng Reviewed-by: Max Reitz --- block/io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/io.c b/block/io.c index 0836991..d704d32 100644 --- a/block/io.c +++ b/block/io.c @@ -1552,13 +1552,13 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, } } - if (bs->file && + if (*file && *file != bs && (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && (ret & BDRV_BLOCK_OFFSET_VALID)) { BlockDriverState *file2; int file_pnum; - ret2 = bdrv_co_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS, + ret2 = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS, *pnum, &file_pnum, &file2); if (ret2 >= 0) { /* Ignore errors. This is just providing extra information, it -- 2.4.3