* Zhimin Feng (fengzhim...@huawei.com) wrote:
> From: fengzhimin <fengzhim...@huawei.com>
>
> We need to call the 'migration_incoming_setup' function in migration/rdma.c,
> so it has to be changed to a global function.
>
> Signed-off-by: fengzhimin <fengzhim...@huawei.com>
OK, but this should probably be split into two patches.
With a split;
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> migration/migration.c | 11 ++++++++++-
> migration/migration.h | 2 ++
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index e98e236ef9..d9d73a5eac 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -518,7 +518,7 @@ fail:
> exit(EXIT_FAILURE);
> }
>
> -static void migration_incoming_setup(QEMUFile *f)
> +void migration_incoming_setup(QEMUFile *f)
> {
> MigrationIncomingState *mis = migration_incoming_get_current();
>
> @@ -2185,6 +2185,15 @@ bool migrate_use_multiRDMA(void)
> return s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIRDMA];
> }
>
> +bool migrate_use_rdma_pin_all(void)
> +{
> + MigrationState *s;
> +
> + s = migrate_get_current();
> +
> + return s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL];
> +}
> +
> bool migrate_use_multifd(void)
> {
> MigrationState *s;
> diff --git a/migration/migration.h b/migration/migration.h
> index bb488028a6..0a23375b2f 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -265,6 +265,7 @@ struct MigrationState
>
> void migrate_set_state(int *state, int old_state, int new_state);
>
> +void migration_incoming_setup(QEMUFile *f);
> void migration_fd_process_incoming(QEMUFile *f);
> void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
> void migration_incoming_process(void);
> @@ -297,6 +298,7 @@ bool migrate_validate_uuid(void);
>
> bool migrate_auto_converge(void);
> bool migrate_use_multiRDMA(void);
> +bool migrate_use_rdma_pin_all(void);
> bool migrate_use_multifd(void);
> bool migrate_pause_before_switchover(void);
> int migrate_multifd_channels(void);
> --
> 2.19.1
>
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
