From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWGv-0004Ev-He for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:55:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWGu-00075A-GC for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:55:29 -0500 Sender: fluxion From: Michael Roth Date: Wed, 16 Jan 2013 10:49:18 -0600 Message-Id: <1358354963-9070-17-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1358354963-9070-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1358354963-9070-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 16/21] buffered_file: do not send more than s->bytes_xfer bytes per tick List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, qemu-stable@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) Signed-off-by: Michael Roth --- buffered_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index bd0f61d..9a8bd04 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -66,9 +66,9 @@ static ssize_t buffered_flush(QEMUFileBuffered *s) DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size); while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) { - + size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - s->bytes_xfer); ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset, - s->buffer_size - offset); + to_send); if (ret == -EAGAIN) { DPRINTF("backend not ready, freezing\n"); ret = 0; -- 1.7.9.5