Juan Quintela <[email protected]> writes:
> Signed-off-by: Juan Quintela <[email protected]>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <[email protected]>
> ---
> migration/options.c | 7 +++++++
> migration/options.h | 1 +
> migration/rdma.c | 6 +++---
> 3 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/migration/options.c b/migration/options.c
> index 2003e413da..9c9b8e5863 100644
> --- a/migration/options.c
> +++ b/migration/options.c
> @@ -138,6 +138,13 @@ bool migrate_postcopy_ram(void)
> return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
> }
>
> +bool migrate_rdma_pin_all(void)
> +{
> + MigrationState *s = migrate_get_current();
> +
> + return s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL];
> +}
> +
> bool migrate_release_ram(void)
> {
> MigrationState *s;
> diff --git a/migration/options.h b/migration/options.h
> index 316efd1063..25c002b37a 100644
> --- a/migration/options.h
> +++ b/migration/options.h
> @@ -30,6 +30,7 @@ bool migrate_pause_before_switchover(void);
> bool migrate_postcopy_blocktime(void);
> bool migrate_postcopy_preempt(void);
> bool migrate_postcopy_ram(void);
> +bool migrate_rdma_pin_all(void);
> bool migrate_release_ram(void);
> bool migrate_return_path(void);
> bool migrate_validate_uuid(void);
> diff --git a/migration/rdma.c b/migration/rdma.c
> index bf55e2f163..3e7b68c482 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -35,6 +35,7 @@
> #include <rdma/rdma_cma.h>
> #include "trace.h"
> #include "qom/object.h"
> +#include "options.h"
> #include <poll.h>
>
> /*
> @@ -4178,8 +4179,7 @@ void rdma_start_outgoing_migration(void *opaque,
> goto err;
> }
>
> - ret = qemu_rdma_source_init(rdma,
> - s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
> + ret = qemu_rdma_source_init(rdma,migrate_rdma_pin_all(), errp);
Missing a space after the comma here.
>
> if (ret) {
> goto err;
> @@ -4201,7 +4201,7 @@ void rdma_start_outgoing_migration(void *opaque,
> }
>
> ret = qemu_rdma_source_init(rdma_return_path,
> - s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
> + migrate_rdma_pin_all(), errp);
>
> if (ret) {
> goto return_path_err;
