qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Lieven <pl@kamp.de>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com,
	Peter Lieven <pl@kamp.de>,
	mreitz@redhat.com, ronniesahlberg@gmail.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCHv3 3/3] block: avoid creating oversized writes in multiwrite_merge
Date: Tue, 30 Sep 2014 08:35:19 +0200	[thread overview]
Message-ID: <1412058919-13209-4-git-send-email-pl@kamp.de> (raw)
In-Reply-To: <1412058919-13209-1-git-send-email-pl@kamp.de>

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
---
 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

      parent reply	other threads:[~2014-09-30  6:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-30  6:35 [Qemu-devel] [PATCHv3 0/3] introduce max_transfer_length Peter Lieven
2014-09-30  6:35 ` [Qemu-devel] [PATCHv3 1/3] BlockLimits: " Peter Lieven
2014-09-30  6:35 ` [Qemu-devel] [PATCHv3 2/3] block/iscsi: set max_transfer_length Peter Lieven
2014-09-30  6:35 ` Peter Lieven [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412058919-13209-4-git-send-email-pl@kamp.de \
    --to=pl@kamp.de \
    --cc=benoit.canet@irqsave.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=ronniesahlberg@gmail.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).