ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Switch bdrv_common_block_status_above() to byte-based 

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 <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2017-10-11 22:47:06 -05:00 committed by Kevin Wolf
parent 4bcd936e47
commit 7ddb99b9dc
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
block/io.c
View File

@ -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. * See bdrv_co_get_block_status_above() for details.
*/ */
static int64_t bdrv_common_block_status_above(BlockDriverState *bs, static int bdrv_common_block_status_above(BlockDriverState *bs,
BlockDriverState *base, BlockDriverState *base,
bool want_zero, bool want_zero, int64_t offset,
int64_t sector_num, int64_t bytes, int64_t *pnum,
int nb_sectors, int *pnum, int64_t *map,
BlockDriverState **file) BlockDriverState **file)
{ {
Coroutine *co; Coroutine *co;
int64_t n;
int64_t map;
BdrvCoBlockStatusData data = { BdrvCoBlockStatusData data = {
.bs = bs, .bs = bs,
.base = base, .base = base,
.want_zero = want_zero, .want_zero = want_zero,
.offset = sector_num * BDRV_SECTOR_SIZE, .offset = offset,
.bytes = nb_sectors * BDRV_SECTOR_SIZE, .bytes = bytes,
.pnum = &n, .pnum = pnum,
.map = &map, .map = map,
.file = file, .file = file,
.done = false, .done = false,
}; };
@ -2083,13 +2081,7 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs,
bdrv_coroutine_enter(bs, co); bdrv_coroutine_enter(bs, co);
BDRV_POLL_WHILE(bs, !data.done); BDRV_POLL_WHILE(bs, !data.done);
} }
if (data.ret < 0) {
*pnum = 0;
return data.ret; return data.ret;
}
assert(QEMU_IS_ALIGNED(n | map, BDRV_SECTOR_SIZE));
*pnum = n >> BDRV_SECTOR_BITS;
return data.ret | map;
} }
int64_t bdrv_get_block_status_above(BlockDriverState *bs, 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, int nb_sectors, int *pnum,
BlockDriverState **file) BlockDriverState **file)
{ {
return bdrv_common_block_status_above(bs, base, true, sector_num, int64_t ret;
nb_sectors, pnum, file); 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, 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, int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset,
int64_t bytes, int64_t *pnum) int64_t bytes, int64_t *pnum)
{ {
int64_t ret; int ret;
int psectors; int64_t dummy;
assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE)); ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, offset,
assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE) && bytes < INT_MAX); bytes, pnum ? pnum : &dummy, NULL,
ret = bdrv_common_block_status_above(bs, backing_bs(bs), false,
offset >> BDRV_SECTOR_BITS,
bytes >> BDRV_SECTOR_BITS, &psectors,
NULL); NULL);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if (pnum) {
*pnum = psectors * BDRV_SECTOR_SIZE;
}
return !!(ret & BDRV_BLOCK_ALLOCATED); return !!(ret & BDRV_BLOCK_ALLOCATED);
} }