From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlZpO-0004BV-8x for qemu-devel@nongnu.org; Mon, 12 Oct 2015 05:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlZpK-00067T-7m for qemu-devel@nongnu.org; Mon, 12 Oct 2015 05:55:34 -0400 From: Fam Zheng Date: Mon, 12 Oct 2015 17:55:30 +0800 Message-Id: <1444643731-15346-3-git-send-email-famz@redhat.com> In-Reply-To: <1444643731-15346-1-git-send-email-famz@redhat.com> References: <1444643731-15346-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] aio: Introduce aio_context_setup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-block@nongnu.org, Stefan Hajnoczi This is the place to initialize platform specific bits of AioContext. Signed-off-by: Fam Zheng --- aio-posix.c | 4 ++++ aio-win32.c | 4 ++++ async.c | 14 ++++++++++++-- include/block/aio-internal.h | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 7ae54fc..4fd2383 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -288,3 +288,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 f018934..7873141 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -353,3 +353,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 efce14b..72cdc9b 100644 --- a/async.c +++ b/async.c @@ -27,6 +27,7 @@ #include "block/thread-pool.h" #include "qemu/main-loop.h" #include "qemu/atomic.h" +#include "block/aio-internal.h" /***********************************************************/ /* bottom halves (can be seen as timers which expire ASAP) */ @@ -320,12 +321,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, @@ -339,6 +346,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-internal.h b/include/block/aio-internal.h index 2ffbcdc..f50a37c 100644 --- a/include/block/aio-internal.h +++ b/include/block/aio-internal.h @@ -27,4 +27,6 @@ struct AioHandler { QLIST_ENTRY(AioHandler) node; }; +void aio_context_setup(AioContext *ctx, Error **errp); + #endif -- 2.6.1