From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7O-0007jW-9p for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZ7N-0005l2-4Y for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:46 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:18733 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7M-0005kr-M0 for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:45 -0400 From: Vladimir Sementsov-Ogievskiy Date: Wed, 13 May 2015 18:29:58 +0300 Message-Id: <1431531007-10269-4-git-send-email-vsementsov@parallels.com> In-Reply-To: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> References: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH 03/12] block: tiny refactoring: minimize hbitmap_(set/reset) usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Reviewed-by: John Snow Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index fede5e2..8376e8d 100644 --- a/block.c +++ b/block.c @@ -3308,8 +3308,7 @@ void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap) { - assert(bdrv_dirty_bitmap_enabled(bitmap)); - hbitmap_reset(bitmap->bitmap, 0, bitmap->size); + bdrv_reset_dirty_bitmap(bitmap, 0, bitmap->size); } const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap) @@ -3356,7 +3355,7 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, if (!bdrv_dirty_bitmap_enabled(bitmap)) { continue; } - hbitmap_set(bitmap->bitmap, cur_sector, nr_sectors); + bdrv_set_dirty_bitmap(bitmap, cur_sector, nr_sectors); } } @@ -3368,7 +3367,7 @@ void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, if (!bdrv_dirty_bitmap_enabled(bitmap)) { continue; } - hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); + bdrv_reset_dirty_bitmap(bitmap, cur_sector, nr_sectors); } } -- 1.9.1