diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-03-28 14:59:01 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-04-21 12:25:36 +0200 |
| commit | eac741595890ac3dec3c8addd02bf34cbf8fec25 (patch) | |
| tree | efefd70c7a89cab2bc059988d2588da3c3a5966d | |
| parent | f664da80fcc9120faecc1afd4b2af31019f0aff9 (diff) | |
ram: Move bytes_xfer_prev into RAMState
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
| -rw-r--r-- | migration/ram.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/migration/ram.c b/migration/ram.c index 53a547cd94..aeef5637a5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -157,6 +157,8 @@ struct RAMState { /* these variables are used for bitmap sync */ /* last time we did a full bitmap_sync */ int64_t time_last_bitmap_sync; + /* bytes transferred at start_time */ + int64_t bytes_xfer_prev; }; typedef struct RAMState RAMState; @@ -620,14 +622,13 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) } /* Fix me: there are too many global variables used in migration process. */ -static int64_t bytes_xfer_prev; static uint64_t xbzrle_cache_miss_prev; static uint64_t iterations_prev; static void migration_bitmap_sync_init(RAMState *rs) { rs->time_last_bitmap_sync = 0; - bytes_xfer_prev = 0; + rs->bytes_xfer_prev = 0; num_dirty_pages_period = 0; xbzrle_cache_miss_prev = 0; iterations_prev = 0; @@ -663,8 +664,8 @@ static void migration_bitmap_sync(RAMState *rs) rs->bitmap_sync_count++; - if (!bytes_xfer_prev) { - bytes_xfer_prev = ram_bytes_transferred(); + if (!rs->bytes_xfer_prev) { + rs->bytes_xfer_prev = ram_bytes_transferred(); } if (!rs->time_last_bitmap_sync) { @@ -698,13 +699,13 @@ static void migration_bitmap_sync(RAMState *rs) if (s->dirty_pages_rate && (num_dirty_pages_period * TARGET_PAGE_SIZE > - (bytes_xfer_now - bytes_xfer_prev)/2) && + (bytes_xfer_now - rs->bytes_xfer_prev) / 2) && (rs->dirty_rate_high_cnt++ >= 2)) { trace_migration_throttle(); rs->dirty_rate_high_cnt = 0; mig_throttle_guest_down(); } - bytes_xfer_prev = bytes_xfer_now; + rs->bytes_xfer_prev = bytes_xfer_now; } if (migrate_use_xbzrle()) { |