From patchwork Fri May 28 18:01:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 53943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 79A21B7D12 for ; Sat, 29 May 2010 04:12:33 +1000 (EST) Received: from localhost ([127.0.0.1]:56078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OI41Y-0001nV-QW for incoming@patchwork.ozlabs.org; Fri, 28 May 2010 14:11:12 -0400 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 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4SI1wLD002601 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 May 2010 14:01:58 -0400 Received: from localhost.localdomain (vpn1-4-101.ams2.redhat.com [10.36.4.101]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4SI1m6D000489; Fri, 28 May 2010 14:01:56 -0400 From: Kevin Wolf To: anthony@codemonkey.ws 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE PATCH 4/6] block: Fix multiwrite with overlapping requests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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;