buffered_file: do not send more than s->bytes_xfer bytes per tick
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 20 Nov 2012 11:48:19 +0000 (12:48 +0100)
committerJuan Quintela <quintela@redhat.com>
Thu, 20 Dec 2012 21:44:29 +0000 (22:44 +0100)
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>
buffered_file.c

index 27627a1b71572d49ccda329259b704e7726ef17f..1de47e04a88d4b9936b068e54deef180c9537b0a 100644 (file)
@@ -65,9 +65,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;