[2/5] ram: Let colo_flush_ram_cache take the bitmap_mutex

Commit Message

Lukas Straub May 8, 2023, 12:52 a.m. UTC

This will be used in the next commits to add colo support to multifd.

Signed-off-by: Lukas Straub <[e-mail]>
---
 migration/ram.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/migration/ram.c b/migration/ram.c
index 2d3fd2112a..f9e7aeda12 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -4230,6 +4230,7 @@  void colo_flush_ram_cache(void)
     unsigned long offset = 0;
 
     memory_global_dirty_log_sync();
+    qemu_mutex_lock(&ram_state->bitmap_mutex);
     WITH_RCU_READ_LOCK_GUARD() {
         RAMBLOCK_FOREACH_NOT_IGNORED(block) {
             ramblock_sync_dirty_bitmap(ram_state, block);
@@ -4264,6 +4265,7 @@  void colo_flush_ram_cache(void)
             }
         }
     }
+    qemu_mutex_unlock(&ram_state->bitmap_mutex);
     trace_colo_flush_ram_cache_end();
 }