提交 2594f56d 编写于 作者: D Daniel P. Berrange 提交者: Amit Shah

migration: don't use an array for storing migrate parameters

The MigrateState struct uses an array for storing migration
parameters. This presumes that all future parameters will
be integers too, which is not going to be the case. There
is no functional reason why an array is used, if anything
it makes the code less clear. The QAPI schema already
defines a struct - MigrationParameters - capable of storing
all the individual parameters, so just use that instead of
an array.
Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-25-git-send-email-berrange@redhat.com>
Signed-off-by: NAmit Shah <amit.shah@redhat.com>
上级 a24939f2
......@@ -135,9 +135,12 @@ struct MigrationState
QemuThread thread;
QEMUBH *cleanup_bh;
QEMUFile *to_dst_file;
int parameters[MIGRATION_PARAMETER__MAX];
/* New style params from 'migrate-set-parameters' */
MigrationParameters parameters;
int state;
/* Old style params from 'migrate' command */
MigrationParams params;
/* State related to return path */
......
......@@ -82,16 +82,13 @@ MigrationState *migrate_get_current(void)
.bandwidth_limit = MAX_THROTTLE,
.xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE,
.mbps = -1,
.parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] =
DEFAULT_MIGRATE_COMPRESS_LEVEL,
.parameters[MIGRATION_PARAMETER_COMPRESS_THREADS] =
DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
.parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
.parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL] =
DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL,
.parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT] =
DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT,
.parameters = {
.compress_level = DEFAULT_MIGRATE_COMPRESS_LEVEL,
.compress_threads = DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
.decompress_threads = DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
.cpu_throttle_initial = DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL,
.cpu_throttle_increment = DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT,
},
};
if (!once) {
......@@ -534,15 +531,11 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
MigrationState *s = migrate_get_current();
params = g_malloc0(sizeof(*params));
params->compress_level = s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL];
params->compress_threads =
s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
params->decompress_threads =
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
params->cpu_throttle_initial =
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL];
params->cpu_throttle_increment =
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT];
params->compress_level = s->parameters.compress_level;
params->compress_threads = s->parameters.compress_threads;
params->decompress_threads = s->parameters.decompress_threads;
params->cpu_throttle_initial = s->parameters.cpu_throttle_initial;
params->cpu_throttle_increment = s->parameters.cpu_throttle_increment;
return params;
}
......@@ -743,7 +736,8 @@ void qmp_migrate_set_parameters(bool has_compress_level,
bool has_cpu_throttle_initial,
int64_t cpu_throttle_initial,
bool has_cpu_throttle_increment,
int64_t cpu_throttle_increment, Error **errp)
int64_t cpu_throttle_increment,
Error **errp)
{
MigrationState *s = migrate_get_current();
......@@ -780,26 +774,23 @@ void qmp_migrate_set_parameters(bool has_compress_level,
}
if (has_compress_level) {
s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] = compress_level;
s->parameters.compress_level = compress_level;
}
if (has_compress_threads) {
s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS] = compress_threads;
s->parameters.compress_threads = compress_threads;
}
if (has_decompress_threads) {
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
decompress_threads;
s->parameters.decompress_threads = decompress_threads;
}
if (has_cpu_throttle_initial) {
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL] =
cpu_throttle_initial;
s->parameters.cpu_throttle_initial = cpu_throttle_initial;
}
if (has_cpu_throttle_increment) {
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT] =
cpu_throttle_increment;
s->parameters.cpu_throttle_increment = cpu_throttle_increment;
}
}
void qmp_migrate_start_postcopy(Error **errp)
{
MigrationState *s = migrate_get_current();
......@@ -1195,7 +1186,7 @@ int migrate_compress_level(void)
s = migrate_get_current();
return s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL];
return s->parameters.compress_level;
}
int migrate_compress_threads(void)
......@@ -1204,7 +1195,7 @@ int migrate_compress_threads(void)
s = migrate_get_current();
return s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
return s->parameters.compress_threads;
}
int migrate_decompress_threads(void)
......@@ -1213,7 +1204,7 @@ int migrate_decompress_threads(void)
s = migrate_get_current();
return s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
return s->parameters.decompress_threads;
}
bool migrate_use_events(void)
......
......@@ -429,10 +429,8 @@ static size_t save_page_header(QEMUFile *f, RAMBlock *block, ram_addr_t offset)
static void mig_throttle_guest_down(void)
{
MigrationState *s = migrate_get_current();
uint64_t pct_initial =
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL];
uint64_t pct_icrement =
s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT];
uint64_t pct_initial = s->parameters.cpu_throttle_initial;
uint64_t pct_icrement = s->parameters.cpu_throttle_increment;
/* We have not started throttling yet. Let's start it. */
if (!cpu_throttle_active()) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册