summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-11-20 12:48:19 +0100
committerDoug Goldstein <cardoe@cardoe.com>2013-01-18 21:02:08 -0600
commit79d7f8f70d79b94e175d8d2cb36dc1f2f222563c (patch)
treedd4aa9ec2ec2679a6dd77d1d0e7ea5ab248063eb
parenttarget-xtensa: fix search_pc for the last TB opcode (diff)
downloadqemu-kvm-79d7f8f70d79b94e175d8d2cb36dc1f2f222563c.tar.gz
qemu-kvm-79d7f8f70d79b94e175d8d2cb36dc1f2f222563c.tar.bz2
qemu-kvm-79d7f8f70d79b94e175d8d2cb36dc1f2f222563c.zip
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) Conflicts: buffered_file.c
-rw-r--r--buffered_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/buffered_file.c b/buffered_file.c
index f170aa046..1e9b0504f 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -85,6 +85,7 @@ static void buffered_flush(QEMUFileBuffered *s)
while (offset < s->buffer_size) {
ssize_t ret;
+ size_t to_send = MIN(s->buffer_size - offset, s->xfer_limit - offset);
ret = s->put_buffer(s->opaque, s->buffer + offset,
s->buffer_size - offset);