[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 08/54] hmp: use qapi_enum_parse() in hmp_migr
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v2 08/54] hmp: use qapi_enum_parse() in hmp_migrate_set_capability |
Date: |
Wed, 23 Aug 2017 11:34:05 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) |
Marc-André Lureau <address@hidden> writes:
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> hmp.c | 24 +++++++++++-------------
> 1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 29e42ab661..4ba50e8e26 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1544,23 +1544,21 @@ 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,
> + MIGRATION_CAPABILITY__MAX, -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) {
Reviewed-by: Markus Armbruster <address@hidden>
- Re: [Qemu-devel] [PATCH v2 14/54] qapi2texi: minor python code simplification, (continued)
- [Qemu-devel] [PATCH v2 02/54] qdict: add qdict_put_null() helper, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 37/54] qapi: 'if' to alternate variant, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 32/54] qapi: add 'if' to struct members, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 08/54] hmp: use qapi_enum_parse() in hmp_migrate_set_capability, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 21/54] qapi-introspect: modify to_qlit() to generate #if code, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 29/54] qapi: add 'if' to enum members, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 43/54] qapi2texi: add 'If:' condition to struct members, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 30/54] qapi: add #if conditions on generated enum values, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 04/54] qlit: add qobject_form_qlit(), Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 38/54] qapi: add tests for invalid alternate, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 42/54] qapi2texi: add 'If:' condition to enum values, Marc-André Lureau, 2017/08/22
- [Qemu-devel] [PATCH v2 11/54] quorum: use qapi_enum_parse() in quorum_open, Marc-André Lureau, 2017/08/22