[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/10] migration: introduce migrate_params_check(
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 04/10] migration: introduce migrate_params_check() |
Date: |
Tue, 18 Jul 2017 11:39:04 +0800 |
Helper to check the parameters. Abstracted from
qmp_migrate_set_parameters().
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 42 ++++++++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 3208162..2821f8a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -643,64 +643,86 @@ void
qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
}
}
-void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp)
+/*
+ * Check whether the parameters are valid. Error will be put into errp
+ * (if provided). Return true if valid, otherwise false.
+ */
+static bool migrate_params_check(MigrationParameters *params, Error **errp)
{
- MigrationState *s = migrate_get_current();
-
if (params->has_compress_level &&
(params->compress_level < 0 || params->compress_level > 9)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
"is invalid, it should be in the range of 0 to 9");
- return;
+ return false;
}
+
if (params->has_compress_threads &&
(params->compress_threads < 1 || params->compress_threads > 255)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"compress_threads",
"is invalid, it should be in the range of 1 to 255");
- return;
+ return false;
}
+
if (params->has_decompress_threads &&
(params->decompress_threads < 1 || params->decompress_threads > 255)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"decompress_threads",
"is invalid, it should be in the range of 1 to 255");
- return;
+ return false;
}
+
if (params->has_cpu_throttle_initial &&
(params->cpu_throttle_initial < 1 ||
params->cpu_throttle_initial > 99)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_initial",
"an integer in the range of 1 to 99");
- return;
+ return false;
}
+
if (params->has_cpu_throttle_increment &&
(params->cpu_throttle_increment < 1 ||
params->cpu_throttle_increment > 99)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_increment",
"an integer in the range of 1 to 99");
- return;
+ return false;
}
+
if (params->has_max_bandwidth &&
(params->max_bandwidth < 0 || params->max_bandwidth > SIZE_MAX)) {
error_setg(errp, "Parameter 'max_bandwidth' expects an integer in the"
" range of 0 to %zu bytes/second", SIZE_MAX);
- return;
+ return false;
}
+
if (params->has_downtime_limit &&
(params->downtime_limit < 0 ||
params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
error_setg(errp, "Parameter 'downtime_limit' expects an integer in "
"the range of 0 to %d milliseconds",
MAX_MIGRATE_DOWNTIME);
- return;
+ return false;
}
+
if (params->has_x_checkpoint_delay && (params->x_checkpoint_delay < 0)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"x_checkpoint_delay",
"is invalid, it should be positive");
+ return false;
+ }
+
+ return true;
+}
+
+void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp)
+{
+ MigrationState *s = migrate_get_current();
+
+ if (!migrate_params_check(params, errp)) {
+ /* Invalid parameter */
+ return;
}
if (params->has_compress_level) {
--
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 <=
- [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, 2017/07/17
- [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