qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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

Pull request

# gpg: Signature made Tue 17 Mar 2020 15:18:23 GMT
# 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:
block/io: fix bdrv_co_do_copy_on_readv

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

+1 -1
+1 -1
block/io.c
··· 1399 1399 if (!(flags & BDRV_REQ_PREFETCH)) { 1400 1400 qemu_iovec_from_buf(qiov, qiov_offset + progress, 1401 1401 bounce_buffer + skip_bytes, 1402 - pnum - skip_bytes); 1402 + MIN(pnum - skip_bytes, bytes - progress)); 1403 1403 } 1404 1404 } else if (!(flags & BDRV_REQ_PREFETCH)) { 1405 1405 /* Read directly into the destination */