From patchwork Fri Sep 12 11:21:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 388592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46FEF14017E for ; Fri, 12 Sep 2014 21:23:53 +1000 (EST) Received: from localhost ([::1]:44198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOxA-0003bK-Hc for incoming@patchwork.ozlabs.org; Fri, 12 Sep 2014 07:23:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOwZ-0002eN-08 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSOwO-00068k-Cy for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:23:10 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:59924 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSOwO-00068S-19 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 07:23:00 -0400 Received: (qmail 14839 invoked by uid 89); 12 Sep 2014 11:22:56 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.4/19357. hbedv: 8.3.24.22/7.11.171.206. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.060283 secs); 12 Sep 2014 11:22:56 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 12 Sep 2014 11:22:55 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 3828D206AA; Fri, 12 Sep 2014 13:21:55 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 342635FAFC; Fri, 12 Sep 2014 13:21:55 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 12 Sep 2014 13:21:52 +0200 Message-Id: <1410520912-7557-5-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1410520912-7557-1-git-send-email-pl@kamp.de> References: <1410520912-7557-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com, Peter Lieven , mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv2 4/4] block: avoid creating oversized writes in multiwrite_merge X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 965e9bc..2b9be99 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));