[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/21] block/mirror: utilize job_exit shim
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 05/21] block/mirror: utilize job_exit shim |
Date: |
Tue, 7 Aug 2018 00:33:33 -0400 |
Change the manual deferment to mirror_exit into the implicit
callback to job_exit and the mirror_exit callback.
Signed-off-by: John Snow <address@hidden>
---
block/mirror.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 7c2c6ba67e..e3404e2518 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -607,21 +607,17 @@ static void mirror_wait_for_all_io(MirrorBlockJob *s)
}
}
-typedef struct {
- int ret;
-} MirrorExitData;
-
-static void mirror_exit(Job *job, void *opaque)
+static void mirror_exit(Job *job)
{
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job);
BlockJob *bjob = &s->common;
- MirrorExitData *data = opaque;
MirrorBDSOpaque *bs_opaque = s->mirror_top_bs->opaque;
AioContext *replace_aio_context = NULL;
BlockDriverState *src = s->mirror_top_bs->backing->bs;
BlockDriverState *target_bs = blk_bs(s->target);
BlockDriverState *mirror_top_bs = s->mirror_top_bs;
Error *local_err = NULL;
+ int ret = job->ret;
bdrv_release_dirty_bitmap(src, s->dirty_bitmap);
@@ -652,7 +648,7 @@ static void mirror_exit(Job *job, void *opaque)
bdrv_set_backing_hd(target_bs, backing, &local_err);
if (local_err) {
error_report_err(local_err);
- data->ret = -EPERM;
+ ret = -EPERM;
}
}
}
@@ -662,7 +658,7 @@ static void mirror_exit(Job *job, void *opaque)
aio_context_acquire(replace_aio_context);
}
- if (s->should_complete && data->ret == 0) {
+ if (s->should_complete && ret == 0) {
BlockDriverState *to_replace = src;
if (s->to_replace) {
to_replace = s->to_replace;
@@ -679,7 +675,7 @@ static void mirror_exit(Job *job, void *opaque)
bdrv_drained_end(target_bs);
if (local_err) {
error_report_err(local_err);
- data->ret = -EPERM;
+ ret = -EPERM;
}
}
if (s->to_replace) {
@@ -710,12 +706,12 @@ static void mirror_exit(Job *job, void *opaque)
blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort);
bs_opaque->job = NULL;
- job_completed(job, data->ret);
- g_free(data);
bdrv_drained_end(src);
bdrv_unref(mirror_top_bs);
bdrv_unref(src);
+
+ job->ret = ret;
}
static void mirror_throttle(MirrorBlockJob *s)
@@ -815,7 +811,6 @@ static int mirror_flush(MirrorBlockJob *s)
static void coroutine_fn mirror_run(void *opaque)
{
MirrorBlockJob *s = opaque;
- MirrorExitData *data;
BlockDriverState *bs = s->mirror_top_bs->backing->bs;
BlockDriverState *target_bs = blk_bs(s->target);
bool need_drain = true;
@@ -1035,13 +1030,11 @@ immediate_exit:
g_free(s->in_flight_bitmap);
bdrv_dirty_iter_free(s->dbi);
- data = g_malloc(sizeof(*data));
- data->ret = ret;
-
if (need_drain) {
bdrv_drained_begin(bs);
}
- job_defer_to_main_loop(&s->common.job, mirror_exit, data);
+
+ s->common.job.ret = ret;
}
static void mirror_complete(Job *job, Error **errp)
@@ -1139,6 +1132,7 @@ static const BlockJobDriver mirror_job_driver = {
.user_resume = block_job_user_resume,
.drain = block_job_drain,
.start = mirror_run,
+ .exit = mirror_exit,
.pause = mirror_pause,
.complete = mirror_complete,
},
@@ -1155,6 +1149,7 @@ static const BlockJobDriver commit_active_job_driver = {
.user_resume = block_job_user_resume,
.drain = block_job_drain,
.start = mirror_run,
+ .exit = mirror_exit,
.pause = mirror_pause,
.complete = mirror_complete,
},
--
2.14.4
- Re: [Qemu-devel] [PATCH 04/21] block/commit: utilize job_exit shim, (continued)
[Qemu-devel] [PATCH 01/21] jobs: canonize Error object, John Snow, 2018/08/07
[Qemu-devel] [PATCH 11/21] jobs: remove job_defer_to_main_loop, John Snow, 2018/08/07
[Qemu-devel] [PATCH 09/21] tests/test-blockjob: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 08/21] tests/test-blockjob-txn: utilize job_exit shim, John Snow, 2018/08/07
[Qemu-devel] [PATCH 13/21] block/commit: add block job creation flags, John Snow, 2018/08/07
[Qemu-devel] [PATCH 05/21] block/mirror: utilize job_exit shim,
John Snow <=
[Qemu-devel] [PATCH 17/21] block/mirror: conservative mirror_exit refactor, John Snow, 2018/08/07
[Qemu-devel] [PATCH 16/21] block/commit: refactor commit to use job callbacks, John Snow, 2018/08/07
[Qemu-devel] [PATCH 21/21] qapi/block-stream: expose new job properties, John Snow, 2018/08/07
Re: [Qemu-devel] [Qemu-block] [PATCH 00/21] jobs: defer graph changes until finalize, Peter Krempa, 2018/08/15