vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170822132255.23945-10-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Rebased, assertion added, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-7-git-send-email-armbru@redhat.com>
master
Marc-André Lureau 2017-08-24 10:46:01 +02:00 committed by Markus Armbruster
parent 8e615e34f9
commit 262517b7e0
1 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hmp.c
View File

@ -1556,11 +1556,14 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
MigrateSetParameters *p = g_new0(MigrateSetParameters, 1); MigrateSetParameters *p = g_new0(MigrateSetParameters, 1);
uint64_t valuebw = 0; uint64_t valuebw = 0;
Error *err = NULL; Error *err = NULL;
int i, ret; int val, ret;
for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) { val = qapi_enum_parse(MigrationParameter_lookup, param, -1, &err);
if (strcmp(param, MigrationParameter_lookup[i]) == 0) { if (val < 0) {
switch (i) { goto cleanup;
}
switch (val) {
case MIGRATION_PARAMETER_COMPRESS_LEVEL: case MIGRATION_PARAMETER_COMPRESS_LEVEL:
p->has_compress_level = true; p->has_compress_level = true;
visit_type_int(v, param, &p->compress_level, &err); 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; p->has_block_incremental = true;
visit_type_bool(v, param, &p->block_incremental, &err); visit_type_bool(v, param, &p->block_incremental, &err);
break; break;
default:
assert(0);
} }
if (err) { if (err) {
@ -1626,13 +1631,6 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
} }
qmp_migrate_set_parameters(p, &err); qmp_migrate_set_parameters(p, &err);
break;
}
}
if (i == MIGRATION_PARAMETER__MAX) {
error_setg(&err, QERR_INVALID_PARAMETER, param);
}
cleanup: cleanup:
qapi_free_MigrateSetParameters(p); qapi_free_MigrateSetParameters(p);