mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
migration: Fix a few absurdly defective error messages
migrate_params_check() has a number of error messages of the form Parameter 'NAME' expects is invalid, it should be ... Fix them to something like Parameter 'NAME' expects a ... Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20210202141734.2488076-5-armbru@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
7bfc47936e
commit
54270c450a
|
@ -1317,21 +1317,21 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||||||
if (params->has_compress_level &&
|
if (params->has_compress_level &&
|
||||||
(params->compress_level > 9)) {
|
(params->compress_level > 9)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
|
||||||
"is invalid, it should be in the range of 0 to 9");
|
"a value between 0 and 9");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params->has_compress_threads && (params->compress_threads < 1)) {
|
if (params->has_compress_threads && (params->compress_threads < 1)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"compress_threads",
|
"compress_threads",
|
||||||
"is invalid, it should be in the range of 1 to 255");
|
"a value between 1 and 255");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params->has_decompress_threads && (params->decompress_threads < 1)) {
|
if (params->has_decompress_threads && (params->decompress_threads < 1)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"decompress_threads",
|
"decompress_threads",
|
||||||
"is invalid, it should be in the range of 1 to 255");
|
"a value between 1 and 255");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1384,21 +1384,21 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||||||
if (params->has_multifd_channels && (params->multifd_channels < 1)) {
|
if (params->has_multifd_channels && (params->multifd_channels < 1)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"multifd_channels",
|
"multifd_channels",
|
||||||
"is invalid, it should be in the range of 1 to 255");
|
"a value between 1 and 255");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params->has_multifd_zlib_level &&
|
if (params->has_multifd_zlib_level &&
|
||||||
(params->multifd_zlib_level > 9)) {
|
(params->multifd_zlib_level > 9)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level",
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level",
|
||||||
"is invalid, it should be in the range of 0 to 9");
|
"a value between 0 and 9");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params->has_multifd_zstd_level &&
|
if (params->has_multifd_zstd_level &&
|
||||||
(params->multifd_zstd_level > 20)) {
|
(params->multifd_zstd_level > 20)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
|
||||||
"is invalid, it should be in the range of 0 to 20");
|
"a value between 0 and 20");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1407,8 +1407,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||||||
!is_power_of_2(params->xbzrle_cache_size))) {
|
!is_power_of_2(params->xbzrle_cache_size))) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"xbzrle_cache_size",
|
"xbzrle_cache_size",
|
||||||
"is invalid, it should be bigger than target page size"
|
"a power of two no less than the target page size");
|
||||||
" and a power of 2");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1425,21 +1424,21 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||||||
params->announce_initial > 100000) {
|
params->announce_initial > 100000) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"announce_initial",
|
"announce_initial",
|
||||||
"is invalid, it must be less than 100000 ms");
|
"a value between 0 and 100000");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (params->has_announce_max &&
|
if (params->has_announce_max &&
|
||||||
params->announce_max > 100000) {
|
params->announce_max > 100000) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"announce_max",
|
"announce_max",
|
||||||
"is invalid, it must be less than 100000 ms");
|
"a value between 0 and 100000");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (params->has_announce_rounds &&
|
if (params->has_announce_rounds &&
|
||||||
params->announce_rounds > 1000) {
|
params->announce_rounds > 1000) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"announce_rounds",
|
"announce_rounds",
|
||||||
"is invalid, it must be in the range of 0 to 1000");
|
"a value between 0 and 1000");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (params->has_announce_step &&
|
if (params->has_announce_step &&
|
||||||
|
@ -1447,7 +1446,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
|
||||||
params->announce_step > 10000)) {
|
params->announce_step > 10000)) {
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"announce_step",
|
"announce_step",
|
||||||
"is invalid, it must be in the range of 1 to 10000 ms");
|
"a value between 0 and 10000");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue