diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-20 12:48:19 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-01-15 22:38:00 -0600 |
| commit | ff0c079c1425b004019ab33f4ba1339d9ea365d2 (patch) | |
| tree | ad17383dc2476c25a5ed0f3d7bde9ac306e23f7a | |
| parent | d745511fc91c71d62cc96f99f5b1b69aed501bb5 (diff) | |
| download | qemu-ff0c079c1425b004019ab33f4ba1339d9ea365d2.zip qemu-ff0c079c1425b004019ab33f4ba1339d9ea365d2.tar.gz qemu-ff0c079c1425b004019ab33f4ba1339d9ea365d2.tar.bz2 | |
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 <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
(cherry picked from commit bde54c08b4854aceee3dee25121a2b835cb81166)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | buffered_file.c | 4 |
1 files 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; |