Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit3bae150448dbd888a480f892ebbf01caec0d8329
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 24 Jul 2018 14:26:01 +0000 (24 15:26 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 24 Jul 2018 14:26:01 +0000 (24 15:26 +0100)
tree33bb40a77bffb39666077196576cb84769c31fcc
parent0a7052bb75da47e0d57d7b17b5d467de8589c4a8
parent042b757cc77c9580b99ef2781cfb0a2d1bf495a6
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

Regression fix for host block devices with the file-posix driver when aio=native is in use.

# gpg: Signature made Tue 24 Jul 2018 15:22:49 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# 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:
  block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom

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