]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Oct 2017 11:02:21 +0000 (12:02 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Oct 2017 11:02:21 +0000 (12:02 +0100)
commit5456c6a4ec9cd8fc314ddc303e88bf85c110975c
tree8e4786bfdf43921d8ff54aa6cf279769612d184d
parentd147f7e815f97cb477e223586bcb80c316ae10ea
parentf708a5e71cba0d784e307334c07ade5f56f827ab
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Tue 03 Oct 2017 19:53:34 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  aio: fix assert when remove poll during destroy
  iothread: delay the context release to finalize
  iothread: export iothread_stop()
  iothread: provide helpers for internal use
  qom: provide root container for internal objs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>