openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull request 

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl5w6j8ACgkQnKSrs4Gr
 c8hFegf/ccv+60LKdT71hs02ywYdBo96OVlIDLMzN2rerXQYxCtOaMLw6oz4Vn8N
 +msp3CBNo2qQ9RwUaFVHrHBO/aSLMxTZze8OZiS9DJ89IStDKOjYqc34ZRfpe9L3
 Z3VSFuHLM4u2ftWjrtjXvGkNDO7hepgUsvINZTa/oxPNAoIChOeHtTEDAEoiSLmt
 kakFEDLvmwbi+5PD2XkJDLCZWr0DL0C9+fhy2iQ6t6wrNO6aQMOx68rD/eDLfI0E
 IKrNMBCznY8u70+EMbPCC7fLLNkos6w/hxFYajHmSeowvxU6cUqvokcDolNQQohF
 4C92Db2c9C/ft7CCcV/laSfnMDu/AQ==
 =0b09
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-03-17 17:41:48 +00:00
parent 6f64998392 4ab78b1918
commit cc818a2148
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/io.c
View File

@ -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 */