| Message ID | 1468578524-23433-1-git-send-email-caoj.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 07/15/2016 04:28 AM, Cao jin wrote: > Parameter **errp of aio_context_setup() is useless, remove it > and clean up the related code. > > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Cc: Fam Zheng <famz@redhat.com> > Cc: Eric Blake <eblake@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > aio-posix.c | 3 ++- > aio-win32.c | 2 +- > async.c | 8 ++------ > include/block/aio.h | 2 +- > 4 files changed, 6 insertions(+), 9 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Fri, Jul 15, 2016 at 06:28:44PM +0800, Cao jin wrote: > Parameter **errp of aio_context_setup() is useless, remove it > and clean up the related code. > > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Cc: Fam Zheng <famz@redhat.com> > Cc: Eric Blake <eblake@redhat.com> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> > --- > aio-posix.c | 3 ++- > aio-win32.c | 2 +- > async.c | 8 ++------ > include/block/aio.h | 2 +- > 4 files changed, 6 insertions(+), 9 deletions(-) > > v4 changelog: > 1. replace plain errno with strerror(errno) (Eric) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/aio-posix.c b/aio-posix.c index 6006122..43162a9 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -485,12 +485,13 @@ bool aio_poll(AioContext *ctx, bool blocking) return progress; } -void aio_context_setup(AioContext *ctx, Error **errp) +void aio_context_setup(AioContext *ctx) { #ifdef CONFIG_EPOLL_CREATE1 assert(!ctx->epollfd); ctx->epollfd = epoll_create1(EPOLL_CLOEXEC); if (ctx->epollfd == -1) { + fprintf(stderr, "Failed to create epoll instance: %s", strerror(errno)); ctx->epoll_available = false; } else { ctx->epoll_available = true; diff --git a/aio-win32.c b/aio-win32.c index 6aaa32a..c8c249e 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -371,6 +371,6 @@ bool aio_poll(AioContext *ctx, bool blocking) return progress; } -void aio_context_setup(AioContext *ctx, Error **errp) +void aio_context_setup(AioContext *ctx) { } diff --git a/async.c b/async.c index fb7dd92..8589017 100644 --- a/async.c +++ b/async.c @@ -327,14 +327,10 @@ 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; - } + aio_context_setup(ctx); + ret = event_notifier_init(&ctx->notifier, false); if (ret < 0) { error_setg_errno(errp, -ret, "Failed to initialize event notifier"); diff --git a/include/block/aio.h b/include/block/aio.h index 88a64ee..0922b69 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -439,6 +439,6 @@ static inline bool aio_node_check(AioContext *ctx, bool is_external) * * Initialize the aio context. */ -void aio_context_setup(AioContext *ctx, Error **errp); +void aio_context_setup(AioContext *ctx); #endif
Parameter **errp of aio_context_setup() is useless, remove it and clean up the related code. Cc: Stefan Hajnoczi <stefanha@redhat.com> Cc: Fam Zheng <famz@redhat.com> Cc: Eric Blake <eblake@redhat.com> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- aio-posix.c | 3 ++- aio-win32.c | 2 +- async.c | 8 ++------ include/block/aio.h | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) v4 changelog: 1. replace plain errno with strerror(errno) (Eric)