[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/11] block/backup: centralize copy_bitmap initi
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v2 07/11] block/backup: centralize copy_bitmap initialization |
Date: |
Mon, 15 Jul 2019 20:01:13 -0400 |
Just a few housekeeping changes that keeps the following commit easier
to read; perform the initial copy_bitmap initialization in one place.
Signed-off-by: John Snow <address@hidden>
---
block/backup.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 22fafbb80f..c88a70fe10 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -441,16 +441,22 @@ static int coroutine_fn backup_loop(BackupBlockJob *job)
return ret;
}
-/* init copy_bitmap from sync_bitmap */
-static void backup_incremental_init_copy_bitmap(BackupBlockJob *job)
+static void backup_init_copy_bitmap(BackupBlockJob *job)
{
- bool ret = bdrv_dirty_bitmap_merge_internal(job->copy_bitmap,
- job->sync_bitmap,
- NULL, true);
- assert(ret);
+ bool ret;
+ uint64_t estimate;
- job_progress_set_remaining(&job->common.job,
- bdrv_get_dirty_count(job->copy_bitmap));
+ if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
+ ret = bdrv_dirty_bitmap_merge_internal(job->copy_bitmap,
+ job->sync_bitmap,
+ NULL, true);
+ assert(ret);
+ } else {
+ bdrv_set_dirty_bitmap(job->copy_bitmap, 0, job->len);
+ }
+
+ estimate = bdrv_get_dirty_count(job->copy_bitmap);
+ job_progress_set_remaining(&job->common.job, estimate);
}
static int coroutine_fn backup_run(Job *job, Error **errp)
@@ -462,12 +468,7 @@ static int coroutine_fn backup_run(Job *job, Error **errp)
QLIST_INIT(&s->inflight_reqs);
qemu_co_rwlock_init(&s->flush_rwlock);
- if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
- backup_incremental_init_copy_bitmap(s);
- } else {
- bdrv_set_dirty_bitmap(s->copy_bitmap, 0, s->len);
- job_progress_set_remaining(job, s->len);
- }
+ backup_init_copy_bitmap(s);
s->before_write.notify = backup_before_write_notify;
bdrv_add_before_write_notifier(bs, &s->before_write);
--
2.21.0
- [Qemu-block] [PATCH v2 00/11] bitmaps: allow bitmaps to be used with full and top, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 01/11] iotests/257: add Pattern class, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 02/11] iotests/257: add EmulatedBitmap class, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 04/11] block/backup: hoist bitmap check into QMP interface, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 07/11] block/backup: centralize copy_bitmap initialization,
John Snow <=
- [Qemu-block] [PATCH v2 08/11] block/backup: add backup_is_cluster_allocated, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 05/11] iotests/257: test API failures, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 06/11] block/backup: improve sync=bitmap work estimates, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 03/11] iotests/257: Refactor backup helpers, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 09/11] block/backup: teach TOP to never copy unallocated regions, John Snow, 2019/07/15