diff options
| author | Peter Lieven <pl@kamp.de> | 2018-03-08 12:18:28 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2018-03-23 16:45:18 +0000 |
| commit | b47d1e9fe09834d0640aedc002384b0600739075 (patch) | |
| tree | b35e3efd74b42adf17c1c61a9f32f8a448fe3d97 | |
| parent | 44815334e10365ae5c60914c1d9fcecfe5ed5982 (diff) | |
| download | focaccia-qemu-b47d1e9fe09834d0640aedc002384b0600739075.tar.gz focaccia-qemu-b47d1e9fe09834d0640aedc002384b0600739075.zip | |
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 <pl@kamp.de> Message-Id: <1520507908-16743-6-git-send-email-pl@kamp.de> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | migration/block.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/migration/block.c b/migration/block.c index 03bbba61cb..4c04d937b1 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) < |