Received: from eggs.gnu.org ([2001:4830:134:3::10]:47901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYr39-0006EL-Cq for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYr33-00055L-Mp for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:39 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:47484 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYr33-00052O-CD for qemu-devel@nongnu.org; Tue, 30 Sep 2014 02:36:33 -0400 From: Peter Lieven Date: Tue, 30 Sep 2014 08:35:19 +0200 Message-Id: <1412058919-13209-4-git-send-email-pl@kamp.de> In-Reply-To: <1412058919-13209-1-git-send-email-pl@kamp.de> References: <1412058919-13209-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 3/3] block: avoid creating oversized writes in multiwrite_merge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com Signed-off-by: Peter Lieven Reviewed-by: Ronnie Sahlberg --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index 26806e0..a26e6a5 100644 --- a/block.c +++ b/block.c @@ -4559,6 +4559,11 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, merge = 0; } + if (bs->bl.max_transfer_length && reqs[outidx].nb_sectors + + reqs[i].nb_sectors > bs->bl.max_transfer_length) { + merge = 0; + } + if (merge) { size_t size; QEMUIOVector *qiov = g_malloc0(sizeof(*qiov)); -- 1.7.9.5