[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2] aio-posix: remove useless parameter
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v2] aio-posix: remove useless parameter |
Date: |
Wed, 13 Jul 2016 10:26:13 +0800 |
Parameter **errp of aio_context_setup() is useless, remove it
and clean up the related code.
Signed-off-by: Cao jin <address@hidden>
---
aio-posix.c | 3 ++-
async.c | 8 ++------
include/block/aio.h | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/aio-posix.c b/aio-posix.c
index 6006122..24ebf2d 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");
ctx->epoll_available = false;
} else {
ctx->epoll_available = true;
diff --git a/async.c b/async.c
index b4bf205..1f9754b 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
--
2.1.0
- [Qemu-devel] [PATCH v2] aio-posix: remove useless parameter,
Cao jin <=