OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

multifd: Drop x- 

We make it supported from now on.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2019-02-06 13:54:06 +01:00
parent 5fbd8b4bbb
commit cbfd6c957a
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hmp.c
View File

@ -433,8 +433,8 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL), MigrationParameter_str(MIGRATION_PARAMETER_BLOCK_INCREMENTAL),
params->block_incremental ? "on" : "off"); params->block_incremental ? "on" : "off");
monitor_printf(mon, "%s: %u\n", monitor_printf(mon, "%s: %u\n",
MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_CHANNELS), MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS),
params->x_multifd_channels); params->multifd_channels);
monitor_printf(mon, "%s: %" PRIu64 "\n", monitor_printf(mon, "%s: %" PRIu64 "\n",
MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
params->xbzrle_cache_size); params->xbzrle_cache_size);
@ -1809,9 +1809,9 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
p->has_block_incremental = true; p->has_block_incremental = true;
visit_type_bool(v, param, &p->block_incremental, &err); visit_type_bool(v, param, &p->block_incremental, &err);
break; break;
case MIGRATION_PARAMETER_X_MULTIFD_CHANNELS: case MIGRATION_PARAMETER_MULTIFD_CHANNELS:
p->has_x_multifd_channels = true; p->has_multifd_channels = true;
visit_type_int(v, param, &p->x_multifd_channels, &err); visit_type_int(v, param, &p->multifd_channels, &err);
break; break;
case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE: case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
p->has_xbzrle_cache_size = true; p->has_xbzrle_cache_size = true;

26
migration/migration.c
View File

@ -765,8 +765,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
params->x_checkpoint_delay = s->parameters.x_checkpoint_delay; params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
params->has_block_incremental = true; params->has_block_incremental = true;
params->block_incremental = s->parameters.block_incremental; params->block_incremental = s->parameters.block_incremental;
params->has_x_multifd_channels = true; params->has_multifd_channels = true;
params->x_multifd_channels = s->parameters.x_multifd_channels; params->multifd_channels = s->parameters.multifd_channels;
params->has_xbzrle_cache_size = true; params->has_xbzrle_cache_size = true;
params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
params->has_max_postcopy_bandwidth = true; params->has_max_postcopy_bandwidth = true;
@ -1149,7 +1149,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
/* x_checkpoint_delay is now always positive */ /* 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, error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"multifd_channels", "multifd_channels",
"is invalid, it should be in the range of 1 to 255"); "is invalid, it should be in the range of 1 to 255");
@ -1263,8 +1263,8 @@ static void migrate_params_test_apply(MigrateSetParameters *params,
if (params->has_block_incremental) { if (params->has_block_incremental) {
dest->block_incremental = params->block_incremental; dest->block_incremental = params->block_incremental;
} }
if (params->has_x_multifd_channels) { if (params->has_multifd_channels) {
dest->x_multifd_channels = params->x_multifd_channels; dest->multifd_channels = params->multifd_channels;
} }
if (params->has_xbzrle_cache_size) { if (params->has_xbzrle_cache_size) {
dest->xbzrle_cache_size = params->xbzrle_cache_size; dest->xbzrle_cache_size = params->xbzrle_cache_size;
@ -1353,8 +1353,8 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
if (params->has_block_incremental) { if (params->has_block_incremental) {
s->parameters.block_incremental = params->block_incremental; s->parameters.block_incremental = params->block_incremental;
} }
if (params->has_x_multifd_channels) { if (params->has_multifd_channels) {
s->parameters.x_multifd_channels = params->x_multifd_channels; s->parameters.multifd_channels = params->multifd_channels;
} }
if (params->has_xbzrle_cache_size) { if (params->has_xbzrle_cache_size) {
s->parameters.xbzrle_cache_size = params->xbzrle_cache_size; s->parameters.xbzrle_cache_size = params->xbzrle_cache_size;
@ -2113,7 +2113,7 @@ bool migrate_use_multifd(void)
s = migrate_get_current(); 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) bool migrate_pause_before_switchover(void)
@ -2132,7 +2132,7 @@ int migrate_multifd_channels(void)
s = migrate_get_current(); s = migrate_get_current();
return s->parameters.x_multifd_channels; return s->parameters.multifd_channels;
} }
int migrate_use_xbzrle(void) int migrate_use_xbzrle(void)
@ -3374,8 +3374,8 @@ static Property migration_properties[] = {
DEFINE_PROP_UINT32("x-checkpoint-delay", MigrationState, DEFINE_PROP_UINT32("x-checkpoint-delay", MigrationState,
parameters.x_checkpoint_delay, parameters.x_checkpoint_delay,
DEFAULT_MIGRATE_X_CHECKPOINT_DELAY), DEFAULT_MIGRATE_X_CHECKPOINT_DELAY),
DEFINE_PROP_UINT8("x-multifd-channels", MigrationState, DEFINE_PROP_UINT8("multifd-channels", MigrationState,
parameters.x_multifd_channels, parameters.multifd_channels,
DEFAULT_MIGRATE_MULTIFD_CHANNELS), DEFAULT_MIGRATE_MULTIFD_CHANNELS),
DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState, DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
parameters.xbzrle_cache_size, parameters.xbzrle_cache_size,
@ -3411,7 +3411,7 @@ static Property migration_properties[] = {
DEFINE_PROP_MIG_CAP("x-release-ram", MIGRATION_CAPABILITY_RELEASE_RAM), 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-block", MIGRATION_CAPABILITY_BLOCK),
DEFINE_PROP_MIG_CAP("x-return-path", MIGRATION_CAPABILITY_RETURN_PATH), 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(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -3465,7 +3465,7 @@ static void migration_instance_init(Object *obj)
params->has_downtime_limit = true; params->has_downtime_limit = true;
params->has_x_checkpoint_delay = true; params->has_x_checkpoint_delay = true;
params->has_block_incremental = 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_xbzrle_cache_size = true;
params->has_max_postcopy_bandwidth = true; params->has_max_postcopy_bandwidth = true;
params->has_max_cpu_throttle = true; params->has_max_cpu_throttle = true;

22
qapi/migration.json
View File

@ -401,7 +401,7 @@
# @pause-before-switchover: Pause outgoing migration before serialising device # @pause-before-switchover: Pause outgoing migration before serialising device
# state and before disabling block IO (since 2.11) # 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. # @dirty-bitmaps: If enabled, QEMU will migrate named dirty bitmaps.
# (since 2.12) # (since 2.12)
@ -420,7 +420,7 @@
{ 'enum': 'MigrationCapability', { 'enum': 'MigrationCapability',
'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',
'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', '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', 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate',
'x-ignore-shared' ] } 'x-ignore-shared' ] }
@ -557,10 +557,10 @@
# migrated and the destination must already have access to the # migrated and the destination must already have access to the
# same backing chain as was used on the source. (since 2.10) # same backing chain as was used on the source. (since 2.10)
# #
# @x-multifd-channels: Number of channels used to migrate data in # @multifd-channels: Number of channels used to migrate data in
# parallel. This is the same number that the # parallel. This is the same number that the
# number of sockets used for migration. The # number of sockets used for migration. The
# default value is 2 (since 2.11) # default value is 2 (since 4.0)
# #
# @xbzrle-cache-size: cache size to be used by XBZRLE migration. It # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
# needs to be a multiple of the target page size # needs to be a multiple of the target page size
@ -584,7 +584,7 @@
'cpu-throttle-initial', 'cpu-throttle-increment', 'cpu-throttle-initial', 'cpu-throttle-increment',
'tls-creds', 'tls-hostname', 'max-bandwidth', 'tls-creds', 'tls-hostname', 'max-bandwidth',
'downtime-limit', 'x-checkpoint-delay', 'block-incremental', 'downtime-limit', 'x-checkpoint-delay', 'block-incremental',
'x-multifd-channels', 'multifd-channels',
'xbzrle-cache-size', 'max-postcopy-bandwidth', 'xbzrle-cache-size', 'max-postcopy-bandwidth',
'max-cpu-throttle' ] } 'max-cpu-throttle' ] }
@ -659,10 +659,10 @@
# migrated and the destination must already have access to the # migrated and the destination must already have access to the
# same backing chain as was used on the source. (since 2.10) # same backing chain as was used on the source. (since 2.10)
# #
# @x-multifd-channels: Number of channels used to migrate data in # @multifd-channels: Number of channels used to migrate data in
# parallel. This is the same number that the # parallel. This is the same number that the
# number of sockets used for migration. The # number of sockets used for migration. The
# default value is 2 (since 2.11) # default value is 2 (since 4.0)
# #
# @xbzrle-cache-size: cache size to be used by XBZRLE migration. It # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
# needs to be a multiple of the target page size # needs to be a multiple of the target page size
@ -697,7 +697,7 @@
'*downtime-limit': 'int', '*downtime-limit': 'int',
'*x-checkpoint-delay': 'int', '*x-checkpoint-delay': 'int',
'*block-incremental': 'bool', '*block-incremental': 'bool',
'*x-multifd-channels': 'int', '*multifd-channels': 'int',
'*xbzrle-cache-size': 'size', '*xbzrle-cache-size': 'size',
'*max-postcopy-bandwidth': 'size', '*max-postcopy-bandwidth': 'size',
'*max-cpu-throttle': 'int' } } '*max-cpu-throttle': 'int' } }
@ -788,10 +788,10 @@
# migrated and the destination must already have access to the # migrated and the destination must already have access to the
# same backing chain as was used on the source. (since 2.10) # same backing chain as was used on the source. (since 2.10)
# #
# @x-multifd-channels: Number of channels used to migrate data in # @multifd-channels: Number of channels used to migrate data in
# parallel. This is the same number that the # parallel. This is the same number that the
# number of sockets used for migration. # number of sockets used for migration.
# The default value is 2 (since 2.11) # The default value is 2 (since 4.0)
# #
# @xbzrle-cache-size: cache size to be used by XBZRLE migration. It # @xbzrle-cache-size: cache size to be used by XBZRLE migration. It
# needs to be a multiple of the target page size # needs to be a multiple of the target page size
@ -825,7 +825,7 @@
'*downtime-limit': 'uint64', '*downtime-limit': 'uint64',
'*x-checkpoint-delay': 'uint32', '*x-checkpoint-delay': 'uint32',
'*block-incremental': 'bool' , '*block-incremental': 'bool' ,
'*x-multifd-channels': 'uint8', '*multifd-channels': 'uint8',
'*xbzrle-cache-size': 'size', '*xbzrle-cache-size': 'size',
'*max-postcopy-bandwidth': 'size', '*max-postcopy-bandwidth': 'size',
'*max-cpu-throttle':'uint8'} } '*max-cpu-throttle':'uint8'} }