From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqc-0003dT-Ku for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlIqY-0004AI-Ek for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:06 -0500 From: Juan Quintela Date: Wed, 19 Dec 2012 13:33:24 +0100 Message-Id: <1355920437-29882-2-git-send-email-quintela@redhat.com> In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com> References: <1355920437-29882-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 01/34] migration: fix migration_bitmap leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-stable@nongnu.org From: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela --- 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; } -- 1.7.11.7