From patchwork Wed Jan 16 16:49:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 212955 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 851D82C0082 for ; Thu, 17 Jan 2013 05:38:39 +1100 (EST) Received: from localhost ([::1]:55825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWHV-0004zX-98 for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:56:05 -0500 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 Received: from mail-ie0-f171.google.com ([209.85.223.171]:33368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWGu-000756-CG; Wed, 16 Jan 2013 11:55:28 -0500 Received: by mail-ie0-f171.google.com with SMTP id 17so2935268iea.30 for ; Wed, 16 Jan 2013 08:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=dJAEIPFf0nZHz3yRfokwon2PBtAl9qrQJILvmpxwRZY=; b=ywNWg+tRL7NjyNgujiEZU1O4zmKd1InKylUpSCTCdBpPQ0FV3szpinWOEKPRJxHQSI dxUHFGtJ6YfiIG93HqyVfQYpk6DtbeKE3XNsWkeVE5s5K0V/JxMDA8IzMnDDaYY8fCiy Z0bX4pKrKM42OCiS4eTTRRvjXtS4/pr+S9rzlCls2rtTNI86dscUGVT7JDXSVWH33s8l ZSrRv4XAh45nPhCfKSmJ6rP2TNyPrgtD24dlT72crX2jn4UoR2kLuk232R7RzXfovJP2 Y4siZf1B6ZizH7G3p/flq81j80ndmO72Vt6k7Xzs15Owe5s4kcZoQk6R/vxTuVPHaTpW sygg== X-Received: by 10.42.57.11 with SMTP id b11mr1125429ich.15.1358355327673; Wed, 16 Jan 2013 08:55:27 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id kf2sm5189998igc.0.2013.01.16.08.55.26 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 16 Jan 2013 08:55:27 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 10:49:18 -0600 Message-Id: <1358354963-9070-17-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.171 Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 16/21] 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) 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;