From: Zhang Chen Date: Fri, 29 Mar 2019 22:29:51 +0000 (+0800) Subject: migration/ram.c: Fix codes conflict about bitmap_mutex X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6e5bafb6ff330e972eae7b823321143ab3e29e2;p=qmiga%2Fqemu.git migration/ram.c: Fix codes conflict about bitmap_mutex I found upstream codes conflict with COLO and lead to crash, and I located to this patch: commit 386a907b37a9321bc5d699bc37104d6ffba1b34d Author: Wei Wang Date: Tue Dec 11 16:24:49 2018 +0800 migration: use bitmap_mutex in migration_bitmap_clear_dirty My colleague Wei's patch add bitmap_mutex in migration_bitmap_clear_dirty, but COLO didn't initialize the bitmap_mutex. So we always get an error when COLO start up. like that: qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock_impl: Assertion `mutex->initialized' failed. This patch add the bitmap_mutex initialize and destroy in COLO lifecycle. Signed-off-by: Zhang Chen Message-Id: <20190329222951.28945-1-chen.zhang@intel.com> Reviewed-by: Wei Wang Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- diff --git a/migration/ram.c b/migration/ram.c index d7f8fe45a8..f68beeeeff 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3918,6 +3918,7 @@ int colo_init_ram_cache(void) } ram_state = g_new0(RAMState, 1); ram_state->migration_dirty_pages = 0; + qemu_mutex_init(&ram_state->bitmap_mutex); memory_global_dirty_log_start(); return 0; @@ -3956,6 +3957,7 @@ void colo_release_ram_cache(void) } rcu_read_unlock(); + qemu_mutex_destroy(&ram_state->bitmap_mutex); g_free(ram_state); ram_state = NULL; }