Received: from eggs.gnu.org ([2001:4830:134:3::10]:56757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XigTL-0008NS-5z for qemu-devel@nongnu.org; Mon, 27 Oct 2014 05:20:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XigTD-0005D5-Cb for qemu-devel@nongnu.org; Mon, 27 Oct 2014 05:20:19 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:48678 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XigTD-0005CV-1Y for qemu-devel@nongnu.org; Mon, 27 Oct 2014 05:20:11 -0400 From: Peter Lieven Date: Mon, 27 Oct 2014 10:18:46 +0100 Message-Id: <1414401528-21884-5-git-send-email-pl@kamp.de> In-Reply-To: <1414401528-21884-1-git-send-email-pl@kamp.de> References: <1414401528-21884-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv6 4/6] 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, famz@redhat.com, benoit@irqsave.net, ronniesahlberg@gmail.com, Peter Lieven , armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com Signed-off-by: Peter Lieven Reviewed-by: Ronnie Sahlberg Reviewed-by: Max Reitz --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index 76fcc1d..4179341 100644 --- a/block.c +++ b/block.c @@ -4446,6 +4446,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