aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2018-10-29 16:23:14 -0400
committerJohn Snow <jsnow@redhat.com>2018-10-29 16:23:14 -0400
commit06bf50068a7e952afff8c4f6470ec54a712570f7 (patch)
treed095df8902d9718dcc4c50568ca91efa4d177bb1 /blockdev.c
parent945c1ee0cb7d29f2fd0fece2cd2b5329802de5e9 (diff)
downloadqemu-06bf50068a7e952afff8c4f6470ec54a712570f7.zip
qemu-06bf50068a7e952afff8c4f6470ec54a712570f7.tar.gz
qemu-06bf50068a7e952afff8c4f6470ec54a712570f7.tar.bz2
dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap
Move checks from qmp_x_block_dirty_bitmap_merge() to bdrv_merge_dirty_bitmap(), to share them with dirty bitmap merge transaction action in future commit. Note: for now, only qmp_x_block_dirty_bitmap_merge() calls bdrv_merge_dirty_bitmap(). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/blockdev.c b/blockdev.c
index 1869f9a..e3398e1 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2962,16 +2962,6 @@ void qmp_x_block_dirty_bitmap_merge(const char *node, const char *dst_name,
return;
}
- if (bdrv_dirty_bitmap_frozen(dst)) {
- error_setg(errp, "Bitmap '%s' is frozen and cannot be modified",
- dst_name);
- return;
- } else if (bdrv_dirty_bitmap_readonly(dst)) {
- error_setg(errp, "Bitmap '%s' is readonly and cannot be modified",
- dst_name);
- return;
- }
-
src = bdrv_find_dirty_bitmap(bs, src_name);
if (!src) {
error_setg(errp, "Dirty bitmap '%s' not found", src_name);