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

block/io: bdrv_common_block_status_above: support include_base 

In order to reuse bdrv_common_block_status_above in
bdrv_is_allocated_above, let's support include_base parameter.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20200924194003.22080-3-vsementsov@virtuozzo.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-09-24 22:40:00 +03:00 committed by Stefan Hajnoczi
parent 67c095c8b8
commit 3555a43261
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/coroutines.h
View File

@ -41,6 +41,7 @@ bdrv_pwritev(BdrvChild *child, int64_t offset, unsigned int bytes,
int coroutine_fn int coroutine_fn
bdrv_co_common_block_status_above(BlockDriverState *bs, bdrv_co_common_block_status_above(BlockDriverState *bs,
BlockDriverState *base, BlockDriverState *base,
bool include_base,
bool want_zero, bool want_zero,
int64_t offset, int64_t offset,
int64_t bytes, int64_t bytes,
@ -50,6 +51,7 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
int generated_co_wrapper int generated_co_wrapper
bdrv_common_block_status_above(BlockDriverState *bs, bdrv_common_block_status_above(BlockDriverState *bs,
BlockDriverState *base, BlockDriverState *base,
bool include_base,
bool want_zero, bool want_zero,
int64_t offset, int64_t offset,
int64_t bytes, int64_t bytes,

21
block/io.c
View File

@ -2343,6 +2343,7 @@ early_out:
int coroutine_fn int coroutine_fn
bdrv_co_common_block_status_above(BlockDriverState *bs, bdrv_co_common_block_status_above(BlockDriverState *bs,
BlockDriverState *base, BlockDriverState *base,
bool include_base,
bool want_zero, bool want_zero,
int64_t offset, int64_t offset,
int64_t bytes, int64_t bytes,
@ -2354,10 +2355,11 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
BlockDriverState *p; BlockDriverState *p;
int64_t eof = 0; int64_t eof = 0;
assert(bs != base); assert(include_base || bs != base);
assert(!include_base || base); /* Can't include NULL base */
ret = bdrv_co_block_status(bs, want_zero, offset, bytes, pnum, map, file); ret = bdrv_co_block_status(bs, want_zero, offset, bytes, pnum, map, file);
if (ret < 0 || *pnum == 0 || ret & BDRV_BLOCK_ALLOCATED) { if (ret < 0 || *pnum == 0 || ret & BDRV_BLOCK_ALLOCATED || bs == base) {
return ret; return ret;
} }
@ -2368,7 +2370,7 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
assert(*pnum <= bytes); assert(*pnum <= bytes);
bytes = *pnum; bytes = *pnum;
for (p = bdrv_filter_or_cow_bs(bs); p != base; for (p = bdrv_filter_or_cow_bs(bs); include_base || p != base;
p = bdrv_filter_or_cow_bs(p)) p = bdrv_filter_or_cow_bs(p))
{ {
ret = bdrv_co_block_status(p, want_zero, offset, bytes, pnum, map, ret = bdrv_co_block_status(p, want_zero, offset, bytes, pnum, map,
@ -2406,6 +2408,11 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
break; break;
} }
if (p == base) {
assert(include_base);
break;
}
/* /*
* OK, [offset, offset + *pnum) region is unallocated on this layer, * OK, [offset, offset + *pnum) region is unallocated on this layer,
* let's continue the diving. * let's continue the diving.
@ -2425,7 +2432,7 @@ 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)
{ {
return bdrv_common_block_status_above(bs, base, true, offset, bytes, return bdrv_common_block_status_above(bs, base, false, true, offset, bytes,
pnum, map, file); pnum, map, file);
} }
@ -2442,9 +2449,9 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset,
int ret; int ret;
int64_t dummy; int64_t dummy;
ret = bdrv_common_block_status_above(bs, bdrv_filter_or_cow_bs(bs), false, ret = bdrv_common_block_status_above(bs, bs, true, false, offset,
offset, bytes, pnum ? pnum : &dummy, bytes, pnum ? pnum : &dummy, NULL,
NULL, NULL); NULL);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }