diff options
| author | Zhang Chen <chen.zhang@intel.com> | 2019-03-30 06:29:51 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-04-05 15:29:48 +0100 |
| commit | c6e5bafb6ff330e972eae7b823321143ab3e29e2 (patch) | |
| tree | 0a1fc0cb27d6123a8bdb7cf76dab2b58a9acf8a7 /migration | |
| parent | 10546e09e174e0bb185b66a4c397aa845efcd36e (diff) | |
| download | qemu-c6e5bafb6ff330e972eae7b823321143ab3e29e2.zip qemu-c6e5bafb6ff330e972eae7b823321143ab3e29e2.tar.gz qemu-c6e5bafb6ff330e972eae7b823321143ab3e29e2.tar.bz2 | |
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 <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>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/ram.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/migration/ram.c b/migration/ram.c index d7f8fe4..f68beee 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; } |