mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration/ram.c: Fix codes conflict about bitmap_mutex

Browse Source 
I found upstream codes conflict with COLO and lead to crash,
and I located to this patch:

commit 386a907b37
Author: Wei Wang <wei.w.wang@intel.com>
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 <chen.zhang@intel.com>
Message-Id: <20190329222951.28945-1-chen.zhang@intel.com>
Reviewed-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Zhang Chen 2019-03-30 06:29:51 +08:00 committed by Dr. David Alan Gilbert
parent 10546e09e1
commit c6e5bafb6f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/ram.c
View File

@ -3918,6 +3918,7 @@ int colo_init_ram_cache(void)
} }
ram_state = g_new0(RAMState, 1); ram_state = g_new0(RAMState, 1);
ram_state->migration_dirty_pages = 0; ram_state->migration_dirty_pages = 0;
qemu_mutex_init(&ram_state->bitmap_mutex);
memory_global_dirty_log_start(); memory_global_dirty_log_start();
return 0; return 0;
@ -3956,6 +3957,7 @@ void colo_release_ram_cache(void)
} }
rcu_read_unlock(); rcu_read_unlock();
qemu_mutex_destroy(&ram_state->bitmap_mutex);
g_free(ram_state); g_free(ram_state);
ram_state = NULL; ram_state = NULL;
} }