summary refs log tree commit diff stats
path: root/blockdev.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2018-10-29 16:23:15 -0400
committerJohn Snow <jsnow@redhat.com>2018-10-29 16:23:15 -0400
commitfa000f2f9fd96a75a0a33d50ead247fce11da92a (patch)
tree14d48c16ce0573c7bfa160c9535df1db060ce22a /blockdev.c
parent56bd662497259400b7c9f155aaebaddde4450028 (diff)
downloadfocaccia-qemu-fa000f2f9fd96a75a0a33d50ead247fce11da92a.tar.gz
focaccia-qemu-fa000f2f9fd96a75a0a33d50ead247fce11da92a.zip
dirty-bitmap: make it possible to restore bitmap after merge
Add backup parameter to bdrv_merge_dirty_bitmap() to be used then with
bdrv_restore_dirty_bitmap() if it needed to restore the bitmap after
merge operation.

This is needed to implement bitmap merge transaction action in further
commit.

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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c
index 598ff87519..b8a854fba5 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2968,7 +2968,7 @@ void qmp_x_block_dirty_bitmap_merge(const char *node, const char *dst_name,
         return;
     }
 
-    bdrv_merge_dirty_bitmap(dst, src, errp);
+    bdrv_merge_dirty_bitmap(dst, src, NULL, errp);
 }
 
 BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,