From db519cba8713fb49aa5233e8debe61dccdd3a57f Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 15 May 2014 19:22:05 +0800 Subject: [PATCH] block: Move declaration of bdrv_get_aio_context to block.h block_int.h is for block layer and block drivers, other code shouldn't include it. But similar to bdrv_set_aio_context, bdrv_get_aio_context should also be accessible from outside of block layer. Move it. Signed-off-by: Fam Zheng Signed-off-by: Stefan Hajnoczi --- include/block/block.h | 7 +++++++ include/block/block_int.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 29ac56da2c..7d86e29cf4 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -566,6 +566,13 @@ int bdrv_debug_resume(BlockDriverState *bs, const char *tag); bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag); /** + * bdrv_get_aio_context: + * + * Returns: the currently bound #AioContext + */ +AioContext *bdrv_get_aio_context(BlockDriverState *bs); + +/** * bdrv_set_aio_context: * * Changes the #AioContext used for fd handlers, timers, and BHs by this diff --git a/include/block/block_int.h b/include/block/block_int.h index 93ec86f3f7..8d58334c1d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -405,13 +405,6 @@ void bdrv_add_before_write_notifier(BlockDriverState *bs, NotifierWithReturn *notifier); /** - * bdrv_get_aio_context: - * - * Returns: the currently bound #AioContext - */ -AioContext *bdrv_get_aio_context(BlockDriverState *bs); - -/** * bdrv_detach_aio_context: * * May be called from .bdrv_detach_aio_context() to detach children from the -- 2.11.4.GIT