Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit16abfb36c582aae4ac81e5aac1198ed3081deeba
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Feb 2019 15:59:24 +0000 (14 15:59 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 14 Feb 2019 15:59:24 +0000 (14 15:59 +0000)
tree1d4aa920bf5787d8f9bff436987c97c879bb3769
parent7e407466b1efbd65225cc72fe09c0c5ec79df75b
parent42824b4d16da56a50ff4027f6cd22378e0e2666e
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

Fix a virtio-blk migration regression.

# gpg: Signature made Thu 14 Feb 2019 04:32:55 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# 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:
  virtio-blk: set correct config size for the host driver

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