Skip to contentSkip to conversation

block: Fix multiwrite with overlapping requests

PATCH New Kevin Wolf 1 participant 1 message May 21, 2010

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 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.

---
 block.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
block.c +1 -1
index 72d9441..1586b79 100644
@@ -2029,7 +2029,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;
Signature · 1 line
1.6.6.1