Commit cc818a21 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6f649983 4ab78b19

block/io.c

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child, 
            if (!(flags & BDRV_REQ_PREFETCH)) {

                qemu_iovec_from_buf(qiov, qiov_offset + progress,

                                    bounce_buffer + skip_bytes,

                                    pnum - skip_bytes);

                                    MIN(pnum - skip_bytes, bytes - progress));

            }

        } else if (!(flags & BDRV_REQ_PREFETCH)) {

            /* Read directly into the destination */