[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/12] migration/migration: improve error reporting for migrate pa
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 02/12] migration/migration: improve error reporting for migrate parameters |
Date: |
Thu, 7 May 2020 18:02:01 +0100 |
From: Mao Zhongyi <address@hidden>
use QERR_INVALID_PARAMETER_VALUE instead of
"Parameter '%s' expects" for consistency.
Signed-off-by: Mao Zhongyi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 8f27174ff6..6e079efdcc 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1202,16 +1202,19 @@ static bool migrate_params_check(MigrationParameters
*params, Error **errp)
}
if (params->has_max_bandwidth && (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);
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+ "max_bandwidth",
+ "an integer in the range of 0 to "stringify(SIZE_MAX)
+ " bytes/second");
return false;
}
if (params->has_downtime_limit &&
(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);
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+ "downtime_limit",
+ "an integer in the range of 0 to "
+ stringify(MAX_MIGRATE_DOWNTIME)" milliseconds");
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)
{
if (value < 0 || value > MAX_MIGRATE_DOWNTIME_SECONDS) {
- error_setg(errp, "Parameter 'downtime_limit' expects an integer in "
- "the range of 0 to %d seconds",
- MAX_MIGRATE_DOWNTIME_SECONDS);
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+ "downtime_limit",
+ "an integer in the range of 0 to "
+ stringify(MAX_MIGRATE_DOWNTIME_SECONDS)" seconds");
return;
}
--
2.26.2
- [PULL 00/12] migration queue, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 03/12] monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 04/12] migration: move the units of migrate parameters from milliseconds to ms, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 01/12] migration: fix bad indentation in error_report(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 02/12] migration/migration: improve error reporting for migrate parameters,
Dr. David Alan Gilbert (git) <=
- [PULL 06/12] migration/colo: Add missing error-propagation code, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 05/12] docs/devel/migration: start a debugging section, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 07/12] migration/throttle: Add cpu-throttle-tailslow migration parameter, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 08/12] migration/ram: Consolidate variable reset after placement in ram_load_postcopy(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 09/12] migration/rdma: fix a memleak on error path in rdma_start_incoming_migration, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 10/12] migration/xbzrle: add encoding rate, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 11/12] migration/multifd: fix memleaks in multifd_new_send_channel_async, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 12/12] migration/multifd: Do error_free after migrate_set_error to avoid memleaks, Dr. David Alan Gilbert (git), 2020/05/07
- Re: [PULL 00/12] migration queue, Peter Maydell, 2020/05/07