Re: [Qemu-devel] [PATCH v5 04/17] migration: Add multifd capability

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
> Reviewed-by: Dr. David Alan Gilbert <address@hidden>

Note you need to update this;  you need to add the
DEFINE_PROP_MIG_CAP in migration_properties[]

Dave

> ---
>  migration/migration.c | 9 +++++++++
>  migration/migration.h | 1 +
>  qapi-schema.json      | 4 ++--
>  3 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c24ad03..af2630b 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1282,6 +1282,15 @@ bool migrate_use_events(void)
>      return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS];
>  }
>  
> +bool migrate_use_multifd(void)
> +{
> +    MigrationState *s;
> +
> +    s = migrate_get_current();
> +
> +    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD];
> +}
> +
>  int migrate_use_xbzrle(void)
>  {
>      MigrationState *s;
> diff --git a/migration/migration.h b/migration/migration.h
> index 5a18aea..9da9b4e 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -172,6 +172,7 @@ bool migrate_postcopy_ram(void);
>  bool migrate_zero_blocks(void);
>  
>  bool migrate_auto_converge(void);
> +bool migrate_use_multifd(void);
>  
>  int migrate_use_xbzrle(void);
>  int64_t migrate_xbzrle_cache_size(void);
> diff --git a/qapi-schema.json b/qapi-schema.json
> index ab438ea..2457fb0 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -902,14 +902,14 @@
>  #
>  # @return-path: If enabled, migration will use the return path even
>  #               for precopy. (since 2.10)
> +# @x-multifd: Use more than one fd for migration (since 2.10)
>  #
>  # Since: 1.2
>  ##
>  { 'enum': 'MigrationCapability',
>    'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',
>             'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram',
> -           'block', 'return-path' ] }
> -
> +           'block', 'return-path', 'x-multifd'] }
>  ##
>  # @MigrationCapabilityStatus:
>  #
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK