motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: move commit_run loop to separate function

Browse source 
Signed-off-by: Vincent Vanlaer <libvirt-e6954efa@volkihar.be>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20241026163010.2865002-3-libvirt-e6954efa@volkihar.be>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
This commit is contained in:
Vincent Vanlaer 2024-10-26 18:30:06 +02:00 • committed by Vladimir Sementsov-Ogievskiy
parent 71365ee433
commit 23743ab282
1 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

87
block/commit.c
View file

@ -128,6 +128,55 @@ static void commit_clean(Job *job)
blk_unref(s->top); blk_unref(s->top);
} }
static int commit_iteration(CommitBlockJob *s, int64_t offset,
int64_t *n, void *buf)
{
int ret = 0;
bool copy;
bool error_in_source = true;
/* Copy if allocated above the base */
WITH_GRAPH_RDLOCK_GUARD() {
ret = bdrv_co_common_block_status_above(blk_bs(s->top),
s->base_overlay, true, true, offset, COMMIT_BUFFER_SIZE,
n, NULL, NULL, NULL);
}
copy = (ret >= 0 && ret & BDRV_BLOCK_ALLOCATED);
trace_commit_one_iteration(s, offset, *n, ret);
if (copy) {
assert(*n < SIZE_MAX);
ret = blk_co_pread(s->top, offset, *n, buf, 0);
if (ret >= 0) {
ret = blk_co_pwrite(s->base, offset, *n, buf, 0);
if (ret < 0) {
error_in_source = false;
}
}
}
if (ret < 0) {
BlockErrorAction action = block_job_error_action(&s->common,
s->on_error,
error_in_source,
-ret);
if (action == BLOCK_ERROR_ACTION_REPORT) {
return ret;
} else {
*n = 0;
return 0;
}
}
/* Publish progress */
job_progress_update(&s->common.job, *n);
if (copy) {
block_job_ratelimit_processed_bytes(&s->common, *n);
}
return 0;
}
static int coroutine_fn commit_run(Job *job, Error **errp) static int coroutine_fn commit_run(Job *job, Error **errp)
{ {
CommitBlockJob *s = container_of(job, CommitBlockJob, common.job); CommitBlockJob *s = container_of(job, CommitBlockJob, common.job);
@ -158,9 +207,6 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
buf = blk_blockalign(s->top, COMMIT_BUFFER_SIZE); buf = blk_blockalign(s->top, COMMIT_BUFFER_SIZE);
for (offset = 0; offset < len; offset += n) { for (offset = 0; offset < len; offset += n) {
bool copy;
bool error_in_source = true;
/* Note that even when no rate limit is applied we need to yield /* Note that even when no rate limit is applied we need to yield
* with no pending I/O here so that bdrv_drain_all() returns. * with no pending I/O here so that bdrv_drain_all() returns.
*/ */
@ -168,42 +214,11 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
if (job_is_cancelled(&s->common.job)) { if (job_is_cancelled(&s->common.job)) {
break; break;
} }
/* Copy if allocated above the base */
WITH_GRAPH_RDLOCK_GUARD() {
ret = bdrv_co_common_block_status_above(blk_bs(s->top),
s->base_overlay, true, true, offset, COMMIT_BUFFER_SIZE,
&n, NULL, NULL, NULL);
}
copy = (ret >= 0 && ret & BDRV_BLOCK_ALLOCATED); ret = commit_iteration(s, offset, &n, buf);
trace_commit_one_iteration(s, offset, n, ret);
if (copy) {
assert(n < SIZE_MAX);
ret = blk_co_pread(s->top, offset, n, buf, 0);
if (ret >= 0) {
ret = blk_co_pwrite(s->base, offset, n, buf, 0);
if (ret < 0) {
error_in_source = false;
}
}
}
if (ret < 0) { if (ret < 0) {
BlockErrorAction action = return ret;
block_job_error_action(&s->common, s->on_error,
error_in_source, -ret);
if (action == BLOCK_ERROR_ACTION_REPORT) {
return ret;
} else {
n = 0;
continue;
}
}
/* Publish progress */
job_progress_update(&s->common.job, n);
if (copy) {
block_job_ratelimit_processed_bytes(&s->common, n);
} }
} }