From 5b4e1eb769eee892b44d3f6b2369b05196442f59 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 19 Dec 2012 10:40:48 +0100 Subject: migration: add XFER_LIMIT_RATIO The "magic" divisions by 10 are there because of the value of BUFFER_DELAY. Introduce a constant to explain them better. Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'migration.c') diff --git a/migration.c b/migration.c index 2937c87f9a..15f22eac40 100644 --- a/migration.c +++ b/migration.c @@ -44,6 +44,11 @@ enum { #define MAX_THROTTLE (32 << 20) /* Migration speed throttling */ +/* Amount of time to allocate to each "chunk" of bandwidth-throttled + * data. */ +#define BUFFER_DELAY 100 +#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY) + /* Migration XBZRLE default cache size */ #define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024) @@ -743,9 +748,6 @@ static int64_t buffered_get_rate_limit(void *opaque) return s->xfer_limit; } -/* 100ms xfer_limit is the limit that we should write each 100ms */ -#define BUFFER_DELAY 100 - static void *buffered_file_thread(void *opaque) { QEMUFileBuffered *s = opaque; @@ -808,7 +810,7 @@ void qemu_fopen_ops_buffered(MigrationState *migration_state) s = g_malloc0(sizeof(*s)); s->migration_state = migration_state; - s->xfer_limit = migration_state->bandwidth_limit / 10; + s->xfer_limit = s->migration_state->bandwidth_limit / XFER_LIMIT_RATIO; s->migration_state->complete = false; s->file = qemu_fopen_ops(s, &buffered_file_ops); -- cgit v1.2.3