Skip to content

Commit

Permalink
hmp: Use qapi_enum_parse() in hmp_migrate_set_capability()
Browse files Browse the repository at this point in the history
The error message on invalid capability name changes from

    Invalid parameter "NAME"

to

    invalid parameter value: NAME

No worse than before.

Signed-off-by: Marc-André Lureau <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
[Rebased, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
elmarco authored and Markus Armbruster committed Sep 4, 2017
1 parent 00bbf50 commit 8e615e3
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions hmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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->state = state;
caps->next = NULL;
qmp_migrate_set_capabilities(caps, &err);
break;
}
val = qapi_enum_parse(MigrationCapability_lookup, cap, -1, &err);
if (val < 0) {
goto end;
}

if (i == MIGRATION_CAPABILITY__MAX) {
error_setg(&err, QERR_INVALID_PARAMETER, cap);
}
caps->value = g_malloc0(sizeof(*caps->value));
caps->value->capability = val;
caps->value->state = state;
caps->next = NULL;
qmp_migrate_set_capabilities(caps, &err);

end:
qapi_free_MigrationCapabilityStatusList(caps);

if (err) {
Expand Down

0 comments on commit 8e615e3

Please sign in to comment.