From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys8gE-00048T-5g for qemu-devel@nongnu.org; Tue, 12 May 2015 07:48:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys8gA-0006Eg-VV for qemu-devel@nongnu.org; Tue, 12 May 2015 07:48:58 -0400 From: Fam Zheng Date: Tue, 12 May 2015 19:48:32 +0800 Message-Id: <1431431315-32079-4-git-send-email-famz@redhat.com> In-Reply-To: <1431431315-32079-1-git-send-email-famz@redhat.com> References: <1431431315-32079-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/6] 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 , 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 7904098..511e13c 100644 --- a/block.c +++ b/block.c @@ -3324,18 +3324,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 db29b74..aaed2fa 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -635,7 +635,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.0