From ff0c079c1425b004019ab33f4ba1339d9ea365d2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 20 Nov 2012 12:48:19 +0100 Subject: [PATCH] buffered_file: do not send more than s->bytes_xfer bytes per tick 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 bd0f61d8c9..9a8bd0446f 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; -- 2.39.5