commit 5deb6cbd1fae10197623a74b0734a468ec80c609
author Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Mon Sep 16 17:19:09 2019 +0300
committer John Snow <jsnow@redhat.com> Thu Oct 17 17:02:32 2019 -0400
tree 088aa9a3e2e23c293350828d16ce41323cbc2a68
parent 767db3aad8a491c332870ae14d8cfad506a78662

block/dirty-bitmap: add bs link

Add bs field to BdrvDirtyBitmap structure. Drop BlockDriverState
parameter from bitmap APIs where possible.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190916141911.5255-3-vsementsov@virtuozzo.com
[Rebased on top of block-copy. --js]
Signed-off-by: John Snow <jsnow@redhat.com>

blockdev.c

diff --git a/blockdev.c b/blockdev.c
index 7e12919..d77e809 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2178,7 +2178,7 @@
                                              common, common);
 
     bdrv_dirty_bitmap_set_busy(state->bitmap, false);
-    bdrv_release_dirty_bitmap(state->bs, state->bitmap);
+    bdrv_release_dirty_bitmap(state->bitmap);
 }
 
 static void abort_prepare(BlkActionState *common, Error **errp)
@@ -2940,7 +2940,7 @@
     }
 
     if (release) {
-        bdrv_release_dirty_bitmap(bs, bitmap);
+        bdrv_release_dirty_bitmap(bitmap);
     }
 
     if (bitmap_bs) {
@@ -3072,7 +3072,7 @@
     bdrv_merge_dirty_bitmap(dst, anon, backup, errp);
 
  out:
-    bdrv_release_dirty_bitmap(bs, anon);
+    bdrv_release_dirty_bitmap(anon);
     return dst;
 }