[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/21] block/commit: refactor stream to use job call
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 18/21] block/commit: refactor stream to use job callbacks |
Date: |
Tue, 7 Aug 2018 00:33:46 -0400 |
Signed-off-by: John Snow <address@hidden>
---
block/stream.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/block/stream.c b/block/stream.c
index af0a1d5d0c..20192fac77 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -54,16 +54,16 @@ static int coroutine_fn stream_populate(BlockBackend *blk,
return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
}
-static void stream_exit(Job *job)
+static int stream_prepare(Job *job)
{
StreamBlockJob *s = container_of(job, StreamBlockJob, common.job);
BlockJob *bjob = &s->common;
BlockDriverState *bs = blk_bs(bjob->blk);
BlockDriverState *base = s->base;
Error *local_err = NULL;
- int ret = job->ret;
+ int ret = 0;
- if (!job_is_cancelled(job) && bs->backing && ret == 0) {
+ if (bs->backing) {
const char *base_id = NULL, *base_fmt = NULL;
if (base) {
base_id = s->backing_file_str;
@@ -75,12 +75,19 @@ static void stream_exit(Job *job)
bdrv_set_backing_hd(bs, base, &local_err);
if (local_err) {
error_report_err(local_err);
- ret = -EPERM;
- goto out;
+ return -EPERM;
}
}
-out:
+ return ret;
+}
+
+static void stream_clean(Job *job)
+{
+ StreamBlockJob *s = container_of(job, StreamBlockJob, common.job);
+ BlockJob *bjob = &s->common;
+ BlockDriverState *bs = blk_bs(bjob->blk);
+
/* Reopen the image back in read-only mode if necessary */
if (s->bs_flags != bdrv_get_flags(bs)) {
/* Give up write permissions before making it read-only */
@@ -89,7 +96,6 @@ out:
}
g_free(s->backing_file_str);
- job->ret = ret;
}
static int coroutine_fn stream_run(Job *job)
@@ -206,7 +212,8 @@ static const BlockJobDriver stream_job_driver = {
.job_type = JOB_TYPE_STREAM,
.free = block_job_free,
.start = stream_run,
- .exit = stream_exit,
+ .prepare = stream_prepare,
+ .clean = stream_clean,
.user_resume = block_job_user_resume,
.drain = block_job_drain,
},
--
2.14.4
[Qemu-devel] [PATCH 18/21] block/commit: refactor stream to use job callbacks,
John Snow <=
[Qemu-devel] [PATCH 15/21] block/stream: add block job creation flags, John Snow, 2018/08/07
[Qemu-devel] [PATCH 03/21] block/backup: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 14/21] block/mirror: add block job creation flags, John Snow, 2018/08/07
[Qemu-devel] [PATCH 10/21] tests/test-bdrv-drain: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 19/21] qapi/block-commit: expose new job properties, John Snow, 2018/08/07
[Qemu-devel] [PATCH 20/21] qapi/block-mirror: expose new job properties, John Snow, 2018/08/07
[Qemu-devel] [PATCH 12/21] jobs: allow entrypoints to return status code, John Snow, 2018/08/07