From patchwork Wed Jan 16 16:49:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [15/21] migration: fix migration_bitmap leak Date: Wed, 16 Jan 2013 06:49:17 -0000 From: Michael Roth X-Patchwork-Id: 212862 Message-Id: <1358354963-9070-16-git-send-email-mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org From: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela (cherry picked from commit 244eaa7514a944b36273eb8428f32da8e9124fcf) Signed-off-by: Michael Roth --- arch_init.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch_init.c b/arch_init.c index 83dcc53..0d7844c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -535,9 +535,13 @@ static void sort_ram_list(void) static void migration_end(void) { - memory_global_dirty_log_stop(); + if (migration_bitmap) { + memory_global_dirty_log_stop(); + g_free(migration_bitmap); + migration_bitmap = NULL; + } - if (migrate_use_xbzrle()) { + if (XBZRLE.cache) { cache_fini(XBZRLE.cache); g_free(XBZRLE.cache); g_free(XBZRLE.encoded_buf); @@ -689,13 +693,10 @@ static int ram_save_complete(QEMUFile *f, void *opaque) } bytes_transferred += bytes_sent; } - memory_global_dirty_log_stop(); + migration_end(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - g_free(migration_bitmap); - migration_bitmap = NULL; - return 0; }