From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPD0A-0005bR-Pl for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPD09-0006pI-Nh for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:38:30 -0500 From: Kevin Wolf Date: Fri, 29 Jan 2016 18:37:28 +0100 Message-Id: <1454089074-4819-23-git-send-email-kwolf@redhat.com> In-Reply-To: <1454089074-4819-1-git-send-email-kwolf@redhat.com> References: <1454089074-4819-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 22/48] block: Remove BDS close notifier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz It is unused now, so we can remove it. Signed-off-by: Max Reitz Reviewed-by: Fam Zheng Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block.c | 8 -------- block/block-backend.c | 7 ------- include/block/block.h | 1 - include/block/block_int.h | 2 -- include/sysemu/block-backend.h | 1 - 5 files changed, 19 deletions(-) diff --git a/block.c b/block.c index 41ab00e..f4312d9 100644 --- a/block.c +++ b/block.c @@ -259,7 +259,6 @@ BlockDriverState *bdrv_new(void) for (i = 0; i < BLOCK_OP_TYPE_MAX; i++) { QLIST_INIT(&bs->op_blockers[i]); } - notifier_list_init(&bs->close_notifiers); notifier_with_return_list_init(&bs->before_write_notifiers); qemu_co_queue_init(&bs->throttled_reqs[0]); qemu_co_queue_init(&bs->throttled_reqs[1]); @@ -269,11 +268,6 @@ BlockDriverState *bdrv_new(void) return bs; } -void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify) -{ - notifier_list_add(&bs->close_notifiers, notify); -} - BlockDriver *bdrv_find_format(const char *format_name) { BlockDriver *drv1; @@ -2157,8 +2151,6 @@ void bdrv_close(BlockDriverState *bs) bdrv_flush(bs); bdrv_drain(bs); /* in case flush left pending I/O */ - notifier_list_notify(&bs->close_notifiers, bs); - bdrv_release_named_dirty_bitmaps(bs); assert(QLIST_EMPTY(&bs->dirty_bitmaps)); diff --git a/block/block-backend.c b/block/block-backend.c index 1872191..621787c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1146,13 +1146,6 @@ void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify) notifier_list_add(&blk->insert_bs_notifiers, notify); } -void blk_add_close_notifier(BlockBackend *blk, Notifier *notify) -{ - if (blk->bs) { - bdrv_add_close_notifier(blk->bs, notify); - } -} - void blk_io_plug(BlockBackend *blk) { if (blk->bs) { diff --git a/include/block/block.h b/include/block/block.h index 25f36dc..c7345de 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -226,7 +226,6 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, void bdrv_reopen_commit(BDRVReopenState *reopen_state); void bdrv_reopen_abort(BDRVReopenState *reopen_state); void bdrv_close(BlockDriverState *bs); -void bdrv_add_close_notifier(BlockDriverState *bs, Notifier *notify); int bdrv_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num, diff --git a/include/block/block_int.h b/include/block/block_int.h index ec31df1..8730cf6 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -403,8 +403,6 @@ struct BlockDriverState { BdrvChild *backing; BdrvChild *file; - NotifierList close_notifiers; - /* Callback before write request is processed */ NotifierWithReturnList before_write_notifiers; diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index e12be67..ae4efb4 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -166,7 +166,6 @@ void blk_remove_aio_context_notifier(BlockBackend *blk, void *opaque); void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify); void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify); -void blk_add_close_notifier(BlockBackend *blk, Notifier *notify); void blk_io_plug(BlockBackend *blk); void blk_io_unplug(BlockBackend *blk); BlockAcctStats *blk_get_stats(BlockBackend *blk); -- 1.8.3.1