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: make setting progress optional 

Now block-copy will crash if user don't set progress meter by
block_copy_set_progress_meter(). copy-before-write filter will be used
in separate of backup job, and it doesn't want any progress meter (for
now). So, allow not setting it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210824083856.17408-21-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-08-24 11:38:42 +03:00 committed by Hanna Reitz
parent 06e0a9c164
commit 201b4bb6c7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block/block-copy.c
View File

@ -292,9 +292,11 @@ static void coroutine_fn block_copy_task_end(BlockCopyTask *task, int ret)
bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset, task->bytes); bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset, task->bytes);
} }
QLIST_REMOVE(task, list); QLIST_REMOVE(task, list);
progress_set_remaining(task->s->progress, if (task->s->progress) {
bdrv_get_dirty_count(task->s->copy_bitmap) + progress_set_remaining(task->s->progress,
task->s->in_flight_bytes); bdrv_get_dirty_count(task->s->copy_bitmap) +
task->s->in_flight_bytes);
}
qemu_co_queue_restart_all(&task->wait_queue); qemu_co_queue_restart_all(&task->wait_queue);
} }
@ -594,7 +596,7 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
t->call_state->ret = ret; t->call_state->ret = ret;
t->call_state->error_is_read = error_is_read; t->call_state->error_is_read = error_is_read;
} }
} else { } else if (s->progress) {
progress_work_done(s->progress, t->bytes); progress_work_done(s->progress, t->bytes);
} }
} }
@ -700,9 +702,11 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
if (!ret) { if (!ret) {
qemu_co_mutex_lock(&s->lock); qemu_co_mutex_lock(&s->lock);
bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
progress_set_remaining(s->progress, if (s->progress) {
bdrv_get_dirty_count(s->copy_bitmap) + progress_set_remaining(s->progress,
s->in_flight_bytes); bdrv_get_dirty_count(s->copy_bitmap) +
s->in_flight_bytes);
}
qemu_co_mutex_unlock(&s->lock); qemu_co_mutex_unlock(&s->lock);
} }