[Qemu-devel] [PULL 0/2] Docker and block patches

[Qemu-devel] [PULL 0/2] Docker and block patches

[Fam Zheng]

The following changes since commit a4207e3b00e89f934adb231057dcf9a75ac2ae45:

  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-17 11:59:50 +0100)

are available in the Git repository at:

  git://github.com/famz/qemu.git tags/docker-and-block-pull-request

for you to fetch changes up to cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5:

  iothread: fix epollfd leak in the process of delIOThread (2018-05-18 17:09:54 +0800)

----------------------------------------------------------------
Docker and block patches

Two fairly small fixes.

----------------------------------------------------------------

Jie Wang (1):
  iothread: fix epollfd leak in the process of delIOThread

Philippe Mathieu-Daudé (1):
  docker: Fix trivial typo

 include/block/aio.h           |  8 ++++++++
 tests/docker/Makefile.include |  2 +-
 util/aio-posix.c              | 13 ++++++++++---
 util/aio-win32.c              |  4 ++++
 util/async.c                  |  1 +
 5 files changed, 24 insertions(+), 4 deletions(-)

-- 
2.14.3

[Qemu-devel] [PULL 1/2] docker: Fix trivial typo

[Fam Zheng]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180508144358.13530-1-f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.14.3

[Qemu-devel] [PULL 2/2] iothread: fix epollfd leak in the process of delIOThread

[Fam Zheng]

From: Jie Wang <wangjie88@huawei.com>

When we call addIOThread, the epollfd created in aio_context_setup,
but not close it in the process of delIOThread, so the epollfd will leak.

Reorder the code in aio_epoll_disable and reuse it.

Signed-off-by: Jie Wang <wangjie88@huawei.com>
Message-Id: <1526517763-11108-1-git-send-email-wangjie88@huawei.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
[Mention change to aio_epoll_disable in commit message. - Fam]
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 include/block/aio.h |  8 ++++++++
 util/aio-posix.c    | 13 ++++++++++---
 util/aio-win32.c    |  4 ++++
 util/async.c        |  1 +
 4 files changed, 23 insertions(+), 3 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
@@ -554,6 +554,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
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 = {
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/2] Docker and block patches

[Peter Maydell]

On 18 May 2018 at 10:18, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit a4207e3b00e89f934adb231057dcf9a75ac2ae45:
>
>   Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-17 11:59:50 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/famz/qemu.git tags/docker-and-block-pull-request
>
> for you to fetch changes up to cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5:
>
>   iothread: fix epollfd leak in the process of delIOThread (2018-05-18 17:09:54 +0800)
>
> ----------------------------------------------------------------
> Docker and block patches
>
> Two fairly small fixes.
>
> ----------------------------------------------------------------
>
> Jie Wang (1):
>   iothread: fix epollfd leak in the process of delIOThread
>
> Philippe Mathieu-Daudé (1):
>   docker: Fix trivial typo
>
>  include/block/aio.h           |  8 ++++++++
>  tests/docker/Makefile.include |  2 +-
>  util/aio-posix.c              | 13 ++++++++++---
>  util/aio-win32.c              |  4 ++++
>  util/async.c                  |  1 +
>  5 files changed, 24 insertions(+), 4 deletions(-)

Applied, thanks.

-- PMM