From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mp-00045g-G5 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO5mk-0001jG-Ia for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:35 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:48945 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mk-0001ix-6X for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:30 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 18 Feb 2015 17:00:04 +0300 Message-Id: <1424268014-13293-5-git-send-email-vsementsov@parallels.com> In-Reply-To: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> References: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH RFC v3 04/14] 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 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 e95a5ae..a127fd2 100644 --- a/block.c +++ b/block.c @@ -5670,8 +5670,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) @@ -5718,7 +5717,7 @@ static 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); } } @@ -5730,7 +5729,7 @@ static 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