[Qemu-devel] [STABLE PATCH 4/6] block: Fix multiwrite with overlapping requests

[Kevin Wolf]

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 <address@hidden>
(cherry picked from commit cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42)
---
 block.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/block.c b/block.c
index 955eeaa..298414c 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;
-- 
1.6.6.1