diff options
| -rw-r--r-- | hmp.c | 4 | ||||
| -rw-r--r-- | migration/migration.c | 66 | ||||
| -rw-r--r-- | qapi-schema.json | 85 |
3 files changed, 140 insertions, 15 deletions
@@ -1556,7 +1556,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) const char *param = qdict_get_str(qdict, "parameter"); const char *valuestr = qdict_get_str(qdict, "value"); Visitor *v = string_input_visitor_new(valuestr); - MigrationParameters *p = g_new0(MigrationParameters, 1); + MigrateSetParameters *p = g_new0(MigrateSetParameters, 1); uint64_t valuebw = 0; Error *err = NULL; int i, ret; @@ -1634,7 +1634,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) } cleanup: - qapi_free_MigrationParameters(p); + qapi_free_MigrateSetParameters(p); visit_free(v); if (err) { error_report_err(err); diff --git a/migration/migration.c b/migration/migration.c index 6b4d17fbb5..205b801b70 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -742,7 +742,59 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp) return true; } -static void migrate_params_apply(MigrationParameters *params) +static void migrate_params_test_apply(MigrateSetParameters *params, + MigrationParameters *dest) +{ + *dest = migrate_get_current()->parameters; + + /* TODO use QAPI_CLONE() instead of duplicating it inline */ + + if (params->has_compress_level) { + dest->compress_level = params->compress_level; + } + + if (params->has_compress_threads) { + dest->compress_threads = params->compress_threads; + } + + if (params->has_decompress_threads) { + dest->decompress_threads = params->decompress_threads; + } + + if (params->has_cpu_throttle_initial) { + dest->cpu_throttle_initial = params->cpu_throttle_initial; + } + + if (params->has_cpu_throttle_increment) { + dest->cpu_throttle_increment = params->cpu_throttle_increment; + } + + if (params->has_tls_creds) { + dest->tls_creds = g_strdup(params->tls_creds); + } + + if (params->has_tls_hostname) { + dest->tls_hostname = g_strdup(params->tls_hostname); + } + + if (params->has_max_bandwidth) { + dest->max_bandwidth = params->max_bandwidth; + } + + if (params->has_downtime_limit) { + dest->downtime_limit = params->downtime_limit; + } + + if (params->has_x_checkpoint_delay) { + dest->x_checkpoint_delay = params->x_checkpoint_delay; + } + + if (params->has_block_incremental) { + dest->block_incremental = params->block_incremental; + } +} + +static void migrate_params_apply(MigrateSetParameters *params) { MigrationState *s = migrate_get_current(); @@ -802,9 +854,13 @@ static void migrate_params_apply(MigrationParameters *params) } } -void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp) +void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) { - if (!migrate_params_check(params, errp)) { + MigrationParameters tmp; + + migrate_params_test_apply(params, &tmp); + + if (!migrate_params_check(&tmp, errp)) { /* Invalid parameter */ return; } @@ -1240,7 +1296,7 @@ int64_t qmp_query_migrate_cache_size(Error **errp) void qmp_migrate_set_speed(int64_t value, Error **errp) { - MigrationParameters p = { + MigrateSetParameters p = { .has_max_bandwidth = true, .max_bandwidth = value, }; @@ -1260,7 +1316,7 @@ void qmp_migrate_set_downtime(double value, Error **errp) value *= 1000; /* Convert to milliseconds */ value = MAX(0, MIN(INT64_MAX, value)); - MigrationParameters p = { + MigrateSetParameters p = { .has_downtime_limit = true, .downtime_limit = value, }; diff --git a/qapi-schema.json b/qapi-schema.json index a9c2f052a6..70c35412df 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1035,6 +1035,77 @@ 'downtime-limit', 'x-checkpoint-delay', 'block-incremental' ] } ## +# @MigrateSetParameters: +# +# @compress-level: compression level +# +# @compress-threads: compression thread count +# +# @decompress-threads: decompression thread count +# +# @cpu-throttle-initial: Initial percentage of time guest cpus are +# throttled when migration auto-converge is activated. +# The default value is 20. (Since 2.7) +# +# @cpu-throttle-increment: throttle percentage increase each time +# auto-converge detects that migration is not making +# progress. The default value is 10. (Since 2.7) +# +# @tls-creds: ID of the 'tls-creds' object that provides credentials +# for establishing a TLS connection over the migration data +# channel. On the outgoing side of the migration, the credentials +# must be for a 'client' endpoint, while for the incoming side the +# credentials must be for a 'server' endpoint. Setting this +# to a non-empty string enables TLS for all migrations. +# An empty string means that QEMU will use plain text mode for +# migration, rather than TLS (Since 2.9) +# Previously (since 2.7), this was reported by omitting +# tls-creds instead. +# +# @tls-hostname: hostname of the target host for the migration. This +# is required when using x509 based TLS credentials and the +# migration URI does not already include a hostname. For +# example if using fd: or exec: based migration, the +# hostname must be provided so that the server's x509 +# certificate identity can be validated. (Since 2.7) +# An empty string means that QEMU will use the hostname +# associated with the migration URI, if any. (Since 2.9) +# Previously (since 2.7), this was reported by omitting +# tls-hostname instead. +# +# @max-bandwidth: to set maximum speed for migration. maximum speed in +# bytes per second. (Since 2.8) +# +# @downtime-limit: set maximum tolerated downtime for migration. maximum +# downtime in milliseconds (Since 2.8) +# +# @x-checkpoint-delay: the delay time between two COLO checkpoints. (Since 2.8) +# +# @block-incremental: Affects how much storage is migrated when the +# block migration capability is enabled. When false, the entire +# storage backing chain is migrated into a flattened image at +# the destination; when true, only the active qcow2 layer is +# migrated and the destination must already have access to the +# same backing chain as was used on the source. (since 2.10) +# +# Since: 2.4 +## +# TODO either fuse back into MigrationParameters, or make +# MigrationParameters members mandatory +{ 'struct': 'MigrateSetParameters', + 'data': { '*compress-level': 'int', + '*compress-threads': 'int', + '*decompress-threads': 'int', + '*cpu-throttle-initial': 'int', + '*cpu-throttle-increment': 'int', + '*tls-creds': 'str', + '*tls-hostname': 'str', + '*max-bandwidth': 'int', + '*downtime-limit': 'int', + '*x-checkpoint-delay': 'int', + '*block-incremental': 'bool' } } + +## # @migrate-set-parameters: # # Set various migration parameters. @@ -1048,13 +1119,12 @@ # ## { 'command': 'migrate-set-parameters', 'boxed': true, - 'data': 'MigrationParameters' } + 'data': 'MigrateSetParameters' } ## # @MigrationParameters: # -# Optional members can be omitted on input ('migrate-set-parameters') -# but members will always be present on output. +# The optional members aren't actually optional. # # @compress-level: compression level # @@ -1063,19 +1133,18 @@ # @decompress-threads: decompression thread count # # @cpu-throttle-initial: Initial percentage of time guest cpus are -# throttledwhen migration auto-converge is activated. -# The default value is 20. (Since 2.7) +# throttled when migration auto-converge is activated. +# (Since 2.7) # # @cpu-throttle-increment: throttle percentage increase each time # auto-converge detects that migration is not making -# progress. The default value is 10. (Since 2.7) +# progress. (Since 2.7) # # @tls-creds: ID of the 'tls-creds' object that provides credentials # for establishing a TLS connection over the migration data # channel. On the outgoing side of the migration, the credentials # must be for a 'client' endpoint, while for the incoming side the -# credentials must be for a 'server' endpoint. Setting this -# to a non-empty string enables TLS for all migrations. +# credentials must be for a 'server' endpoint. # An empty string means that QEMU will use plain text mode for # migration, rather than TLS (Since 2.7) # Note: 2.8 reports this by omitting tls-creds instead. |