Commit 8e615e34 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_capability() 



The error message on invalid capability name changes from

    Invalid parameter "NAME"

to

    invalid parameter value: NAME

No worse than before.

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

hmp.c

+10 −13
Original line number Diff line number Diff line
@@ -1527,23 +1527,20 @@ void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict) 
    bool state = qdict_get_bool(qdict, "state");

    Error *err = NULL;

    MigrationCapabilityStatusList *caps = g_malloc0(sizeof(*caps));

    int i;

    int val;



    val = qapi_enum_parse(MigrationCapability_lookup, cap, -1, &err);

    if (val < 0) {

        goto end;

    }



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

        if (strcmp(cap, MigrationCapability_lookup[i]) == 0) {

    caps->value = g_malloc0(sizeof(*caps->value));

            caps->value->capability = i;

    caps->value->capability = val;

    caps->value->state = state;

    caps->next = NULL;

    qmp_migrate_set_capabilities(caps, &err);

            break;

        }

    }



    if (i == MIGRATION_CAPABILITY__MAX) {

        error_setg(&err, QERR_INVALID_PARAMETER, cap);

    }



end:

    qapi_free_MigrationCapabilityStatusList(caps);



    if (err) {