* Juan Quintela (quint...@redhat.com) wrote:
> We make it supported from now on.
>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> hmp.c | 10 +++++-----
> migration/migration.c | 26 +++++++++++++-------------
> qapi/migration.json | 34 +++++++++++++++++-----------------
> 3 files changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 73b8443a8e..0cafce9713 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -424,8 +424,8 @@ void hmp_info_migrate_parameters(Monitor *mon, const
> QDict *qdict)
> MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL),
> params->block_incremental ? "on" : "off");
> monitor_printf(mon, "%s: %u\n",
> - MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_CHANNELS),
> - params->x_multifd_channels);
> + MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS),
> + params->multifd_channels);
> monitor_printf(mon, "%s: %" PRIu64 "\n",
> MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
> params->xbzrle_cache_size);
> @@ -1769,9 +1769,9 @@ void hmp_migrate_set_parameter(Monitor *mon, const
> QDict *qdict)
> p->has_block_incremental = true;
> visit_type_bool(v, param, &p->block_incremental, &err);
> break;
> - case MIGRATION_PARAMETER_X_MULTIFD_CHANNELS:
> - p->has_x_multifd_channels = true;
> - visit_type_int(v, param, &p->x_multifd_channels, &err);
> + case MIGRATION_PARAMETER_MULTIFD_CHANNELS:
> + p->has_multifd_channels = true;
> + visit_type_int(v, param, &p->multifd_channels, &err);
> break;
> case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
> p->has_xbzrle_cache_size = true;
> diff --git a/migration/migration.c b/migration/migration.c
> index 65df9b566e..c7dbc44562 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -746,8 +746,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error
> **errp)
> params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
> params->has_block_incremental = true;
> params->block_incremental = s->parameters.block_incremental;
> - params->has_x_multifd_channels = true;
> - params->x_multifd_channels = s->parameters.x_multifd_channels;
> + params->has_multifd_channels = true;
> + params->multifd_channels = s->parameters.multifd_channels;
> params->has_xbzrle_cache_size = true;
> params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
> params->has_max_postcopy_bandwidth = true;
> @@ -1103,7 +1103,7 @@ static bool migrate_params_check(MigrationParameters
> *params, Error **errp)
>
> /* x_checkpoint_delay is now always positive */
>
> - if (params->has_x_multifd_channels && (params->x_multifd_channels < 1)) {
> + if (params->has_multifd_channels && (params->multifd_channels < 1)) {
> error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
> "multifd_channels",
> "is invalid, it should be in the range of 1 to 255");
> @@ -1188,8 +1188,8 @@ static void
> migrate_params_test_apply(MigrateSetParameters *params,
> if (params->has_block_incremental) {
> dest->block_incremental = params->block_incremental;
> }
> - if (params->has_x_multifd_channels) {
> - dest->x_multifd_channels = params->x_multifd_channels;
> + if (params->has_multifd_channels) {
> + dest->multifd_channels = params->multifd_channels;
> }
> if (params->has_xbzrle_cache_size) {
> dest->xbzrle_cache_size = params->xbzrle_cache_size;
> @@ -1266,8 +1266,8 @@ static void migrate_params_apply(MigrateSetParameters
> *params, Error **errp)
> if (params->has_block_incremental) {
> s->parameters.block_incremental = params->block_incremental;
> }
> - if (params->has_x_multifd_channels) {
> - s->parameters.x_multifd_channels = params->x_multifd_channels;
> + if (params->has_multifd_channels) {
> + s->parameters.multifd_channels = params->multifd_channels;
> }
> if (params->has_xbzrle_cache_size) {
> s->parameters.xbzrle_cache_size = params->xbzrle_cache_size;
> @@ -2005,7 +2005,7 @@ bool migrate_use_multifd(void)
>
> s = migrate_get_current();
>
> - return s->enabled_capabilities[MIGRATION_CAPABILITY_X_MULTIFD];
> + return s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIFD];
> }
>
> bool migrate_pause_before_switchover(void)
> @@ -2024,7 +2024,7 @@ int migrate_multifd_channels(void)
>
> s = migrate_get_current();
>
> - return s->parameters.x_multifd_channels;
> + return s->parameters.multifd_channels;
> }
>
> int migrate_use_xbzrle(void)
> @@ -3257,8 +3257,8 @@ static Property migration_properties[] = {
> DEFINE_PROP_UINT32("x-checkpoint-delay", MigrationState,
> parameters.x_checkpoint_delay,
> DEFAULT_MIGRATE_X_CHECKPOINT_DELAY),
> - DEFINE_PROP_UINT8("x-multifd-channels", MigrationState,
> - parameters.x_multifd_channels,
> + DEFINE_PROP_UINT8("multifd-channels", MigrationState,
> + parameters.multifd_channels,
> DEFAULT_MIGRATE_MULTIFD_CHANNELS),
> DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
> parameters.xbzrle_cache_size,
> @@ -3282,7 +3282,7 @@ static Property migration_properties[] = {
> DEFINE_PROP_MIG_CAP("x-release-ram", MIGRATION_CAPABILITY_RELEASE_RAM),
> DEFINE_PROP_MIG_CAP("x-block", MIGRATION_CAPABILITY_BLOCK),
> DEFINE_PROP_MIG_CAP("x-return-path", MIGRATION_CAPABILITY_RETURN_PATH),
> - DEFINE_PROP_MIG_CAP("x-multifd", MIGRATION_CAPABILITY_X_MULTIFD),
> + DEFINE_PROP_MIG_CAP("x-multifd", MIGRATION_CAPABILITY_MULTIFD),
>
> DEFINE_PROP_END_OF_LIST(),
> };
> @@ -3336,7 +3336,7 @@ static void migration_instance_init(Object *obj)
> params->has_downtime_limit = true;
> params->has_x_checkpoint_delay = true;
> params->has_block_incremental = true;
> - params->has_x_multifd_channels = true;
> + params->has_multifd_channels = true;
> params->has_xbzrle_cache_size = true;
> params->has_max_postcopy_bandwidth = true;
> params->has_max_cpu_throttle = true;
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 8c5db60406..c202703889 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -401,7 +401,7 @@
> # @pause-before-switchover: Pause outgoing migration before serialising
> device
> # state and before disabling block IO (since 2.11)
> #
> -# @x-multifd: Use more than one fd for migration (since 2.11)
> +# @multifd: Use more than one fd for migration (since 4.0)
> #
> # @dirty-bitmaps: If enabled, QEMU will migrate named dirty bitmaps.
> # (since 2.12)
> @@ -418,7 +418,7 @@
> { 'enum': 'MigrationCapability',
> 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',
> 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram',
> - 'block', 'return-path', 'pause-before-switchover', 'x-multifd',
> + 'block', 'return-path', 'pause-before-switchover', 'multifd',
> 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate' ] }
>
> ##
> @@ -542,10 +542,10 @@
> # migrated and the destination must already have access to the
> # same backing chain as was used on the source. (since 2.10)
> #
> -# @x-multifd-channels: Number of channels used to migrate data in
> -# parallel. This is the same number that the
> -# number of sockets used for migration. The
> -# default value is 2 (since 2.11)
> +# @multifd-channels: Number of channels used to migrate data in
> +# parallel. This is the same number that the
> +# number of sockets used for migration. The
> +# default value is 2 (since 4.0)
> #
> # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
> # needs to be a multiple of the target page size
> @@ -566,7 +566,7 @@
> 'cpu-throttle-initial', 'cpu-throttle-increment',
> 'tls-creds', 'tls-hostname', 'max-bandwidth',
> 'downtime-limit', 'x-checkpoint-delay', 'block-incremental',
> - 'x-multifd-channels',
> + 'multifd-channels',
> 'xbzrle-cache-size', 'max-postcopy-bandwidth',
> 'max-cpu-throttle' ] }
>
> @@ -629,10 +629,10 @@
> # migrated and the destination must already have access to the
> # same backing chain as was used on the source. (since 2.10)
> #
> -# @x-multifd-channels: Number of channels used to migrate data in
> -# parallel. This is the same number that the
> -# number of sockets used for migration. The
> -# default value is 2 (since 2.11)
> +# @multifd-channels: Number of channels used to migrate data in
> +# parallel. This is the same number that the
> +# number of sockets used for migration. The
> +# default value is 2 (since 4.0)
> #
> # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
> # needs to be a multiple of the target page size
> @@ -663,7 +663,7 @@
> '*downtime-limit': 'int',
> '*x-checkpoint-delay': 'int',
> '*block-incremental': 'bool',
> - '*x-multifd-channels': 'int',
> + '*multifd-channels': 'int',
> '*xbzrle-cache-size': 'size',
> '*max-postcopy-bandwidth': 'size',
> '*max-cpu-throttle': 'int' } }
> @@ -742,10 +742,10 @@
> # migrated and the destination must already have access to the
> # same backing chain as was used on the source. (since 2.10)
> #
> -# @x-multifd-channels: Number of channels used to migrate data in
> -# parallel. This is the same number that the
> -# number of sockets used for migration.
> -# The default value is 2 (since 2.11)
> +# @multifd-channels: Number of channels used to migrate data in
> +# parallel. This is the same number that the
> +# number of sockets used for migration.
> +# The default value is 2 (since 4.0)
> #
> # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
> # needs to be a multiple of the target page size
> @@ -775,7 +775,7 @@
> '*downtime-limit': 'uint64',
> '*x-checkpoint-delay': 'uint32',
> '*block-incremental': 'bool' ,
> - '*x-multifd-channels': 'uint8',
> + '*multifd-channels': 'uint8',
> '*xbzrle-cache-size': 'size',
> '*max-postcopy-bandwidth': 'size',
> '*max-cpu-throttle':'uint8'} }
> --
> 2.20.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
