aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-02-22 17:36:35 +0100
committerJuan Quintela <quintela@redhat.com>2013-03-11 13:32:02 +0100
commita0ff044b8ea81908cd8fe5819ce33780f53f58ee (patch)
treed7e2bbb150f2125529b0b0e607b261ce9ce85871
parentdb2f25309af1af0f27e0ddec4acc3b66837fa668 (diff)
downloadqemu-a0ff044b8ea81908cd8fe5819ce33780f53f58ee.zip
qemu-a0ff044b8ea81908cd8fe5819ce33780f53f58ee.tar.gz
qemu-a0ff044b8ea81908cd8fe5819ce33780f53f58ee.tar.bz2
migration: use qemu_file_rate_limit consistently
Reviewed-by: Orit Wasserman <owasserm@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/migration.c b/migration.c
index 5d99999..f35728d 100644
--- a/migration.c
+++ b/migration.c
@@ -628,7 +628,7 @@ static void *migration_thread(void *opaque)
int64_t current_time;
uint64_t pending_size;
- if (s->bytes_xfer < s->xfer_limit) {
+ if (!qemu_file_rate_limit(s->file)) {
DPRINTF("iterate\n");
pending_size = qemu_savevm_state_pending(s->file, max_size);
DPRINTF("pending size %lu max %lu\n", pending_size, max_size);
@@ -675,7 +675,7 @@ static void *migration_thread(void *opaque)
sleep_time = 0;
initial_time = current_time;
}
- if (s->bytes_xfer >= s->xfer_limit) {
+ if (qemu_file_rate_limit(s->file)) {
/* usleep expects microseconds */
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
sleep_time += qemu_get_clock_ms(rt_clock) - current_time;