From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47650 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI3tS-0003gH-EF for qemu-devel@nongnu.org; Fri, 28 May 2010 14:02:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OI3sh-0002W7-NH for qemu-devel@nongnu.org; Fri, 28 May 2010 14:02:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3512) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OI3sh-0002Vt-Gn for qemu-devel@nongnu.org; Fri, 28 May 2010 14:02:03 -0400 From: Kevin Wolf Date: Fri, 28 May 2010 20:01:30 +0200 Message-Id: <1275069692-5756-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1275069692-5756-1-git-send-email-kwolf@redhat.com> References: <1275069692-5756-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE PATCH 4/6] block: Fix multiwrite with overlapping requests List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 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