david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: check global params for validity

Browse Source 
Adding validity check for the migration parameters passed in via global
properties.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <1500349150-13240-7-git-send-email-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2017-07-18 11:39:06 +08:00 committed by Juan Quintela
parent 476c72aa91
commit 8b0b29dcec
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
migration/migration.c
View File

@ -102,14 +102,22 @@ enum mig_rp_message_type {
static MigrationState *current_migration; static MigrationState *current_migration;
static bool migration_object_check(MigrationState *ms, Error **errp);
void migration_object_init(void) void migration_object_init(void)
{ {
MachineState *ms = MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());
Error *err = NULL;
/* This can only be called once. */ /* This can only be called once. */
assert(!current_migration); assert(!current_migration);
current_migration = MIGRATION_OBJ(object_new(TYPE_MIGRATION)); current_migration = MIGRATION_OBJ(object_new(TYPE_MIGRATION));
if (!migration_object_check(current_migration, &err)) {
error_report_err(err);
exit(1);
}
/* /*
* We cannot really do this in migration_instance_init() since at * We cannot really do this in migration_instance_init() since at
* that time global properties are not yet applied, then this * that time global properties are not yet applied, then this
@ -2102,12 +2110,38 @@ static void migration_class_init(ObjectClass *klass, void *data)
static void migration_instance_init(Object *obj) static void migration_instance_init(Object *obj)
{ {
MigrationState *ms = MIGRATION_OBJ(obj); MigrationState *ms = MIGRATION_OBJ(obj);
MigrationParameters *params = &ms->parameters;
ms->state = MIGRATION_STATUS_NONE; ms->state = MIGRATION_STATUS_NONE;
ms->xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE; ms->xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE;
ms->mbps = -1; ms->mbps = -1;
ms->parameters.tls_creds = g_strdup("");
ms->parameters.tls_hostname = g_strdup(""); params->tls_hostname = g_strdup("");
params->tls_creds = g_strdup("");
/* Set has_* up only for parameter checks */
params->has_compress_level = true;
params->has_compress_threads = true;
params->has_decompress_threads = true;
params->has_cpu_throttle_initial = true;
params->has_cpu_throttle_increment = true;
params->has_max_bandwidth = true;
params->has_downtime_limit = true;
params->has_x_checkpoint_delay = true;
params->has_block_incremental = true;
}
/*
* Return true if check pass, false otherwise. Error will be put
* inside errp if provided.
*/
static bool migration_object_check(MigrationState *ms, Error **errp)
{
if (!migrate_params_check(&ms->parameters, errp)) {
return false;
}
return true;
} }
static const TypeInfo migration_type = { static const TypeInfo migration_type = {