| From 1098dfcaf705697337694269c4990d2fb58347a6 Mon Sep 17 00:00:00 2001 |
| From: Fam Zheng <famz@redhat.com> |
| Date: Fri, 17 Jan 2014 03:07:58 +0100 |
| Subject: [PATCH 15/34] mirror: Move base to MirrorBlockJob |
| |
| RH-Author: Fam Zheng <famz@redhat.com> |
| Message-id: <1389928083-8921-14-git-send-email-famz@redhat.com> |
| Patchwork-id: 56775 |
| O-Subject: [RHEL-7 qemu-kvm PATCH 13/18] mirror: Move base to MirrorBlockJob |
| Bugzilla: 1041301 |
| RH-Acked-by: Jeffrey Cody <jcody@redhat.com> |
| RH-Acked-by: Kevin Wolf <kwolf@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| |
| This allows setting the base before entering mirror_run, commit will |
| make use of it. |
| |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Reviewed-by: Kevin Wolf <kwolf@redhat.com> |
| Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| (cherry picked from commit 5bc361b8134eff68e2c40916d1cf58b3523d223b) |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| |
| block/mirror.c | 12 ++++++++++-- |
| 1 file changed, 10 insertions(+), 2 deletions(-) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| block/mirror.c | 12 ++++++++++-- |
| 1 files changed, 10 insertions(+), 2 deletions(-) |
| |
| diff --git a/block/mirror.c b/block/mirror.c |
| index 1e3337f..8ccde2f 100644 |
| |
| |
| @@ -31,6 +31,7 @@ typedef struct MirrorBlockJob { |
| BlockJob common; |
| RateLimit limit; |
| BlockDriverState *target; |
| + BlockDriverState *base; |
| MirrorSyncMode mode; |
| BlockdevOnError on_source_error, on_target_error; |
| bool synced; |
| @@ -334,8 +335,7 @@ static void coroutine_fn mirror_run(void *opaque) |
| |
| if (s->mode != MIRROR_SYNC_MODE_NONE) { |
| /* First part, loop on the sectors and initialize the dirty bitmap. */ |
| - BlockDriverState *base; |
| - base = s->mode == MIRROR_SYNC_MODE_FULL ? NULL : bs->backing_hd; |
| + BlockDriverState *base = s->base; |
| for (sector_num = 0; sector_num < end; ) { |
| int64_t next = (sector_num | (sectors_per_chunk - 1)) + 1; |
| ret = bdrv_is_allocated_above(bs, base, |
| @@ -540,6 +540,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, |
| void *opaque, Error **errp) |
| { |
| MirrorBlockJob *s; |
| + BlockDriverState *base = NULL; |
| |
| if (granularity == 0) { |
| /* Choose the default granularity based on the target file's cluster |
| @@ -562,6 +563,12 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, |
| return; |
| } |
| |
| + if (mode == MIRROR_SYNC_MODE_TOP) { |
| + base = bs->backing_hd; |
| + } else { |
| + base = NULL; |
| + } |
| + |
| s = block_job_create(&mirror_job_driver, bs, speed, cb, opaque, errp); |
| if (!s) { |
| return; |
| @@ -571,6 +578,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, |
| s->on_target_error = on_target_error; |
| s->target = target; |
| s->mode = mode; |
| + s->base = base; |
| s->granularity = granularity; |
| s->buf_size = MAX(buf_size, granularity); |
| |
| -- |
| 1.7.1 |
| |