summaryrefslogtreecommitdiffstats
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf2010-05-21 11:09:42 +0200
committerKevin Wolf2010-05-28 13:14:25 +0200
commitcbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42 (patch)
tree9db4d567a701b04ae433711858405ccd4aae4adc /block.c
parentqcow2: Fix error handling in l2_allocate (diff)
downloadqemu-cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42.tar.gz
qemu-cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42.tar.xz
qemu-cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42.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>
Diffstat (limited to 'block.c')
-rw-r--r--block.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block.c b/block.c
index cd70730a3e..47be5ba125 100644
--- a/block.c
+++ b/block.c
@@ -2019,7 +2019,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;