From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsA9P-0001eg-St for qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsA9O-0006Ct-Tx for qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:31 -0400 From: Eric Blake Date: Wed, 13 Sep 2017 11:03:20 -0500 Message-Id: <20170913160333.23622-11-eblake@redhat.com> In-Reply-To: <20170913160333.23622-1-eblake@redhat.com> References: <20170913160333.23622-1-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v4 10/23] block: Switch bdrv_common_block_status_above() to byte-based List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, jsnow@redhat.com, kwolf@redhat.com, qemu-block@nongnu.org, Stefan Hajnoczi , Max Reitz 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 Reviewed-by: Fam Zheng --- v3: rebase to allocation/mapping sense change, simple enough to keep R-b v2: new patch --- block/io.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/block/io.c b/block/io.c index 0adfbb8e70..bc0e3fd0e2 100644 --- a/block/io.c +++ b/block/io.c @@ -1962,19 +1962,18 @@ static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque) static int64_t bdrv_common_block_status_above(BlockDriverState *bs, BlockDriverState *base, bool mapping, - int64_t sector_num, - int nb_sectors, int *pnum, + int64_t offset, + int64_t bytes, int64_t *pnum, BlockDriverState **file) { Coroutine *co; - int64_t n; BdrvCoBlockStatusData data = { .bs = bs, .base = base, .file = file, - .offset = sector_num * BDRV_SECTOR_SIZE, - .bytes = nb_sectors * BDRV_SECTOR_SIZE, - .pnum = &n, + .offset = offset, + .bytes = bytes, + .pnum = pnum, .mapping = mapping, .done = false, }; @@ -1988,8 +1987,6 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs, bdrv_coroutine_enter(bs, co); BDRV_POLL_WHILE(bs, !data.done); } - assert(data.ret < 0 || QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)); - *pnum = n >> BDRV_SECTOR_BITS; return data.ret; } @@ -1999,8 +1996,19 @@ 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; + + ret = bdrv_common_block_status_above(bs, base, true, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + &n, file); + if (ret < 0) { + return ret; + } + assert(QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)); + *pnum = n >> BDRV_SECTOR_BITS; + return ret; } int64_t bdrv_block_status(BlockDriverState *bs, @@ -2025,20 +2033,13 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes, int64_t *pnum) { int64_t ret; - int psectors; + 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, - NULL); + ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, offset, + bytes, pnum ? pnum : &dummy, NULL); if (ret < 0) { return ret; } - if (pnum) { - *pnum = psectors * BDRV_SECTOR_SIZE; - } return !!(ret & BDRV_BLOCK_ALLOCATED); } -- 2.13.5