Commit 262517b7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter() 



The error message on invalid parameter name changes from

    Invalid parameter "NAME"

to

    invalid parameter value: NAME

Slight degratation, perhaps.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170822132255.23945-10-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Rebased, assertion added, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-7-git-send-email-armbru@redhat.com>
parent 8e615e34

hmp.c

+69 −71
Original line number Diff line number Diff line
@@ -1556,11 +1556,14 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
    MigrateSetParameters *p = g_new0(MigrateSetParameters, 1);

    uint64_t valuebw = 0;

    Error *err = NULL;

    int i, ret;

    int val, ret;



    for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {

        if (strcmp(param, MigrationParameter_lookup[i]) == 0) {

            switch (i) {

    val = qapi_enum_parse(MigrationParameter_lookup, param, -1, &err);

    if (val < 0) {

        goto cleanup;

    }



    switch (val) {

    case MIGRATION_PARAMETER_COMPRESS_LEVEL:

        p->has_compress_level = true;

        visit_type_int(v, param, &p->compress_level, &err);
@@ -1619,6 +1622,8 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
        p->has_block_incremental = true;

        visit_type_bool(v, param, &p->block_incremental, &err);

        break;

    default:

        assert(0);

    }



    if (err) {
@@ -1626,13 +1631,6 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
    }



    qmp_migrate_set_parameters(p, &err);

            break;

        }

    }



    if (i == MIGRATION_PARAMETER__MAX) {

        error_setg(&err, QERR_INVALID_PARAMETER, param);

    }



 cleanup:

    qapi_free_MigrateSetParameters(p);