From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7i3A-0000Qa-2y for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7i37-0001tv-6l for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:20 -0400 From: Kevin Wolf Date: Thu, 26 Oct 2017 15:17:18 +0200 Message-Id: <20171026131741.5059-13-kwolf@redhat.com> In-Reply-To: <20171026131741.5059-1-kwolf@redhat.com> References: <20171026131741.5059-1-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 12/35] block: Switch bdrv_common_block_status_above() to byte-based 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: Eric Blake We are gradually converting to byte-based interfaces, as they are easier to reason about than sector-based. Convert another internal function (no semantic change). Signed-off-by: Eric Blake Signed-off-by: Kevin Wolf --- block/io.c | 61 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/block/io.c b/block/io.c index 71d5f18d04..3a9a4c5db9 100644 --- a/block/io.c +++ b/block/io.c @@ -2052,24 +2052,22 @@ static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque) * * See bdrv_co_get_block_status_above() for details. */ -static int64_t bdrv_common_block_status_above(BlockDriverState *bs, - BlockDriverState *base, - bool want_zero, - int64_t sector_num, - int nb_sectors, int *pnum, - BlockDriverState **file) +static int bdrv_common_block_status_above(BlockDriverState *bs, + BlockDriverState *base, + bool want_zero, int64_t offset, + int64_t bytes, int64_t *pnum, + int64_t *map, + BlockDriverState **file) { Coroutine *co; - int64_t n; - int64_t map; BdrvCoBlockStatusData data = { .bs = bs, .base = base, .want_zero = want_zero, - .offset = sector_num * BDRV_SECTOR_SIZE, - .bytes = nb_sectors * BDRV_SECTOR_SIZE, - .pnum = &n, - .map = &map, + .offset = offset, + .bytes = bytes, + .pnum = pnum, + .map = map, .file = file, .done = false, }; @@ -2083,13 +2081,7 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs, bdrv_coroutine_enter(bs, co); BDRV_POLL_WHILE(bs, !data.done); } - if (data.ret < 0) { - *pnum = 0; - return data.ret; - } - assert(QEMU_IS_ALIGNED(n | map, BDRV_SECTOR_SIZE)); - *pnum = n >> BDRV_SECTOR_BITS; - return data.ret | map; + return data.ret; } int64_t bdrv_get_block_status_above(BlockDriverState *bs, @@ -2098,8 +2090,21 @@ int64_t bdrv_get_block_status_above(BlockDriverState *bs, int nb_sectors, int *pnum, BlockDriverState **file) { - return bdrv_common_block_status_above(bs, base, true, sector_num, - nb_sectors, pnum, file); + int64_t ret; + int64_t n; + int64_t map; + + ret = bdrv_common_block_status_above(bs, base, true, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + &n, &map, file); + if (ret < 0) { + *pnum = 0; + return ret; + } + assert(QEMU_IS_ALIGNED(n | map, BDRV_SECTOR_SIZE)); + *pnum = n >> BDRV_SECTOR_BITS; + return ret | map; } int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes, @@ -2136,21 +2141,15 @@ int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes, int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes, int64_t *pnum) { - int64_t ret; - int psectors; + int ret; + int64_t dummy; - assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)); - assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE) && bytes < INT_MAX); - ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, - offset >> BDRV_SECTOR_BITS, - bytes >> BDRV_SECTOR_BITS, &psectors, + ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, offset, + bytes, pnum ? pnum : &dummy, NULL, NULL); if (ret < 0) { return ret; } - if (pnum) { - *pnum = psectors * BDRV_SECTOR_SIZE; - } return !!(ret & BDRV_BLOCK_ALLOCATED); } -- 2.13.6