Commit 2ee30cf0 authored by Mao Zhongyi's avatar Mao Zhongyi Committed by Dr. David Alan Gilbert
Browse files

migration/migration: improve error reporting for migrate parameters 



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

Signed-off-by: default avatarMao Zhongyi <maozhongyi@cmss.chinamobile.com>
Message-Id: <4ce71da4a5f98ad6ead0806ec71043473dcb4c07.1585641083.git.maozhongyi@cmss.chinamobile.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent ed8b2828

migration/migration.c

+12 −8
Original line number Diff line number Diff line
@@ -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;

    }