[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC qemu 4/6] mirror: switch to bdrv_dirty_bitmap_merge_internal
From: |
Fabian Grünbichler |
Subject: |
[RFC qemu 4/6] mirror: switch to bdrv_dirty_bitmap_merge_internal |
Date: |
Tue, 18 Feb 2020 11:07:38 +0100 |
since sync_bitmap is busy at the point of merging, and we checked access
beforehand.
Signed-off-by: Fabian Grünbichler <address@hidden>
---
block/mirror.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 40d174a625..d6aca2874e 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -735,8 +735,8 @@ static int mirror_exit_common(Job *job)
job->ret == 0 && ret == 0)) {
/* Success; synchronize copy back to sync. */
bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL);
- bdrv_merge_dirty_bitmap(s->sync_bitmap, s->dirty_bitmap,
- NULL, &error_abort);
+ bdrv_dirty_bitmap_merge_internal(s->sync_bitmap, s->dirty_bitmap,
+ NULL, true);
}
}
bdrv_release_dirty_bitmap(s->dirty_bitmap);
@@ -1727,8 +1727,8 @@ static BlockJob *mirror_start_job(
}
if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
- bdrv_merge_dirty_bitmap(s->dirty_bitmap, s->sync_bitmap,
- NULL, &local_err);
+ bdrv_dirty_bitmap_merge_internal(s->dirty_bitmap, s->sync_bitmap,
+ NULL, true);
if (local_err) {
goto fail;
}
--
2.20.1
- [RFC qemu 0/6] mirror: implement incremental and bitmap modes, Fabian Grünbichler, 2020/02/18
- [RFC qemu 3/6] mirror: add check for bitmap-mode without bitmap, Fabian Grünbichler, 2020/02/18
- [RFC qemu 2/6] drive-mirror: add support for conditional and always bitmap sync modes, Fabian Grünbichler, 2020/02/18
- [RFC qemu 6/6] mirror: move some checks to QMP, Fabian Grünbichler, 2020/02/18
- [RFC qemu 4/6] mirror: switch to bdrv_dirty_bitmap_merge_internal,
Fabian Grünbichler <=
- [RFC qemu 1/6] drive-mirror: add support for sync=bitmap mode=never, Fabian Grünbichler, 2020/02/18
- [RFC qemu 5/6] iotests: add test for bitmap mirror, Fabian Grünbichler, 2020/02/18
- Re: [RFC qemu 0/6] mirror: implement incremental and bitmap modes, no-reply, 2020/02/18
- Re: [RFC qemu 0/6] mirror: implement incremental and bitmap modes, John Snow, 2020/02/25