Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Oct 2019 20:57:41 +0000 (25 21:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Oct 2019 20:57:41 +0000 (25 21:57 +0100)
treeefe388ca2b6587ebabcf55751f556dab2214c737
parentee70fc26a5615e4f97c1443a39f4625899b42c4c
parentd154ef37ff885918fa3e512fd7a8e42870291667
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Fri 25 Oct 2019 20:18:23 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  yield_until_fd_readable: make it work with any AioContect
  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()

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