From 83c13382e43c4ce157ee26b6d0a6d1db801df78b Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 4 May 2017 11:45:01 +0200 Subject: ram: Call migration_page_queue_free() at ram_migration_cleanup() We shouldn't be using memory later than that. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/ram.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'migration/ram.c') 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) -- cgit v1.2.1