[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 10/14] block/mirror: Add MirrorBDSOpaque
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 10/14] block/mirror: Add MirrorBDSOpaque |
Date: |
Wed, 13 Jun 2018 20:18:19 +0200 |
This will allow us to access the block job data when the mirror block
driver becomes more complex.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
block/mirror.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block/mirror.c b/block/mirror.c
index fa94fd9d17..f060bd8bb4 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -76,6 +76,10 @@ typedef struct MirrorBlockJob {
bool initial_zeroing_ongoing;
} MirrorBlockJob;
+typedef struct MirrorBDSOpaque {
+ MirrorBlockJob *job;
+} MirrorBDSOpaque;
+
struct MirrorOp {
MirrorBlockJob *s;
QEMUIOVector qiov;
@@ -599,6 +603,7 @@ static void mirror_exit(Job *job, void *opaque)
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);
@@ -691,6 +696,7 @@ static void mirror_exit(Job *job, void *opaque)
blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort);
blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort);
+ bs_opaque->job = NULL;
job_completed(job, data->ret, NULL);
g_free(data);
@@ -1222,6 +1228,7 @@ static void mirror_start_job(const char *job_id,
BlockDriverState *bs,
Error **errp)
{
MirrorBlockJob *s;
+ MirrorBDSOpaque *bs_opaque;
BlockDriverState *mirror_top_bs;
bool target_graph_mod;
bool target_is_backing;
@@ -1257,6 +1264,8 @@ static void mirror_start_job(const char *job_id,
BlockDriverState *bs,
mirror_top_bs->total_sectors = bs->total_sectors;
mirror_top_bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED;
mirror_top_bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED;
+ bs_opaque = g_new0(MirrorBDSOpaque, 1);
+ mirror_top_bs->opaque = bs_opaque;
bdrv_set_aio_context(mirror_top_bs, bdrv_get_aio_context(bs));
/* bdrv_append takes ownership of the mirror_top_bs reference, need to keep
@@ -1281,6 +1290,8 @@ static void mirror_start_job(const char *job_id,
BlockDriverState *bs,
if (!s) {
goto fail;
}
+ bs_opaque->job = s;
+
/* The block job now has a reference to this node */
bdrv_unref(mirror_top_bs);
@@ -1370,6 +1381,7 @@ fail:
g_free(s->replaces);
blk_unref(s->target);
+ bs_opaque->job = NULL;
job_early_fail(&s->common.job);
}
--
2.17.1
- [Qemu-block] [PATCH v5 02/14] block/mirror: Convert to coroutines, (continued)
- [Qemu-block] [PATCH v5 02/14] block/mirror: Convert to coroutines, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 04/14] block/mirror: Wait for in-flight op conflicts, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 05/14] block/mirror: Use source as a BdrvChild, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 06/14] block: Generalize should_update_child() rule, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 07/14] hbitmap: Add @advance param to hbitmap_iter_next(), Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 08/14] test-hbitmap: Add non-advancing iter_next tests, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 11/14] job: Add job_progress_increase_remaining(), Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 10/14] block/mirror: Add MirrorBDSOpaque,
Max Reitz <=
- [Qemu-block] [PATCH v5 09/14] block/dirty-bitmap: Add bdrv_dirty_iter_next_area, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 12/14] block/mirror: Add active mirroring, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 13/14] block/mirror: Add copy mode QAPI interface, Max Reitz, 2018/06/13
- [Qemu-block] [PATCH v5 14/14] iotests: Add test for active mirroring, Max Reitz, 2018/06/13
- Re: [Qemu-block] [PATCH v5 00/14] block/mirror: Add active-sync mirroring, Max Reitz, 2018/06/18