From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Dec 2018 11:35:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b39c027d824847dc606e49f79304cb572ed6a9b3;p=qemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

Minor virtio-blk fixes.

# gpg: Signature made Wed 12 Dec 2018 09:50:17 GMT
# 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:
  virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is initially -1
  virtio-blk: rename iov to out_iov in virtio_blk_handle_request()

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

b39c027d824847dc606e49f79304cb572ed6a9b3