From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WswnX-0005LG-28 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WswnQ-0004lq-VC for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WswnQ-0004ll-Mf for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:12 -0400 From: Stefan Hajnoczi Date: Fri, 6 Jun 2014 18:13:48 +0200 Message-Id: <1402071243-16702-28-git-send-email-stefanha@redhat.com> In-Reply-To: <1402071243-16702-1-git-send-email-stefanha@redhat.com> References: <1402071243-16702-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 27/42] block: Move declaration of bdrv_get_aio_context to block.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng 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 29ac56d..7d86e29 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 93ec86f..8d58334 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 -- 1.9.3