diff options
| author | Juan Quintela <quintela@redhat.com> | 2022-06-21 12:21:32 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-04-27 16:37:28 +0200 |
| commit | b05292c237030343516d073b1a1e5f49ffc017a8 (patch) | |
| tree | 8a61e656ff82e73b10c17f801117072941957764 /migration | |
| parent | 77c259a4cb1c9799754b48f570301ebf1de5ded8 (diff) | |
multifd: Protect multifd_send_sync_main() calls
We only need to do that on the ram_save_iterate() call on sending and
on destination when we get a RAM_SAVE_FLAG_EOS.
In setup() and complete() we need to synch in both new and old cases,
so don't add a check there.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
---
Remove the wrappers that we take out on patch 5.
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/ram.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/migration/ram.c b/migration/ram.c index 01356f60a4..1e2414d681 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3394,9 +3394,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) out: if (ret >= 0 && migration_is_setup_or_active(migrate_get_current()->state)) { - ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel); - if (ret < 0) { - return ret; + if (migrate_multifd_flush_after_each_section()) { + ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel); + if (ret < 0) { + return ret; + } } qemu_put_be64(f, RAM_SAVE_FLAG_EOS); @@ -4153,7 +4155,9 @@ int ram_load_postcopy(QEMUFile *f, int channel) case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_flush_after_each_section()) { + multifd_recv_sync_main(); + } break; default: error_report("Unknown combination of migration flags: 0x%x" @@ -4424,7 +4428,9 @@ static int ram_load_precopy(QEMUFile *f) break; case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_flush_after_each_section()) { + multifd_recv_sync_main(); + } break; default: if (flags & RAM_SAVE_FLAG_HOOK) { |