From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnlUo-0000KE-2O for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnlUk-0007OF-9G for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnlUk-0007MK-1t for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67FE3C0467C4 for ; Fri, 1 Sep 2017 12:56:20 +0000 (UTC) From: Markus Armbruster Date: Fri, 1 Sep 2017 14:56:00 +0200 Message-Id: <20170901125611.29295-37-armbru@redhat.com> In-Reply-To: <20170901125611.29295-1-armbru@redhat.com> References: <20170901125611.29295-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" From: Marc-Andr=C3=A9 Lureau 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=C3=A9 Lureau Message-Id: <20170822132255.23945-9-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster [Rebased, commit message rewritten] Cc: "Dr. David Alan Gilbert" Signed-off-by: Markus Armbruster Message-Id: <1503564371-26090-6-git-send-email-armbru@redhat.com> --- 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, con= st QDict *qdict) bool state =3D qdict_get_bool(qdict, "state"); Error *err =3D NULL; MigrationCapabilityStatusList *caps =3D g_malloc0(sizeof(*caps)); - int i; + int val; =20 - for (i =3D 0; i < MIGRATION_CAPABILITY__MAX; i++) { - if (strcmp(cap, MigrationCapability_lookup[i]) =3D=3D 0) { - caps->value =3D g_malloc0(sizeof(*caps->value)); - caps->value->capability =3D i; - caps->value->state =3D state; - caps->next =3D NULL; - qmp_migrate_set_capabilities(caps, &err); - break; - } + val =3D qapi_enum_parse(MigrationCapability_lookup, cap, -1, &err); + if (val < 0) { + goto end; } =20 - if (i =3D=3D MIGRATION_CAPABILITY__MAX) { - error_setg(&err, QERR_INVALID_PARAMETER, cap); - } + caps->value =3D g_malloc0(sizeof(*caps->value)); + caps->value->capability =3D val; + caps->value->state =3D state; + caps->next =3D NULL; + qmp_migrate_set_capabilities(caps, &err); =20 +end: qapi_free_MigrationCapabilityStatusList(caps); =20 if (err) { --=20 2.13.5