On 12/10/2023 04:35, Juan Quintela wrote:
> Helper to say if we are doing a migration over rdma.
>
> Reviewed-by: Peter Xu <pet...@redhat.com>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Li Zhijian <lizhij...@fujitsu.com>
> ---
> migration/migration.h | 2 ++
> migration/options.h | 1 +
> migration/migration.c | 1 +
> migration/options.c | 7 +++++++
> migration/rdma.c | 4 +++-
> 5 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/migration/migration.h b/migration/migration.h
> index cd5534337c..96260138d1 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -469,6 +469,8 @@ struct MigrationState {
> * switchover has been received.
> */
> bool switchover_acked;
> + /* Is this a rdma migration */
> + bool rdma_migration;
> };
>
> void migrate_set_state(int *state, int old_state, int new_state);
> diff --git a/migration/options.h b/migration/options.h
> index 045e2a41a2..a26fd1680b 100644
> --- a/migration/options.h
> +++ b/migration/options.h
> @@ -56,6 +56,7 @@ bool migrate_zero_copy_send(void);
>
> bool migrate_multifd_flush_after_each_section(void);
> bool migrate_postcopy(void);
> +bool migrate_rdma(void);
> bool migrate_tls(void);
>
> /* capabilities helpers */
> diff --git a/migration/migration.c b/migration/migration.c
> index 1c6c81ad49..4213c645c6 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1451,6 +1451,7 @@ int migrate_init(MigrationState *s, Error **errp)
> s->iteration_initial_bytes = 0;
> s->threshold_size = 0;
> s->switchover_acked = false;
> + s->rdma_migration = false;
> /*
> * set mig_stats compression_counters memory to zero for a
> * new migration
> diff --git a/migration/options.c b/migration/options.c
> index 6bbfd4853d..da379e7f7a 100644
> --- a/migration/options.c
> +++ b/migration/options.c
> @@ -376,6 +376,13 @@ bool migrate_postcopy(void)
> return migrate_postcopy_ram() || migrate_dirty_bitmaps();
> }
>
> +bool migrate_rdma(void)
> +{
> + MigrationState *s = migrate_get_current();
> +
> + return s->rdma_migration;
> +}
> +
> bool migrate_tls(void)
> {
> MigrationState *s = migrate_get_current();
> diff --git a/migration/rdma.c b/migration/rdma.c
> index f6fc226c9b..f155f3e1c8 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -4113,6 +4113,7 @@ static void rdma_accept_incoming_migration(void *opaque)
>
> void rdma_start_incoming_migration(const char *host_port, Error **errp)
> {
> + MigrationState *s = migrate_get_current();
> int ret;
> RDMAContext *rdma;
>
> @@ -4144,7 +4145,7 @@ void rdma_start_incoming_migration(const char
> *host_port, Error **errp)
> }
>
> trace_rdma_start_incoming_migration_after_rdma_listen();
> -
> + s->rdma_migration = true;
> qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
> NULL, (void *)(intptr_t)rdma);
> return;
> @@ -4220,6 +4221,7 @@ void rdma_start_outgoing_migration(void *opaque,
> trace_rdma_start_outgoing_migration_after_rdma_connect();
>
> s->to_dst_file = rdma_new_output(rdma);
> + s->rdma_migration = true;
> migrate_fd_connect(s, NULL);
> return;
> return_path_err:
