* Juan Quintela (quint...@redhat.com) wrote: > Signed-off-by: Juan Quintela <quint...@redhat.com> > > --- > Rename it to NONE > Fix typos (dave) > We don't need to chek values returned by visit_type_MultifdCompress (markus) > Fix yet more typos (wei) > --- > hw/core/qdev-properties.c | 13 +++++++++++++ > include/hw/qdev-properties.h | 3 +++ > migration/migration.c | 13 +++++++++++++ > monitor/hmp-cmds.c | 13 +++++++++++++ > qapi/migration.json | 30 +++++++++++++++++++++++++++--- > tests/migration-test.c | 13 ++++++++++--- > 6 files changed, 79 insertions(+), 6 deletions(-) > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index ac28890e5a..644705235e 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -8,6 +8,7 @@ > #include "qapi/qmp/qerror.h" > #include "qemu/ctype.h" > #include "qemu/error-report.h" > +#include "qapi/qapi-types-migration.h" > #include "hw/block/block.h" > #include "net/hub.h" > #include "qapi/visitor.h" > @@ -648,6 +649,18 @@ const PropertyInfo qdev_prop_fdc_drive_type = { > .set_default_value = set_default_value_enum, > }; > > +/* --- MultifdCompress --- */ > + > +const PropertyInfo qdev_prop_multifd_compress = { > + .name = "MultifdCompress", > + .description = "multifd_compress values, " > + "none", > + .enum_table = &MultifdCompress_lookup, > + .get = get_enum, > + .set = set_enum, > + .set_default_value = set_default_value_enum, > +}; > + > /* --- pci address --- */ > > /* > diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h > index c6a8cb5516..07d7bba682 100644 > --- a/include/hw/qdev-properties.h > +++ b/include/hw/qdev-properties.h > @@ -21,6 +21,7 @@ extern const PropertyInfo qdev_prop_tpm; > extern const PropertyInfo qdev_prop_ptr; > extern const PropertyInfo qdev_prop_macaddr; > extern const PropertyInfo qdev_prop_on_off_auto; > +extern const PropertyInfo qdev_prop_multifd_compress; > extern const PropertyInfo qdev_prop_losttickpolicy; > extern const PropertyInfo qdev_prop_blockdev_on_error; > extern const PropertyInfo qdev_prop_bios_chs_trans; > @@ -204,6 +205,8 @@ extern const PropertyInfo qdev_prop_pcie_link_width; > DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr) > #define DEFINE_PROP_ON_OFF_AUTO(_n, _s, _f, _d) \ > DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_on_off_auto, OnOffAuto) > +#define DEFINE_PROP_MULTIFD_COMPRESS(_n, _s, _f, _d) \ > + DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_multifd_compress, > MultifdCompress) > #define DEFINE_PROP_LOSTTICKPOLICY(_n, _s, _f, _d) \ > DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_losttickpolicy, \ > LostTickPolicy) > diff --git a/migration/migration.c b/migration/migration.c > index cf6cec5fb6..93c6ed10a6 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -87,6 +87,7 @@ > /* The delay time (in ms) between two COLO checkpoints */ > #define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100) > #define DEFAULT_MIGRATE_MULTIFD_CHANNELS 16 > +#define DEFAULT_MIGRATE_MULTIFD_COMPRESS MULTIFD_COMPRESS_NONE > > /* Background transfer rate for postcopy, 0 means unlimited, note > * that page requests can still exceed this limit. > @@ -774,6 +775,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error > **errp) > params->block_incremental = s->parameters.block_incremental; > params->has_multifd_channels = true; > params->multifd_channels = s->parameters.multifd_channels; > + params->has_multifd_compress = true; > + params->multifd_compress = s->parameters.multifd_compress; > params->has_xbzrle_cache_size = true; > params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; > params->has_max_postcopy_bandwidth = true; > @@ -1281,6 +1284,9 @@ static void > migrate_params_test_apply(MigrateSetParameters *params, > if (params->has_multifd_channels) { > dest->multifd_channels = params->multifd_channels; > } > + if (params->has_multifd_compress) { > + dest->multifd_compress = params->multifd_compress; > + } > if (params->has_xbzrle_cache_size) { > dest->xbzrle_cache_size = params->xbzrle_cache_size; > } > @@ -1377,6 +1383,9 @@ static void migrate_params_apply(MigrateSetParameters > *params, Error **errp) > if (params->has_multifd_channels) { > s->parameters.multifd_channels = params->multifd_channels; > } > + if (params->has_multifd_compress) { > + s->parameters.multifd_compress = params->multifd_compress; > + } > if (params->has_xbzrle_cache_size) { > s->parameters.xbzrle_cache_size = params->xbzrle_cache_size; > xbzrle_cache_resize(params->xbzrle_cache_size, errp); > @@ -3474,6 +3483,9 @@ static Property migration_properties[] = { > DEFINE_PROP_UINT8("multifd-channels", MigrationState, > parameters.multifd_channels, > DEFAULT_MIGRATE_MULTIFD_CHANNELS), > + DEFINE_PROP_MULTIFD_COMPRESS("multifd-compress", MigrationState, > + parameters.multifd_compress, > + DEFAULT_MIGRATE_MULTIFD_COMPRESS), > DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState, > parameters.xbzrle_cache_size, > DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE), > @@ -3564,6 +3576,7 @@ static void migration_instance_init(Object *obj) > params->has_x_checkpoint_delay = true; > params->has_block_incremental = true; > params->has_multifd_channels = true; > + params->has_multifd_compress = true; > params->has_xbzrle_cache_size = true; > params->has_max_postcopy_bandwidth = true; > params->has_max_cpu_throttle = true; > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index b2551c16d1..caf06b0668 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -39,6 +39,7 @@ > #include "qapi/qapi-commands-tpm.h" > #include "qapi/qapi-commands-ui.h" > #include "qapi/qapi-visit-net.h" > +#include "qapi/qapi-visit-migration.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qerror.h" > #include "qapi/string-input-visitor.h" > @@ -448,6 +449,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const > QDict *qdict) > monitor_printf(mon, "%s: %u\n", > MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS), > params->multifd_channels); > + monitor_printf(mon, "%s: %s\n", > + MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESS), > + MultifdCompress_str(params->multifd_compress)); > monitor_printf(mon, "%s: %" PRIu64 "\n", > MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), > params->xbzrle_cache_size); > @@ -1739,6 +1743,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const > QDict *qdict) > MigrateSetParameters *p = g_new0(MigrateSetParameters, 1); > uint64_t valuebw = 0; > uint64_t cache_size; > + MultifdCompress compress_type; > Error *err = NULL; > int val, ret; > > @@ -1824,6 +1829,14 @@ void hmp_migrate_set_parameter(Monitor *mon, const > QDict *qdict) > p->has_multifd_channels = true; > visit_type_int(v, param, &p->multifd_channels, &err); > break; > + case MIGRATION_PARAMETER_MULTIFD_COMPRESS: > + p->has_multifd_compress = true; > + visit_type_MultifdCompress(v, param, &compress_type, &err); > + if (err) { > + break; > + } > + p->multifd_compress = compress_type; > + break; > case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE: > p->has_xbzrle_cache_size = true; > visit_type_size(v, param, &cache_size, &err); > diff --git a/qapi/migration.json b/qapi/migration.json > index b7348d0c8b..430a39382e 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -488,6 +488,19 @@ > ## > { 'command': 'query-migrate-capabilities', 'returns': > ['MigrationCapabilityStatus']} > > +## > +# @MultifdCompress: > +# > +# An enumeration of multifd compression. > +# > +# @none: no compression. > +# > +# Since: 4.1 > +# > +## > +{ 'enum': 'MultifdCompress', > + 'data': [ 'none' ] } > + > ## > # @MigrationParameter: > # > @@ -586,6 +599,9 @@ > # @max-cpu-throttle: maximum cpu throttle percentage. > # Defaults to 99. (Since 3.1) > # > +# @multifd-compress: Which compression method to use. > +# Defaults to none. (Since 4.1) > +#
5.0 I guess! > # Since: 2.4 > ## > { 'enum': 'MigrationParameter', > @@ -598,7 +614,7 @@ > 'downtime-limit', 'x-checkpoint-delay', 'block-incremental', > 'multifd-channels', > 'xbzrle-cache-size', 'max-postcopy-bandwidth', > - 'max-cpu-throttle' ] } > + 'max-cpu-throttle', 'multifd-compress' ] } > > ## > # @MigrateSetParameters: > @@ -688,6 +704,9 @@ > # @max-cpu-throttle: maximum cpu throttle percentage. > # The default value is 99. (Since 3.1) > # > +# @multifd-compress: Which compression method to use. > +# Defaults to none. (Since 4.1) > +# > # Since: 2.4 > ## > # TODO either fuse back into MigrationParameters, or make > @@ -713,7 +732,8 @@ > '*multifd-channels': 'int', > '*xbzrle-cache-size': 'size', > '*max-postcopy-bandwidth': 'size', > - '*max-cpu-throttle': 'int' } } > + '*max-cpu-throttle': 'int', > + '*multifd-compress': 'MultifdCompress' } } > > ## > # @migrate-set-parameters: > @@ -823,6 +843,9 @@ > # Defaults to 99. > # (Since 3.1) > # > +# @multifd-compress: Which compression method to use. > +# Defaults to none. (Since 4.1) > +# > # Since: 2.4 > ## > { 'struct': 'MigrationParameters', > @@ -846,7 +869,8 @@ > '*multifd-channels': 'uint8', > '*xbzrle-cache-size': 'size', > '*max-postcopy-bandwidth': 'size', > - '*max-cpu-throttle':'uint8'} } > + '*max-cpu-throttle': 'uint8', > + '*multifd-compress': 'MultifdCompress' } } > > ## > # @query-migrate-parameters: > diff --git a/tests/migration-test.c b/tests/migration-test.c > index fc221f172a..e5b6e54cfa 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -482,7 +482,6 @@ static void migrate_check_parameter_str(QTestState *who, > const char *parameter, > g_free(result); > } > > -__attribute__((unused)) > static void migrate_set_parameter_str(QTestState *who, const char *parameter, > const char *value) > { > @@ -1398,7 +1397,7 @@ static void test_migrate_auto_converge(void) > test_migrate_end(from, to, true); > } > > -static void test_multifd_tcp(void) > +static void test_multifd_tcp(const char *method) > { > MigrateStart *args = migrate_start_new(); > QTestState *from, *to; > @@ -1422,6 +1421,9 @@ static void test_multifd_tcp(void) > migrate_set_parameter_int(from, "multifd-channels", 16); > migrate_set_parameter_int(to, "multifd-channels", 16); > > + migrate_set_parameter_str(from, "multifd-compress", method); > + migrate_set_parameter_str(to, "multifd-compress", method); > + > migrate_set_capability(from, "multifd", "true"); > migrate_set_capability(to, "multifd", "true"); > > @@ -1453,6 +1455,11 @@ static void test_multifd_tcp(void) > free(uri); > } > > +static void test_multifd_tcp_none(void) > +{ > + test_multifd_tcp("none"); > +} > + > int main(int argc, char **argv) > { > char template[] = "/tmp/migration-test-XXXXXX"; > @@ -1517,7 +1524,7 @@ int main(int argc, char **argv) > test_validate_uuid_dst_not_set); > > qtest_add_func("/migration/auto_converge", test_migrate_auto_converge); > - qtest_add_func("/migration/multifd/tcp", test_multifd_tcp); > + qtest_add_func("/migration/multifd/tcp/none", test_multifd_tcp_none); > > ret = g_test_run(); Except for the Since 4.1's: Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > > -- > 2.23.0 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK