From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPwkR-0008P9-Ud for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPwkM-0001zo-1S for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:31 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:53454 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPwkL-0001yx-M0 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 12:52:25 -0400 From: Peter Lieven Date: Fri, 5 Sep 2014 18:51:28 +0200 Message-Id: <1409935888-18552-5-git-send-email-pl@kamp.de> In-Reply-To: <1409935888-18552-1-git-send-email-pl@kamp.de> References: <1409935888-18552-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 4/4] 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, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com Signed-off-by: Peter Lieven --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index fa4c34b..db3f842 100644 --- a/block.c +++ b/block.c @@ -4554,6 +4554,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