From 4380be0e997284159e634100d2f5ec87f944d74d Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Mon, 2 Jun 2014 20:16:55 +0800 Subject: [PATCH] migration: Plug memory leak in migrate-set-cache-size command We call g_free() after cache_fini() in migration_end(), but we don't call it after cache_fini() in xbzrle_cache_resize(), leaking the memory. cache_init() and cache_fini() are a pair. Since cache_init() allocates the cache, let cache_fini() free it. This plugs the leak. Signed-off-by: Chen Gang Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Michael Tokarev --- arch_init.c | 1 - page_cache.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 9f1a174d3a13..23044c1d1226 100644 --- a/arch_init.c +++ b/arch_init.c @@ -739,7 +739,6 @@ static void migration_end(void) XBZRLE_cache_lock(); if (XBZRLE.cache) { cache_fini(XBZRLE.cache); - g_free(XBZRLE.cache); g_free(XBZRLE.encoded_buf); g_free(XBZRLE.current_buf); XBZRLE.cache = NULL; diff --git a/page_cache.c b/page_cache.c index b033681a937b..89bb1ec3a021 100644 --- a/page_cache.c +++ b/page_cache.c @@ -109,6 +109,7 @@ void cache_fini(PageCache *cache) g_free(cache->page_cache); cache->page_cache = NULL; + g_free(cache); } static size_t cache_get_cache_pos(const PageCache *cache,