diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org> | 2022-05-17 14:12:06 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2022-06-24 17:07:06 +0200 |
| commit | 618af89e559daf897cc5013d3476a9c41ee76e00 (patch) | |
| tree | b3512de6b37340f2d9aa171f2270cbd2f6114ed4 /block/backup.c | |
| parent | 58cbfbdf73d1d20ba9506b1260a4cb321adad47d (diff) | |
| download | qemu-618af89e559daf897cc5013d3476a9c41ee76e00.zip qemu-618af89e559daf897cc5013d3476a9c41ee76e00.tar.gz qemu-618af89e559daf897cc5013d3476a9c41ee76e00.tar.bz2 | |
block: simplify handling of try to merge different sized bitmaps
We have too much logic to simply check that bitmaps are of the same
size. Let's just define that hbitmap_merge() and
bdrv_dirty_bitmap_merge_internal() require their argument bitmaps be of
same size, this simplifies things.
Let's look through the callers:
For backup_init_bcs_bitmap() we already assert that merge can't fail.
In bdrv_reclaim_dirty_bitmap_locked() we gracefully handle the error
that can't happen: successor always has same size as its parent, drop
this logic.
In bdrv_merge_dirty_bitmap() we already has assertion and separate
check. Make the check explicit and improve error message.
Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>
Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220517111206.23585-4-v.sementsov-og@mail.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/backup.c')
| -rw-r--r-- | block/backup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/backup.c b/block/backup.c index 5cfd0b9..b2b649e 100644 --- a/block/backup.c +++ b/block/backup.c @@ -228,15 +228,13 @@ out: static void backup_init_bcs_bitmap(BackupBlockJob *job) { - bool ret; uint64_t estimate; BdrvDirtyBitmap *bcs_bitmap = block_copy_dirty_bitmap(job->bcs); if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) { bdrv_clear_dirty_bitmap(bcs_bitmap, NULL); - ret = bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap, - NULL, true); - assert(ret); + bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap, NULL, + true); } else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) { /* * We can't hog the coroutine to initialize this thoroughly. |