diff options
| -rw-r--r-- | include/migration/migration.h | 6 | ||||
| -rw-r--r-- | migration/migration.c | 5 | ||||
| -rw-r--r-- | migration/ram.c | 13 |
3 files changed, 13 insertions, 11 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index c4e3d4274f..357eaa0786 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -157,8 +157,6 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; int64_t xbzrle_cache_size; int64_t setup_time; - /* Count of requests incoming from destination */ - int64_t postcopy_requests; /* Flag set once the migration has been asked to enter postcopy */ bool start_postcopy; @@ -254,6 +252,7 @@ uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); uint64_t ram_dirty_sync_count(void); uint64_t ram_dirty_pages_rate(void); +uint64_t ram_postcopy_requests(void); void free_xbzrle_decoded_buf(void); void acct_update_position(QEMUFile *f, size_t size, bool zero); @@ -356,8 +355,7 @@ int global_state_store(void); void global_state_store_running(void); void migration_page_queue_free(void); -int ram_save_queue_pages(MigrationState *ms, const char *rbname, - ram_addr_t start, ram_addr_t len); +int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); uint64_t ram_pagesize_summary(void); PostcopyState postcopy_state_get(void); diff --git a/migration/migration.c b/migration/migration.c index e430aec80e..2990c4069c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -657,7 +657,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) (1ul << qemu_target_page_bits()); info->ram->mbps = s->mbps; info->ram->dirty_sync_count = ram_dirty_sync_count(); - info->ram->postcopy_requests = s->postcopy_requests; + info->ram->postcopy_requests = ram_postcopy_requests(); if (s->state != MIGRATION_STATUS_COMPLETED) { info->ram->remaining = ram_bytes_remaining(); @@ -1120,7 +1120,6 @@ MigrationState *migrate_init(const MigrationParams *params) s->setup_time = 0; s->start_postcopy = false; s->postcopy_after_devices = false; - s->postcopy_requests = 0; s->migration_thread_running = false; error_free(s->error); s->error = NULL; @@ -1480,7 +1479,7 @@ static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname, return; } - if (ram_save_queue_pages(ms, rbname, start, len)) { + if (ram_save_queue_pages(rbname, start, len)) { mark_source_rp_bad(ms); } } diff --git a/migration/ram.c b/migration/ram.c index c5240eb39d..b9f415c09d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -214,6 +214,8 @@ struct RAMState { uint64_t bytes_transferred; /* number of dirtied pages in the last second */ uint64_t dirty_pages_rate; + /* Count of requests incoming from destination */ + uint64_t postcopy_requests; /* protects modification of the bitmap */ QemuMutex bitmap_mutex; /* Ram Bitmap protected by RCU */ @@ -283,6 +285,11 @@ uint64_t ram_dirty_pages_rate(void) return ram_state.dirty_pages_rate; } +uint64_t ram_postcopy_requests(void) +{ + return ram_state.postcopy_requests; +} + /* used by the search for pages to send */ struct PageSearchStatus { /* Current block being searched */ @@ -1240,19 +1247,17 @@ void migration_page_queue_free(void) * * Returns zero on success or negative on error * - * @ms: current migration state * @rbname: Name of the RAMBLock of the request. NULL means the * same that last one. * @start: starting address from the start of the RAMBlock * @len: length (in bytes) to send */ -int ram_save_queue_pages(MigrationState *ms, const char *rbname, - ram_addr_t start, ram_addr_t len) +int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len) { RAMBlock *ramblock; RAMState *rs = &ram_state; - ms->postcopy_requests++; + rs->postcopy_requests++; rcu_read_lock(); if (!rbname) { /* Reuse last RAMBlock */ |