[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/10] migration: check global params for validit
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 06/10] migration: check global params for validity |
Date: |
Tue, 18 Jul 2017 11:39:06 +0800 |
Adding validity check for the migration parameters passed in via global
properties.
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 38 ++++++++++++++++++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 8c65054..a4a8ed8 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -102,14 +102,22 @@ enum mig_rp_message_type {
static MigrationState *current_migration;
+static bool migration_object_check(MigrationState *ms, Error **errp);
+
void migration_object_init(void)
{
MachineState *ms = MACHINE(qdev_get_machine());
+ Error *err = NULL;
/* This can only be called once. */
assert(!current_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
* that time global properties are not yet applied, then this
@@ -2101,12 +2109,38 @@ static void migration_class_init(ObjectClass *klass,
void *data)
static void migration_instance_init(Object *obj)
{
MigrationState *ms = MIGRATION_OBJ(obj);
+ MigrationParameters *params = &ms->parameters;
ms->state = MIGRATION_STATUS_NONE;
ms->xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE;
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 = {
--
2.7.4
- [Qemu-devel] [PATCH v3 00/10] migration: export cap/params to qdev props, Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 01/10] qdev: provide DEFINE_PROP_INT64(), Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 02/10] migration: export parameters to props, Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 03/10] migration: export capabilities to props, Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 04/10] migration: introduce migrate_params_check(), Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 05/10] migration: provide migrate_params_apply(), Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 06/10] migration: check global params for validity,
Peter Xu <=
- [Qemu-devel] [PATCH v3 07/10] migration: remove check against colo support, Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 08/10] migration: provide migrate_caps_check(), Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 09/10] migration: provide migrate_cap_add(), Peter Xu, 2017/07/17
- [Qemu-devel] [PATCH v3 10/10] migration: check global caps for validity, Peter Xu, 2017/07/17