From patchwork Mon Feb 4 10:41:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 217854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E96032C02A5 for ; Mon, 4 Feb 2013 21:50:34 +1100 (EST) Received: from localhost ([::1]:48447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2JdA-0005vn-4n for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 05:50:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Jcr-0005q6-O0 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:50:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2Jcq-0003RQ-2J for qemu-devel@nongnu.org; Mon, 04 Feb 2013 05:50:13 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:41447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Jcp-0003R8-RO; Mon, 04 Feb 2013 05:50:11 -0500 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 01577A03E9; Mon, 4 Feb 2013 14:50:11 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id BD4AB54B; Mon, 4 Feb 2013 14:41:29 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2013 14:41:07 +0400 Message-Id: <1359974470-17044-58-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1359974470-17044-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Paolo Bonzini , Michael Tokarev , qemu-stable@nongnu.org, Juan Quintela Subject: [Qemu-devel] [PATCH 57/60] buffered_file: do not send more than s->bytes_xfer bytes per tick 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 From: Paolo Bonzini Sending more was possible if the buffer was large. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit bde54c08b4854aceee3dee25121a2b835cb81166) Conflicts (backport): buffered_file.c Signed-off-by: Michael Tokarev --- buffered_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buffered_file.c b/buffered_file.c index f170aa0..daf3cf4 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -85,9 +85,10 @@ static void buffered_flush(QEMUFileBuffered *s) while (offset < s->buffer_size) { ssize_t ret; + size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer); ret = s->put_buffer(s->opaque, s->buffer + offset, - s->buffer_size - offset); + to_send); if (ret == -EAGAIN) { DPRINTF("backend not ready, freezing\n"); s->freeze_output = 1;