From a3a683c33d38fb29c7a78903e88dda12b84cc88d Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 6 May 2019 19:17:57 +0200 Subject: [PATCH] block: Make bdrv_attach/detach_aio_context() static Since commit b97511c7bc8, there is no reason for block drivers any more to call these functions (see the function comment in block_int.h). They are now just internal helper functions for bdrv_set_aio_context() and can be made static. Signed-off-by: Kevin Wolf --- block.c | 6 +++--- include/block/block_int.h | 21 --------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/block.c b/block.c index 8ff6ab1152..b2f71142a5 100644 --- a/block.c +++ b/block.c @@ -5676,7 +5676,7 @@ static void bdrv_do_remove_aio_context_notifier(BdrvAioNotifier *ban) g_free(ban); } -void bdrv_detach_aio_context(BlockDriverState *bs) +static void bdrv_detach_aio_context(BlockDriverState *bs) { BdrvAioNotifier *baf, *baf_tmp; BdrvChild *child; @@ -5708,8 +5708,8 @@ void bdrv_detach_aio_context(BlockDriverState *bs) bs->aio_context = NULL; } -void bdrv_attach_aio_context(BlockDriverState *bs, - AioContext *new_context) +static void bdrv_attach_aio_context(BlockDriverState *bs, + AioContext *new_context) { BdrvAioNotifier *ban, *ban_tmp; BdrvChild *child; diff --git a/include/block/block_int.h b/include/block/block_int.h index b150c5f047..aa2c638b02 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -965,27 +965,6 @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix, void bdrv_add_before_write_notifier(BlockDriverState *bs, NotifierWithReturn *notifier); -/** - * bdrv_detach_aio_context: - * - * May be called from .bdrv_detach_aio_context() to detach children from the - * current #AioContext. This is only needed by block drivers that manage their - * own children. Both ->file and ->backing are automatically handled and - * block drivers should not call this function on them explicitly. - */ -void bdrv_detach_aio_context(BlockDriverState *bs); - -/** - * bdrv_attach_aio_context: - * - * May be called from .bdrv_attach_aio_context() to attach children to the new - * #AioContext. This is only needed by block drivers that manage their own - * children. Both ->file and ->backing are automatically handled and block - * drivers should not call this function on them explicitly. - */ -void bdrv_attach_aio_context(BlockDriverState *bs, - AioContext *new_context); - /** * bdrv_add_aio_context_notifier: *