summary refs log tree commit diff stats
path: root/util/async.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-05-18 14:11:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-18 14:11:52 +0100
commitd32e41a1188e929cc0fb16829ce3736046951e39 (patch)
tree66b60cd46339a23cd8fb5cc36f52db7135b71028 /util/async.c
parentdba0f15a3b3a2e72a526be665efad73f3c34a5dd (diff)
parentcd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5 (diff)
downloadfocaccia-qemu-d32e41a1188e929cc0fb16829ce3736046951e39.tar.gz
focaccia-qemu-d32e41a1188e929cc0fb16829ce3736046951e39.zip
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 'util/async.c')
-rw-r--r--util/async.c1
1 files changed, 1 insertions, 0 deletions
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 = {