[Qemu-commits] [qemu/qemu] 9d5e54: docker: Fix trivial typo

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9d5e546af0a8500c0bde312c8dea6037428c655d
      
https://github.com/qemu/qemu/commit/9d5e546af0a8500c0bde312c8dea6037428c655d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M tests/docker/Makefile.include

  Log Message:
  -----------
  docker: Fix trivial typo

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>


  Commit: cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5
      
https://github.com/qemu/qemu/commit/cd0a6d2b2c3d5cbf82a868d8c6c80961bcda6db5
  Author: Jie Wang <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M include/block/aio.h
    M util/aio-posix.c
    M util/aio-win32.c
    M util/async.c

  Log Message:
  -----------
  iothread: fix epollfd leak in the process of delIOThread

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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
[Mention change to aio_epoll_disable in commit message. - Fam]
Signed-off-by: Fam Zheng <address@hidden>


  Commit: d32e41a1188e929cc0fb16829ce3736046951e39
      
https://github.com/qemu/qemu/commit/d32e41a1188e929cc0fb16829ce3736046951e39
  Author: Peter Maydell <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M include/block/aio.h
    M tests/docker/Makefile.include
    M util/aio-posix.c
    M util/aio-win32.c
    M util/async.c

  Log Message:
  -----------
  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 <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/dba0f15a3b3a...d32e41a1188e
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.