diff options
| -rw-r--r-- | include/migration/migration.h | 2 | ||||
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/ram.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index 084d195..2f9c973 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -159,7 +159,6 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; int64_t xbzrle_cache_size; int64_t setup_time; - int64_t dirty_sync_count; /* Count of requests incoming from destination */ int64_t postcopy_requests; @@ -255,6 +254,7 @@ void migrate_decompress_threads_join(void); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); +uint64_t ram_dirty_sync_count(void); void free_xbzrle_decoded_buf(void); void acct_update_position(QEMUFile *f, size_t size, bool zero); diff --git a/migration/migration.c b/migration/migration.c index 5918b21..94647a8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -656,7 +656,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->normal_bytes = norm_mig_pages_transferred() * (1ul << qemu_target_page_bits()); info->ram->mbps = s->mbps; - info->ram->dirty_sync_count = s->dirty_sync_count; + info->ram->dirty_sync_count = ram_dirty_sync_count(); info->ram->postcopy_requests = s->postcopy_requests; if (s->state != MIGRATION_STATUS_COMPLETED) { @@ -1120,7 +1120,6 @@ MigrationState *migrate_init(const MigrationParams *params) s->dirty_pages_rate = 0; s->dirty_bytes_rate = 0; s->setup_time = 0; - s->dirty_sync_count = 0; s->start_postcopy = false; s->postcopy_after_devices = false; s->postcopy_requests = 0; diff --git a/migration/ram.c b/migration/ram.c index be26d0c..1580617 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -271,6 +271,11 @@ uint64_t ram_bytes_remaining(void) return ram_state.migration_dirty_pages * TARGET_PAGE_SIZE; } +uint64_t ram_dirty_sync_count(void) +{ + return ram_state.bitmap_sync_count; +} + /* used by the search for pages to send */ struct PageSearchStatus { /* Current block being searched */ @@ -727,7 +732,6 @@ static void migration_bitmap_sync(RAMState *rs) rs->time_last_bitmap_sync = end_time; rs->num_dirty_pages_period = 0; } - s->dirty_sync_count = rs->bitmap_sync_count; if (migrate_use_events()) { qapi_event_send_migration_pass(rs->bitmap_sync_count, NULL); } |