69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
|
From 79863c5ccdd4c635657d2e32e91bc02aa49655e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Chuan Zheng <zhengchuan@huawei.com>
|
||
|
|
Date: Sat, 30 Jan 2021 16:23:15 +0800
|
||
|
|
Subject: [PATCH] migration: Add compress_level sanity check
|
||
|
|
|
||
|
|
Zlib compression has level from 1 to 9. However Zstd compression has level
|
||
|
|
from 1 to 22 (level >= 20 not recommanded). Let's do sanity check here
|
||
|
|
to make sure a vaild compress_level is given by user.
|
||
|
|
|
||
|
|
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
|
||
|
|
Signed-off-by: Zeyu Jin <jinzeyu@huawei.com>
|
||
|
|
Signed-off-by: Ying Fang <fangying1@huawei.com>
|
||
|
|
---
|
||
|
|
migration/options.c | 32 ++++++++++++++++++++++++++++----
|
||
|
|
1 file changed, 28 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/migration/options.c b/migration/options.c
|
||
|
|
index 6aaee702dc..9b68962a65 100644
|
||
|
|
--- a/migration/options.c
|
||
|
|
+++ b/migration/options.c
|
||
|
|
@@ -1065,16 +1065,40 @@ void migrate_params_init(MigrationParameters *params)
|
||
|
|
params->has_mode = true;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static bool compress_level_check(MigrationParameters *params, Error **errp)
|
||
|
|
+{
|
||
|
|
+ switch (params->compress_method) {
|
||
|
|
+ case COMPRESS_METHOD_ZLIB:
|
||
|
|
+ if (params->compress_level > 9 || params->compress_level < 1) {
|
||
|
|
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
|
||
|
|
+ "a value in the range of 0 to 9 for Zlib method");
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
+#ifdef CONFIG_ZSTD
|
||
|
|
+ case COMPRESS_METHOD_ZSTD:
|
||
|
|
+ if (params->compress_level > 19 || params->compress_level < 1) {
|
||
|
|
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
|
||
|
|
+ "a value in the range of 1 to 19 for Zstd method");
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
+#endif
|
||
|
|
+ default:
|
||
|
|
+ error_setg(errp, "Checking compress_level failed for unknown reason");
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return true;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Check whether the parameters are valid. Error will be put into errp
|
||
|
|
* (if provided). Return true if valid, otherwise false.
|
||
|
|
*/
|
||
|
|
bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||
|
|
{
|
||
|
|
- if (params->has_compress_level &&
|
||
|
|
- (params->compress_level > 9)) {
|
||
|
|
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
|
||
|
|
- "a value between 0 and 9");
|
||
|
|
+ if (params->has_compress_level && !compress_level_check(params, errp)) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|