summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJohn Snow2019-07-29 22:35:54 +0200
committerJohn Snow2019-08-16 22:28:02 +0200
commitb30ffbef531bb851dd96f335de4788e90471234e (patch)
tree2dcd188efc67e9c5a69da9ed824c83566f4cadbc /block
parentiotests: add test 257 for bitmap-mode backups (diff)
downloadqemu-b30ffbef531bb851dd96f335de4788e90471234e.tar.gz
qemu-b30ffbef531bb851dd96f335de4788e90471234e.tar.xz
qemu-b30ffbef531bb851dd96f335de4788e90471234e.zip
block/backup: loosen restriction on readonly bitmaps
With the "never" sync policy, we actually can utilize readonly bitmaps now. Loosen the check at the QMP level, and tighten it based on provided arguments down at the job creation level instead. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 20190709232550.10724-19-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/backup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/block/backup.c b/block/backup.c
index 2be570c0bf..f8309be01b 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -617,6 +617,12 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
return NULL;
}
+ /* If we need to write to this bitmap, check that we can: */
+ if (bitmap_mode != BITMAP_SYNC_MODE_NEVER &&
+ bdrv_dirty_bitmap_check(sync_bitmap, BDRV_BITMAP_DEFAULT, errp)) {
+ return NULL;
+ }
+
/* Create a new bitmap, and freeze/disable this one. */
if (bdrv_dirty_bitmap_create_successor(bs, sync_bitmap, errp) < 0) {
return NULL;