[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 13/16] block/mirror: Add MirrorBDSOpaque
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 13/16] block/mirror: Add MirrorBDSOpaque |
Date: |
Mon, 22 Jan 2018 23:08:03 +0100 |
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>
---
block/mirror.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block/mirror.c b/block/mirror.c
index bb46f3c4e9..c1987b0230 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -78,6 +78,10 @@ typedef struct MirrorBlockJob {
bool initial_zeroing_ongoing;
} MirrorBlockJob;
+typedef struct MirrorBDSOpaque {
+ MirrorBlockJob *job;
+} MirrorBDSOpaque;
+
struct MirrorOp {
MirrorBlockJob *s;
QEMUIOVector qiov;
@@ -607,6 +611,7 @@ static void mirror_exit(BlockJob *job, void *opaque)
{
MirrorBlockJob *s = container_of(job, MirrorBlockJob, 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);
@@ -699,6 +704,7 @@ static void mirror_exit(BlockJob *job, void *opaque)
blk_set_perm(job->blk, 0, BLK_PERM_ALL, &error_abort);
blk_insert_bs(job->blk, mirror_top_bs, &error_abort);
+ bs_opaque->job = NULL;
block_job_completed(&s->common, data->ret);
g_free(data);
@@ -1232,6 +1238,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;
@@ -1265,6 +1272,8 @@ static void mirror_start_job(const char *job_id,
BlockDriverState *bs,
mirror_top_bs->implicit = true;
}
mirror_top_bs->total_sectors = bs->total_sectors;
+ 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
@@ -1289,6 +1298,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);
@@ -1378,6 +1389,7 @@ fail:
g_free(s->replaces);
blk_unref(s->target);
+ bs_opaque->job = NULL;
block_job_early_fail(&s->common);
}
--
2.14.3
- [Qemu-block] [PATCH v2 03/16] tests: Add bdrv-drain test for node deletion, (continued)
- [Qemu-block] [PATCH v2 03/16] tests: Add bdrv-drain test for node deletion, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 04/16] block/mirror: Pull out mirror_perform(), Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 05/16] block/mirror: Convert to coroutines, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 06/16] block/mirror: Use CoQueue to wait on in-flight ops, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 07/16] block/mirror: Wait for in-flight op conflicts, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 08/16] block/mirror: Use source as a BdrvChild, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 09/16] block: Generalize should_update_child() rule, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 10/16] hbitmap: Add @advance param to hbitmap_iter_next(), Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 11/16] block/dirty-bitmap: Add bdrv_dirty_iter_next_area, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 12/16] block/mirror: Distinguish active from passive ops, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 13/16] block/mirror: Add MirrorBDSOpaque,
Max Reitz <=
- [Qemu-block] [PATCH v2 14/16] block/mirror: Add active mirroring, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 15/16] block/mirror: Add copy mode QAPI interface, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 16/16] iotests: Add test for active mirroring, Max Reitz, 2018/01/22