From db3519a9ece7ee5005f75d5bfa27fccc6d6bc16a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 21 May 2010 11:09:42 +0200 Subject: 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 (cherry picked from commit cbf1dff2f1033cadcb15c0ffc9c0a3d039d8ed42) --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 955eeaa7b..298414c92 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; -- cgit v1.2.3-65-gdbad