From: Peter Lieven Date: Thu, 8 Mar 2018 11:18:28 +0000 (+0100) Subject: migration/block: compare only read blocks against the rate limiter X-Git-Tag: v2.12.0-rc1~13^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b47d1e9fe09834d0640aedc002384b0600739075;p=thirdparty%2Fqemu.git migration/block: compare only read blocks against the rate limiter only read_done blocks are in the queued to be flushed to the migration stream. submitted blocks are still in flight. Signed-off-by: Peter Lieven Message-Id: <1520507908-16743-6-git-send-email-pl@kamp.de> Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- diff --git a/migration/block.c b/migration/block.c index 03bbba61cb2..4c04d937b1d 100644 --- a/migration/block.c +++ b/migration/block.c @@ -773,8 +773,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) /* control the rate of transfer */ blk_mig_lock(); - while ((block_mig_state.submitted + - block_mig_state.read_done) * BLOCK_SIZE < + while (block_mig_state.read_done * BLOCK_SIZE < qemu_file_get_rate_limit(f) && block_mig_state.submitted < MAX_PARALLEL_IO && (block_mig_state.submitted + block_mig_state.read_done) <