diff options
author | Kevin Wolf <kwolf@redhat.com> | 2010-05-21 11:09:42 +0200 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-06-09 18:36:09 +0200 |
commit | db3519a9ece7ee5005f75d5bfa27fccc6d6bc16a (patch) | |
tree | d95e255569099330cf05207af253a34a690eac50 | |
parent | qcow2: Fix error handling in l2_allocate (diff) | |
download | qemu-kvm-db3519a9ece7ee5005f75d5bfa27fccc6d6bc16a.tar.gz qemu-kvm-db3519a9ece7ee5005f75d5bfa27fccc6d6bc16a.tar.bz2 qemu-kvm-db3519a9ece7ee5005f75d5bfa27fccc6d6bc16a.zip |
block: Fix multiwrite with overlapping requests
With overlapping requests, the total number of sectors is smaller than the sum
of the nb_sectors of both requests.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42)
-rw-r--r-- | block.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1711,7 +1711,7 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, // Add the second request qemu_iovec_concat(qiov, reqs[i].qiov, reqs[i].qiov->size); - reqs[outidx].nb_sectors += reqs[i].nb_sectors; + reqs[outidx].nb_sectors = qiov->size >> 9; reqs[outidx].qiov = qiov; mcb->callbacks[i].free_qiov = reqs[outidx].qiov; |