From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxqOs-0007WL-CF for qemu-devel@nongnu.org; Thu, 28 May 2015 01:30:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxqOr-00044C-3f for qemu-devel@nongnu.org; Thu, 28 May 2015 01:30:38 -0400 From: Fam Zheng Date: Thu, 28 May 2015 13:29:47 +0800 Message-Id: <1432790990-25383-6-git-send-email-famz@redhat.com> In-Reply-To: <1432790990-25383-1-git-send-email-famz@redhat.com> References: <1432790990-25383-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 5/8] block: Remove bdrv_reset_dirty List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Jeff Cody , qemu-stable@nongnu.org, Stefan Hajnoczi , pbonzini@redhat.com, jsnow@redhat.com, wangxiaolong@ucloud.cn Using this function would always be wrong because a dirty bitmap must have a specific owner that consumes the dirty bits and calls bdrv_reset_dirty_bitmap(). Remove the unused function to avoid future misuse. Reviewed-by: Eric Blake Signed-off-by: Fam Zheng Reviewed-by: John Snow --- block.c | 12 ------------ include/block/block_int.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/block.c b/block.c index f42d70e..f6ee9db 100644 --- a/block.c +++ b/block.c @@ -3336,18 +3336,6 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, } } -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, - int nr_sectors) -{ - BdrvDirtyBitmap *bitmap; - QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { - if (!bdrv_dirty_bitmap_enabled(bitmap)) { - continue; - } - hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); - } -} - /** * Advance an HBitmapIter to an arbitrary offset. */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 4e0d700..459fe1c 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -640,7 +640,5 @@ bool blk_dev_is_medium_locked(BlockBackend *blk); void blk_dev_resize_cb(BlockBackend *blk); void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, - int nr_sectors); #endif /* BLOCK_INT_H */ -- 2.4.1