[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability() |
Date: |
Fri, 1 Sep 2017 17:37:47 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
---
hmp.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/hmp.c b/hmp.c
index 03c1a783b6..7e0bd3d63b 100644
--- a/hmp.c
+++ b/hmp.c
@@ -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) {
--
2.13.5
- [Qemu-devel] [PULL v2 47/47] qapi: drop the sentinel in enum array, (continued)
- [Qemu-devel] [PULL v2 47/47] qapi: drop the sentinel in enum array, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 21/47] qapi-schema: Collect char device stuff in qapi/char.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 40/47] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 20/47] qapi-schema: Collect run state stuff in qapi/run-state.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 46/47] qapi: Change data type of the FOO_lookup generated for enum FOO, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 38/47] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 12/47] qlit: Replace open-coded qnum_get_int() by call, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 33/47] qapi: Drop superfluous qapi_enum_parse() parameter max, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 43/47] qapi: Generate FOO_str() macro for QAPI enum FOO, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 35/47] tpm: Clean up model registration & lookup, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability(),
Markus Armbruster <=
- [Qemu-devel] [PULL v2 22/47] qapi-schema: Collect net device stuff in qapi/net.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 37/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 09/47] qlit: make qlit_equal_qobject return a bool, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 19/47] qapi-schema: Collect sockets stuff in qapi/sockets.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 23/47] qapi-schema: Collect UI stuff in qapi/ui.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 44/47] qapi: Mechanically convert FOO_lookup[...] to FOO_str(...), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 24/47] qapi-schema: Collect migration stuff in qapi/migration.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL v2 34/47] tpm: Clean up driver registration & lookup, Markus Armbruster, 2017/09/01
- Re: [Qemu-devel] [PULL v2 00/47] QAPI patches for 2017-09-01, Peter Maydell, 2017/09/04