summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-05-21 11:09:42 +0200
committerDoug Goldstein <cardoe@gentoo.org>2010-07-20 17:35:01 -0500
commite9aaabc0e0da083ad2fe934890cc45a28fa76e39 (patch)
treeae12d74d9c1658a6860615b867e0e97287fb99b1
parentqcow2: Fix error handling in l2_allocate (diff)
downloadqemu-kvm-e9aaabc0e0da083ad2fe934890cc45a28fa76e39.tar.gz
qemu-kvm-e9aaabc0e0da083ad2fe934890cc45a28fa76e39.tar.bz2
qemu-kvm-e9aaabc0e0da083ad2fe934890cc45a28fa76e39.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block.c b/block.c
index 955eeaa7b..298414c92 100644
--- a/block.c
+++ b/block.c
@@ -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;