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

block-copy: small refactor in block_copy_task_entry and block_copy_common 

Use a local variable instead of referencing BlockCopyState through a
BlockCopyCallState or BlockCopyTask every time.
This is in preparation for next patches.

No functional change intended.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210624072043.180494-2-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2021-06-24 09:20:39 +02:00 committed by Vladimir Sementsov-Ogievskiy
parent 55fa54a789
commit c6a3e3df30
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block/block-copy.c
View File

@ -452,14 +452,15 @@ static void block_copy_handle_copy_range_result(BlockCopyState *s,
static coroutine_fn int block_copy_task_entry(AioTask *task) static coroutine_fn int block_copy_task_entry(AioTask *task)
{ {
BlockCopyTask *t = container_of(task, BlockCopyTask, task); BlockCopyTask *t = container_of(task, BlockCopyTask, task);
BlockCopyState *s = t->s;
bool error_is_read = false; bool error_is_read = false;
bool copy_range = t->copy_range; bool copy_range = t->copy_range;
int ret; int ret;
ret = block_copy_do_copy(t->s, t->offset, t->bytes, t->zeroes, ret = block_copy_do_copy(s, t->offset, t->bytes, t->zeroes,
&copy_range, &error_is_read); &copy_range, &error_is_read);
if (t->copy_range) { if (t->copy_range) {
block_copy_handle_copy_range_result(t->s, copy_range); block_copy_handle_copy_range_result(s, copy_range);
} }
if (ret < 0) { if (ret < 0) {
if (!t->call_state->ret) { if (!t->call_state->ret) {
@ -467,9 +468,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
t->call_state->error_is_read = error_is_read; t->call_state->error_is_read = error_is_read;
} }
} else { } else {
progress_work_done(t->s->progress, t->bytes); progress_work_done(s->progress, t->bytes);
} }
co_put_to_shres(t->s->mem, t->bytes); co_put_to_shres(s->mem, t->bytes);
block_copy_task_end(t, ret); block_copy_task_end(t, ret);
return ret; return ret;
@ -714,14 +715,15 @@ void block_copy_kick(BlockCopyCallState *call_state)
static int coroutine_fn block_copy_common(BlockCopyCallState *call_state) static int coroutine_fn block_copy_common(BlockCopyCallState *call_state)
{ {
int ret; int ret;
BlockCopyState *s = call_state->s;
QLIST_INSERT_HEAD(&call_state->s->calls, call_state, list); QLIST_INSERT_HEAD(&s->calls, call_state, list);
do { do {
ret = block_copy_dirty_clusters(call_state); ret = block_copy_dirty_clusters(call_state);
if (ret == 0 && !call_state->cancelled) { if (ret == 0 && !call_state->cancelled) {
ret = block_copy_wait_one(call_state->s, call_state->offset, ret = block_copy_wait_one(s, call_state->offset,
call_state->bytes); call_state->bytes);
} }