diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-05-04 11:45:01 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-07 10:20:53 +0200 |
| commit | 83c13382e43c4ce157ee26b6d0a6d1db801df78b (patch) | |
| tree | c677ae9abeb0f10efd51788666ef909e6d361d9a | |
| parent | 338182c83c38f6c13731a98e487e7ba3cda6a615 (diff) | |
ram: Call migration_page_queue_free() at ram_migration_cleanup()
We shouldn't be using memory later than that.
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/migration.c | 2 | ||||
| -rw-r--r-- | migration/ram.c | 5 | ||||
| -rw-r--r-- | migration/ram.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/migration/migration.c b/migration/migration.c index 9c5ff577b7..9cf47d389a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -948,8 +948,6 @@ static void migrate_fd_cleanup(void *opaque) qemu_bh_delete(s->cleanup_bh); s->cleanup_bh = NULL; - migration_page_queue_free(); - if (s->to_dst_file) { trace_migrate_fd_cleanup(); qemu_mutex_unlock_iothread(); diff --git a/migration/ram.c b/migration/ram.c index f387e9cc5b..701a1e6b54 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1184,10 +1184,9 @@ static bool get_queued_page(RAMState *rs, PageSearchStatus *pss) * be some left. in case that there is any page left, we drop it. * */ -void migration_page_queue_free(void) +static void migration_page_queue_free(RAMState *rs) { struct RAMSrcPageRequest *mspr, *next_mspr; - RAMState *rs = &ram_state; /* This queue generally should be empty - but in the case of a failed * migration might have some droppings in. */ @@ -1437,6 +1436,7 @@ void free_xbzrle_decoded_buf(void) static void ram_migration_cleanup(void *opaque) { + RAMState *rs = opaque; RAMBlock *block; /* caller have hold iothread lock or is in a bh, so there is @@ -1462,6 +1462,7 @@ static void ram_migration_cleanup(void *opaque) XBZRLE.current_buf = NULL; } XBZRLE_cache_unlock(); + migration_page_queue_free(rs); } static void ram_state_reset(RAMState *rs) diff --git a/migration/ram.h b/migration/ram.h index c9563d10ac..d4da419a18 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -53,7 +53,6 @@ void migrate_decompress_threads_create(void); void migrate_decompress_threads_join(void); uint64_t ram_pagesize_summary(void); -void migration_page_queue_free(void); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); void acct_update_position(QEMUFile *f, size_t size, bool zero); void free_xbzrle_decoded_buf(void); |