[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] ram: Call migration_page_queue_free() at ram_mig
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 3/7] ram: Call migration_page_queue_free() at ram_migration_cleanup() |
Date: |
Wed, 7 Jun 2017 11:59:22 +0200 |
We shouldn't be using memory later than that.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/migration.c | 2 --
migration/ram.c | 5 +++--
migration/ram.h | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 9c5ff57..9cf47d3 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 f387e9c..701a1e6 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 c9563d1..d4da419 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);
--
2.9.4
- [Qemu-devel] [PULL 0/7] Migration PULL requset, Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 1/7] ram: Unfold get_xbzrle_cache_stats() into populate_ram_info(), Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 2/7] ram: We only print throttling information sometimes, Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 3/7] ram: Call migration_page_queue_free() at ram_migration_cleanup(),
Juan Quintela <=
- [Qemu-devel] [PULL 4/7] ram: Move ZERO_TARGET_PAGE inside XBZRLE, Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 6/7] ram: Make RAMState dynamic, Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 5/7] ram: Use MigrationStats for statistics, Juan Quintela, 2017/06/07
- [Qemu-devel] [PULL 7/7] qemu/migration: fix the double free problem on from_src_file, Juan Quintela, 2017/06/07
- Re: [Qemu-devel] [PULL 0/7] Migration PULL requset, Peter Maydell, 2017/06/07