diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 14:11:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-18 14:11:52 +0100 |
| commit | d32e41a1188e929cc0fb16829ce3736046951e39 (patch) | |
| tree | 66b60cd46339a23cd8fb5cc36f52db7135b71028 | |
| parent | dba0f15a3b3a2e72a526be665efad73f3c34a5dd (diff) | |
| parent | cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 (diff) | |
Merge remote-tracking branch 'remotes/famz/tags/docker-and-block-pull-request' into staging
Docker and block patches
Two fairly small fixes.
# gpg: Signature made Fri 18 May 2018 10:17:06 BST
# gpg: using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-and-block-pull-request:
iothread: fix epollfd leak in the process of delIOThread
docker: Fix trivial typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | include/block/aio.h | 8 | ||||
| -rw-r--r-- | tests/docker/Makefile.include | 2 | ||||
| -rw-r--r-- | util/aio-posix.c | 13 | ||||
| -rw-r--r-- | util/aio-win32.c | 4 | ||||
| -rw-r--r-- | util/async.c | 1 |
5 files changed, 24 insertions, 4 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index a1d6b9e249..ae6f354e6c 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -555,6 +555,14 @@ static inline bool in_aio_context_home_thread(AioContext *ctx) void aio_context_setup(AioContext *ctx); /** + * aio_context_destroy: + * @ctx: the aio context + * + * Destroy the aio context. + */ +void aio_context_destroy(AioContext *ctx); + +/** * aio_context_set_poll_params: * @ctx: the aio context * @max_ns: how long to busy poll for, in nanoseconds diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index de87341528..ef1a3e62eb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -46,7 +46,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh -# Enforce dependancies for composite images +# Enforce dependencies for composite images docker-image-debian: docker-image-debian9 docker-image-debian8-mxe: docker-image-debian8 docker-image-debian-amd64: docker-image-debian9 diff --git a/util/aio-posix.c b/util/aio-posix.c index d8f0cb4af8..118bf5784b 100644 --- a/util/aio-posix.c +++ b/util/aio-posix.c @@ -45,11 +45,11 @@ struct AioHandler static void aio_epoll_disable(AioContext *ctx) { - ctx->epoll_available = false; - if (!ctx->epoll_enabled) { + ctx->epoll_enabled = false; + if (!ctx->epoll_available) { return; } - ctx->epoll_enabled = false; + ctx->epoll_available = false; close(ctx->epollfd); } @@ -713,6 +713,13 @@ void aio_context_setup(AioContext *ctx) #endif } +void aio_context_destroy(AioContext *ctx) +{ +#ifdef CONFIG_EPOLL_CREATE1 + aio_epoll_disable(ctx); +#endif +} + void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/aio-win32.c b/util/aio-win32.c index a67b00c6ad..e676a8d9b2 100644 --- a/util/aio-win32.c +++ b/util/aio-win32.c @@ -407,6 +407,10 @@ void aio_context_setup(AioContext *ctx) { } +void aio_context_destroy(AioContext *ctx) +{ +} + void aio_context_set_poll_params(AioContext *ctx, int64_t max_ns, int64_t grow, int64_t shrink, Error **errp) { diff --git a/util/async.c b/util/async.c index 4dd9d95a9e..03f62787f2 100644 --- a/util/async.c +++ b/util/async.c @@ -298,6 +298,7 @@ aio_ctx_finalize(GSource *source) qemu_rec_mutex_destroy(&ctx->lock); qemu_lockcnt_destroy(&ctx->list_lock); timerlistgroup_deinit(&ctx->tlg); + aio_context_destroy(ctx); } static GSourceFuncs aio_source_funcs = { |