commit cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42
author Kevin Wolf <kwolf@redhat.com> Fri May 21 11:09:42 2010 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri May 28 13:14:25 2010 +0200
tree 9db4d567a701b04ae433711858405ccd4aae4adc
parent 175e11526e2613b3dc031c23fec3107aa4a80307

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>

block.c

diff --git a/block.c b/block.c
index cd70730..47be5ba 100644
--- a/block.c
+++ b/block.c
@@ -2019,7 +2019,7 @@
             // 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;