diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-10-11 22:35:17 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-17 09:25:13 +0200 |
| commit | 5f5b8858dc1c11916000a5a2038044dec31640d6 (patch) | |
| tree | 53ee26d8485941e23cfb2cd77aa1ce2ca849f10a /migration/ram.c | |
| parent | 48408174a7ec7bfdc18c6d9886d0eeb20520a349 (diff) | |
| download | focaccia-qemu-5f5b8858dc1c11916000a5a2038044dec31640d6.tar.gz focaccia-qemu-5f5b8858dc1c11916000a5a2038044dec31640d6.zip | |
migration/rdma: Unfold ram_control_after_iterate()
Once there: - Remove unused data parameter - unfold it in its callers - change all callers to call qemu_rdma_registration_stop() - We need to call QIO_CHANNEL_RDMA() after we check for migrate_rdma() Reviewed-by: Li Zhijian <lizhijian@fujitsu.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Message-ID: <20231011203527.9061-4-quintela@redhat.com>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/migration/ram.c b/migration/ram.c index 6592431a4e..f1ddc1f9fa 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3065,7 +3065,11 @@ static int ram_save_setup(QEMUFile *f, void *opaque) if (ret < 0) { qemu_file_set_error(f, ret); } - ram_control_after_iterate(f, RAM_CONTROL_SETUP); + + ret = qemu_rdma_registration_stop(f, RAM_CONTROL_SETUP); + if (ret < 0) { + qemu_file_set_error(f, ret); + } migration_ops = g_malloc0(sizeof(MigrationOps)); migration_ops->ram_save_target_page = ram_save_target_page_legacy; @@ -3187,7 +3191,10 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) * Must occur before EOS (or any QEMUFile operation) * because of RDMA protocol. */ - ram_control_after_iterate(f, RAM_CONTROL_ROUND); + ret = qemu_rdma_registration_stop(f, RAM_CONTROL_ROUND); + if (ret < 0) { + qemu_file_set_error(f, ret); + } out: if (ret >= 0 @@ -3260,7 +3267,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque) qemu_mutex_unlock(&rs->bitmap_mutex); ram_flush_compressed_data(rs); - ram_control_after_iterate(f, RAM_CONTROL_FINISH); + + int ret = qemu_rdma_registration_stop(f, RAM_CONTROL_FINISH); + if (ret < 0) { + qemu_file_set_error(f, ret); + } } if (ret < 0) { |