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

block/block-copy: More explicit call_state 

Refactor common path to use BlockCopyCallState pointer as parameter, to
prepare it for use in asynchronous block-copy (at least, we'll need to
run block-copy in a coroutine, passing the whole parameters as one
pointer).

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210116214705.822267-3-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-01-17 00:46:44 +03:00 committed by Max Reitz
parent 86c6a3b690
commit 3b8c2329b5
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
block/block-copy.c
View File

@ -30,7 +30,15 @@
static coroutine_fn int block_copy_task_entry(AioTask *task); static coroutine_fn int block_copy_task_entry(AioTask *task);
typedef struct BlockCopyCallState { typedef struct BlockCopyCallState {
/* IN parameters */
BlockCopyState *s;
int64_t offset;
int64_t bytes;
/* State */
bool failed; bool failed;
/* OUT parameters */
bool error_is_read; bool error_is_read;
} BlockCopyCallState; } BlockCopyCallState;
@ -544,15 +552,17 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
* Returns 1 if dirty clusters found and successfully copied, 0 if no dirty * Returns 1 if dirty clusters found and successfully copied, 0 if no dirty
* clusters found and -errno on failure. * clusters found and -errno on failure.
*/ */
static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, static int coroutine_fn
int64_t offset, int64_t bytes, block_copy_dirty_clusters(BlockCopyCallState *call_state)
bool *error_is_read)
{ {
BlockCopyState *s = call_state->s;
int64_t offset = call_state->offset;
int64_t bytes = call_state->bytes;
int ret = 0; int ret = 0;
bool found_dirty = false; bool found_dirty = false;
int64_t end = offset + bytes; int64_t end = offset + bytes;
AioTaskPool *aio = NULL; AioTaskPool *aio = NULL;
BlockCopyCallState call_state = {false, false};
/* /*
* block_copy() user is responsible for keeping source and target in same * block_copy() user is responsible for keeping source and target in same
@ -568,7 +578,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s,
BlockCopyTask *task; BlockCopyTask *task;
int64_t status_bytes; int64_t status_bytes;
task = block_copy_task_create(s, &call_state, offset, bytes); task = block_copy_task_create(s, call_state, offset, bytes);
if (!task) { if (!task) {
/* No more dirty bits in the bitmap */ /* No more dirty bits in the bitmap */
trace_block_copy_skip_range(s, offset, bytes); trace_block_copy_skip_range(s, offset, bytes);
@ -633,15 +643,12 @@ out:
aio_task_pool_free(aio); aio_task_pool_free(aio);
} }
if (error_is_read && ret < 0) {
*error_is_read = call_state.error_is_read;
}
return ret < 0 ? ret : found_dirty; return ret < 0 ? ret : found_dirty;
} }
/* /*
* block_copy * block_copy_common
* *
* Copy requested region, accordingly to dirty bitmap. * Copy requested region, accordingly to dirty bitmap.
* Collaborate with parallel block_copy requests: if they succeed it will help * Collaborate with parallel block_copy requests: if they succeed it will help
@ -649,16 +656,16 @@ out:
* it means that some I/O operation failed in context of _this_ block_copy call, * it means that some I/O operation failed in context of _this_ block_copy call,
* not some parallel operation. * not some parallel operation.
*/ */
int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes, static int coroutine_fn block_copy_common(BlockCopyCallState *call_state)
bool *error_is_read)
{ {
int ret; int ret;
do { do {
ret = block_copy_dirty_clusters(s, offset, bytes, error_is_read); ret = block_copy_dirty_clusters(call_state);
if (ret == 0) { if (ret == 0) {
ret = block_copy_wait_one(s, offset, bytes); ret = block_copy_wait_one(call_state->s, call_state->offset,
call_state->bytes);
} }
/* /*
@ -675,6 +682,24 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes,
return ret; return ret;
} }
int coroutine_fn block_copy(BlockCopyState *s, int64_t start, int64_t bytes,
bool *error_is_read)
{
BlockCopyCallState call_state = {
.s = s,
.offset = start,
.bytes = bytes,
};
int ret = block_copy_common(&call_state);
if (error_is_read && ret < 0) {
*error_is_read = call_state.error_is_read;
}
return ret;
}
BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s) BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s)
{ {
return s->copy_bitmap; return s->copy_bitmap;