block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callers
bdrv_common_block_status_above() is a g_c_w, and it is being called by many "wrapper" functions like bdrv_is_allocated(), bdrv_is_allocated_above() and bdrv_block_status_above(). Because we want to eventually split the coroutine from non-coroutine case in g_c_w, create duplicate wrappers that take care of directly calling the same coroutine functions called in the g_c_w. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Message-Id: <20221128142337.657646-2-eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
606ed756c1
commit
7b52a921c1
56
block/io.c
56
block/io.c
|
@ -2533,6 +2533,17 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
|
||||||
|
BlockDriverState *base,
|
||||||
|
int64_t offset, int64_t bytes,
|
||||||
|
int64_t *pnum, int64_t *map,
|
||||||
|
BlockDriverState **file)
|
||||||
|
{
|
||||||
|
IO_CODE();
|
||||||
|
return bdrv_co_common_block_status_above(bs, base, false, true, offset,
|
||||||
|
bytes, pnum, map, file, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
|
int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
|
||||||
int64_t offset, int64_t bytes, int64_t *pnum,
|
int64_t offset, int64_t bytes, int64_t *pnum,
|
||||||
int64_t *map, BlockDriverState **file)
|
int64_t *map, BlockDriverState **file)
|
||||||
|
@ -2578,6 +2589,22 @@ int coroutine_fn bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset,
|
||||||
return (pnum == bytes) && (ret & BDRV_BLOCK_ZERO);
|
return (pnum == bytes) && (ret & BDRV_BLOCK_ZERO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset,
|
||||||
|
int64_t bytes, int64_t *pnum)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
int64_t dummy;
|
||||||
|
IO_CODE();
|
||||||
|
|
||||||
|
ret = bdrv_co_common_block_status_above(bs, bs, true, false, offset,
|
||||||
|
bytes, pnum ? pnum : &dummy, NULL,
|
||||||
|
NULL, NULL);
|
||||||
|
if (ret < 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
return !!(ret & BDRV_BLOCK_ALLOCATED);
|
||||||
|
}
|
||||||
|
|
||||||
int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||||
int64_t *pnum)
|
int64_t *pnum)
|
||||||
{
|
{
|
||||||
|
@ -2594,6 +2621,29 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||||
return !!(ret & BDRV_BLOCK_ALLOCATED);
|
return !!(ret & BDRV_BLOCK_ALLOCATED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* See bdrv_is_allocated_above for documentation */
|
||||||
|
int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
|
||||||
|
BlockDriverState *base,
|
||||||
|
bool include_base, int64_t offset,
|
||||||
|
int64_t bytes, int64_t *pnum)
|
||||||
|
{
|
||||||
|
int depth;
|
||||||
|
int ret;
|
||||||
|
IO_CODE();
|
||||||
|
|
||||||
|
ret = bdrv_co_common_block_status_above(top, base, include_base, false,
|
||||||
|
offset, bytes, pnum, NULL, NULL,
|
||||||
|
&depth);
|
||||||
|
if (ret < 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret & BDRV_BLOCK_ALLOCATED) {
|
||||||
|
return depth;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP]
|
* Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP]
|
||||||
*
|
*
|
||||||
|
@ -2617,10 +2667,12 @@ int bdrv_is_allocated_above(BlockDriverState *top,
|
||||||
int64_t bytes, int64_t *pnum)
|
int64_t bytes, int64_t *pnum)
|
||||||
{
|
{
|
||||||
int depth;
|
int depth;
|
||||||
int ret = bdrv_common_block_status_above(top, base, include_base, false,
|
int ret;
|
||||||
|
IO_CODE();
|
||||||
|
|
||||||
|
ret = bdrv_common_block_status_above(top, base, include_base, false,
|
||||||
offset, bytes, pnum, NULL, NULL,
|
offset, bytes, pnum, NULL, NULL,
|
||||||
&depth);
|
&depth);
|
||||||
IO_CODE();
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,14 +94,29 @@ bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs);
|
||||||
int bdrv_block_status(BlockDriverState *bs, int64_t offset,
|
int bdrv_block_status(BlockDriverState *bs, int64_t offset,
|
||||||
int64_t bytes, int64_t *pnum, int64_t *map,
|
int64_t bytes, int64_t *pnum, int64_t *map,
|
||||||
BlockDriverState **file);
|
BlockDriverState **file);
|
||||||
|
|
||||||
|
int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
|
||||||
|
BlockDriverState *base,
|
||||||
|
int64_t offset, int64_t bytes,
|
||||||
|
int64_t *pnum, int64_t *map,
|
||||||
|
BlockDriverState **file);
|
||||||
int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
|
int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
|
||||||
int64_t offset, int64_t bytes, int64_t *pnum,
|
int64_t offset, int64_t bytes, int64_t *pnum,
|
||||||
int64_t *map, BlockDriverState **file);
|
int64_t *map, BlockDriverState **file);
|
||||||
|
|
||||||
|
int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset,
|
||||||
|
int64_t bytes, int64_t *pnum);
|
||||||
int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
||||||
int64_t *pnum);
|
int64_t *pnum);
|
||||||
|
|
||||||
|
int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
|
||||||
|
BlockDriverState *base,
|
||||||
|
bool include_base, int64_t offset,
|
||||||
|
int64_t bytes, int64_t *pnum);
|
||||||
int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
|
int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
|
||||||
bool include_base, int64_t offset, int64_t bytes,
|
bool include_base, int64_t offset, int64_t bytes,
|
||||||
int64_t *pnum);
|
int64_t *pnum);
|
||||||
|
|
||||||
int coroutine_fn bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset,
|
int coroutine_fn bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset,
|
||||||
int64_t bytes);
|
int64_t bytes);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue