From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIr0-0004TY-36 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlIqu-0004Ih-KO for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqu-0004IZ-6X for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:24 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBJCYNi6004077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 07:34:23 -0500 From: Juan Quintela Date: Wed, 19 Dec 2012 13:33:40 +0100 Message-Id: <1355920437-29882-18-git-send-email-quintela@redhat.com> In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com> References: <1355920437-29882-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 17/34] buffered_file: Unfold the trick to restart generating migration data List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This was needed before due to the way that the callbacks worked. Signed-off-by: Juan Quintela Reviewed-by: Paolo Bonzini --- buffered_file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index 5cd477a..f4f5110 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -113,14 +113,6 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in return error; } - if (pos == 0 && size == 0) { - DPRINTF("file is ready\n"); - if (s->bytes_xfer < s->xfer_limit) { - DPRINTF("notifying client\n"); - migrate_fd_put_ready(s->migration_state); - } - } - return size; } @@ -223,8 +215,17 @@ static void *buffered_file_thread(void *opaque) /* usleep expects microseconds */ g_usleep((expire_time - current_time)*1000); } - buffered_put_buffer(s, NULL, 0, 0); + if (buffered_flush(s) < 0) { + break; + } + + DPRINTF("file is ready\n"); + if (s->bytes_xfer < s->xfer_limit) { + DPRINTF("notifying client\n"); + migrate_fd_put_ready(s->migration_state); + } } + g_free(s->buffer); g_free(s); return NULL; -- 1.7.11.7