From: Eric Blake Date: Thu, 4 May 2017 17:37:45 +0000 (-0500) Subject: block: Simplify BDRV_BLOCK_RAW recursion X-Git-Tag: v2.9.1~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a3f9c5c6e54d05e35bad786ce619d72d02c29de;p=thirdparty%2Fqemu.git block: Simplify BDRV_BLOCK_RAW recursion Since we are already in coroutine context during the body of bdrv_co_get_block_status(), we can shave off a few layers of wrappers when recursing to query the protocol when a format driver returned BDRV_BLOCK_RAW. Note that we are already using the correct recursion later on in the same function, when probing whether the protocol layer is sparse in order to find out if we can add BDRV_BLOCK_ZERO to an existing BDRV_BLOCK_DATA|BDRV_BLOCK_OFFSET_VALID. Signed-off-by: Eric Blake Reviewed-by: Max Reitz Reviewed-by: Fam Zheng Message-id: 20170504173745.27414-1-eblake@redhat.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit ee29d6adefcca7e76abb124183814ed3acc74fac) * prereq for 81c219a Signed-off-by: Michael Roth --- diff --git a/block/io.c b/block/io.c index a7142e00e83..fe0c8677bae 100644 --- a/block/io.c +++ b/block/io.c @@ -1792,8 +1792,8 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, if (ret & BDRV_BLOCK_RAW) { assert(ret & BDRV_BLOCK_OFFSET_VALID); - ret = bdrv_get_block_status(*file, ret >> BDRV_SECTOR_BITS, - *pnum, pnum, file); + ret = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS, + *pnum, pnum, file); goto out; }