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 /include | |
| parent | dba0f15a3b3a2e72a526be665efad73f3c34a5dd (diff) | |
| parent | cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 (diff) | |
| download | qemu-d32e41a1188e929cc0fb16829ce3736046951e39.zip qemu-d32e41a1188e929cc0fb16829ce3736046951e39.tar.gz qemu-d32e41a1188e929cc0fb16829ce3736046951e39.tar.bz2 | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/aio.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index a1d6b9e..ae6f354 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 |