mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
migration: Take bitmap mutex when completing ram migration
Any call to ram_find_and_save_block() needs to take the bitmap mutex. We used to not take it for most of ram_save_complete() because we thought we're the only one left using the bitmap, but it's not true after the preempt full patchset applied, since the return path can be taking it too. Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
a4dbaf8eed
commit
c13221b56f
|
@ -3406,6 +3406,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
|
|||
/* try transferring iterative blocks of memory */
|
||||
|
||||
/* flush all remaining blocks regardless of rate limiting */
|
||||
qemu_mutex_lock(&rs->bitmap_mutex);
|
||||
while (true) {
|
||||
int pages;
|
||||
|
||||
|
@ -3419,6 +3420,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
|
|||
break;
|
||||
}
|
||||
}
|
||||
qemu_mutex_unlock(&rs->bitmap_mutex);
|
||||
|
||||
flush_compressed_data(rs);
|
||||
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
|
||||
|
|
Loading…
Reference in a new issue