From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 21 May 2010 09:09:42 +0000 (+0200)
Subject: block: Fix multiwrite with overlapping requests
X-Git-Tag: v0.13.0-rc0~356^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42;p=thirdparty%2Fqemu.git

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>
---

diff --git a/block.c b/block.c
index cd70730a3e3..47be5ba1255 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;