mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration/migration: improve error reporting for migrate parameters

Browse Source 
use QERR_INVALID_PARAMETER_VALUE instead of
"Parameter '%s' expects" for consistency.

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Message-Id: <4ce71da4a5f98ad6ead0806ec71043473dcb4c07.1585641083.git.maozhongyi@cmss.chinamobile.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Mao Zhongyi 2020-03-31 16:22:05 +08:00 committed by Dr. David Alan Gilbert
parent ed8b2828cc
commit 2ee30cf078
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
migration/migration.c
View File

@ -1202,16 +1202,19 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
} }
if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) { if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) {
error_setg(errp, "Parameter 'max_bandwidth' expects an integer in the" error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
" range of 0 to %zu bytes/second", SIZE_MAX); "max_bandwidth",
"an integer in the range of 0 to "stringify(SIZE_MAX)
" bytes/second");
return false; return false;
} }
if (params->has_downtime_limit && if (params->has_downtime_limit &&
(params->downtime_limit > MAX_MIGRATE_DOWNTIME)) { (params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
error_setg(errp, "Parameter 'downtime_limit' expects an integer in " error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"the range of 0 to %d milliseconds", "downtime_limit",
MAX_MIGRATE_DOWNTIME); "an integer in the range of 0 to "
stringify(MAX_MIGRATE_DOWNTIME)" milliseconds");
return false; return false;
} }
@ -2107,9 +2110,10 @@ void qmp_migrate_set_speed(int64_t value, Error **errp)
void qmp_migrate_set_downtime(double value, Error **errp) void qmp_migrate_set_downtime(double value, Error **errp)
{ {
if (value < 0 || value > MAX_MIGRATE_DOWNTIME_SECONDS) { if (value < 0 || value > MAX_MIGRATE_DOWNTIME_SECONDS) {
error_setg(errp, "Parameter 'downtime_limit' expects an integer in " error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"the range of 0 to %d seconds", "downtime_limit",
MAX_MIGRATE_DOWNTIME_SECONDS); "an integer in the range of 0 to "
stringify(MAX_MIGRATE_DOWNTIME_SECONDS)" seconds");
return; return;
} }