From cf0cd293c6311e0714739a95d022b262e1d9d798 Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 29 Jul 2019 16:35:53 -0400 Subject: block/backup: add 'never' policy to bitmap sync mode This adds a "never" policy for bitmap synchronization. Regardless of if the job succeeds or fails, we never update the bitmap. This can be used to perform differential backups, or simply to avoid the job modifying a bitmap. Signed-off-by: John Snow Reviewed-by: Max Reitz Message-id: 20190709232550.10724-7-jsnow@redhat.com Signed-off-by: John Snow --- block/backup.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'block/backup.c') diff --git a/block/backup.c b/block/backup.c index 2b4c5c23e4..d07b838930 100644 --- a/block/backup.c +++ b/block/backup.c @@ -274,8 +274,11 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret) BdrvDirtyBitmap *bm; BlockDriverState *bs = blk_bs(job->common.blk); - if (ret < 0) { - /* Merge the successor back into the parent, delete nothing. */ + if (ret < 0 || job->bitmap_mode == BITMAP_SYNC_MODE_NEVER) { + /* + * Failure, or we don't want to synchronize the bitmap. + * Merge the successor back into the parent, delete nothing. + */ bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL); assert(bm); } else { -- cgit v1.2.3