diff options
| author | Felipe Franciosi <felipe@nutanix.com> | 2017-05-24 17:10:00 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-05-31 09:39:20 +0200 |
| commit | 9884db2814fbf1eb2ed99e02dadf58534d3ecc25 (patch) | |
| tree | d0cb9b099d2b480b8fbb583611098d9122f1cc54 | |
| parent | 20a519a05a8a135caa4569c3bf5f6a53c4de5f3e (diff) | |
migration: keep bytes_xfer_prev init'd to zero
The first time migration_bitmap_sync() is called, bytes_xfer_prev is set
to ram_state.bytes_transferred which is, at this point, zero. The next
time migration_bitmap_sync() is called, an iteration has happened and
bytes_xfer_prev is set to 'x' bytes. Most likely, more than one second
has passed, so the auto converge logic will be triggered and
bytes_xfer_now will also be set to 'x' bytes.
This condition is currently masked by dirty_rate_high_cnt, which will
wait for a few iterations before throttling. It would otherwise always
assume zero bytes have been copied and therefore throttle the guest
(possibly) prematurely.
Given bytes_xfer_prev is only used by the auto convergence logic, it
makes sense to only set its value after a check has been made against
bytes_xfer_now.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/ram.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/migration/ram.c b/migration/ram.c index c07a9c08d9..36bf720c27 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -673,10 +673,6 @@ static void migration_bitmap_sync(RAMState *rs) rs->bitmap_sync_count++; - if (!rs->bytes_xfer_prev) { - rs->bytes_xfer_prev = ram_bytes_transferred(); - } - if (!rs->time_last_bitmap_sync) { rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); } |