From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZulBq-00081A-IW for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZulBp-0001C8-ED for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZulBp-0001BZ-1s for qemu-devel@nongnu.org; Fri, 06 Nov 2015 12:52:41 -0500 From: Stefan Hajnoczi Date: Fri, 6 Nov 2015 17:52:26 +0000 Message-Id: <1446832349-14952-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1446832349-14952-1-git-send-email-stefanha@redhat.com> References: <1446832349-14952-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 4/7] aio: Introduce aio_context_setup 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 This is the place to initialize platform specific bits of AioContext. Signed-off-by: Fam Zheng Message-id: 1446177989-6702-3-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- aio-posix.c | 4 ++++ aio-win32.c | 4 ++++ async.c | 13 +++++++++++-- include/block/aio.h | 8 ++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 0467f23..5bff3cd 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -302,3 +302,7 @@ bool aio_poll(AioContext *ctx, bool blocking) return progress; } + +void aio_context_setup(AioContext *ctx, Error **errp) +{ +} diff --git a/aio-win32.c b/aio-win32.c index 43c4c79..cdc4456 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -369,3 +369,7 @@ bool aio_poll(AioContext *ctx, bool blocking) aio_context_release(ctx); return progress; } + +void aio_context_setup(AioContext *ctx, Error **errp) +{ +} diff --git a/async.c b/async.c index 9589e4b..e106072 100644 --- a/async.c +++ b/async.c @@ -325,12 +325,18 @@ AioContext *aio_context_new(Error **errp) { int ret; AioContext *ctx; + Error *local_err = NULL; + ctx = (AioContext *) g_source_new(&aio_source_funcs, sizeof(AioContext)); + aio_context_setup(ctx, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto fail; + } ret = event_notifier_init(&ctx->notifier, false); if (ret < 0) { - g_source_destroy(&ctx->source); error_setg_errno(errp, -ret, "Failed to initialize event notifier"); - return NULL; + goto fail; } g_source_set_can_recurse(&ctx->source, true); aio_set_event_notifier(ctx, &ctx->notifier, @@ -345,6 +351,9 @@ AioContext *aio_context_new(Error **errp) ctx->notify_dummy_bh = aio_bh_new(ctx, notify_dummy_bh, NULL); return ctx; +fail: + g_source_destroy(&ctx->source); + return NULL; } void aio_context_ref(AioContext *ctx) diff --git a/include/block/aio.h b/include/block/aio.h index cab7c76..9ffecf7 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -429,4 +429,12 @@ static inline bool aio_node_check(AioContext *ctx, bool is_external) return !is_external || !atomic_read(&ctx->external_disable_cnt); } +/** + * aio_context_setup: + * @ctx: the aio context + * + * Initialize the aio context. + */ +void aio_context_setup(AioContext *ctx, Error **errp); + #endif -- 2.5.0