{"id":808799,"url":"http://patchwork.ozlabs.org/api/patches/808799/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-37-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901153758.8628-37-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:47","name":"[PULL,v2,36/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"daeb27c30e3ea7f6f205a39b1186e70ce23b1960","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-37-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808799/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808799/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkPgQ1019z9t2x\n\tfor ;\n\tSat, 2 Sep 2017 02:23:29 +1000 (AEST)","from localhost ([::1]:47637 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoj9-0001hk-By\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:23:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51860)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1b-0006uS-Ex\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1T-0001pp-Ca\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:27 -0400","from mx1.redhat.com ([209.132.183.28]:37108)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1T-0001pG-6c\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:19 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 404537F3E2\n\tfor ; Fri, 1 Sep 2017 15:38:18 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 98438808D0;\n\tFri, 1 Sep 2017 15:38:10 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid AD1D11132F45; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 404537F3E2","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:47 +0200","Message-Id":"<20170901153758.8628-37-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 01 Sep 2017 15:38:18 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 36/47] hmp: Use qapi_enum_parse() in\n\thmp_migrate_set_capability()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\t\"Dr. David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nThe error message on invalid capability name changes from\n\n Invalid parameter \"NAME\"\n\nto\n\n invalid parameter value: NAME\n\nNo worse than before.\n\nSigned-off-by: Marc-André Lureau \nMessage-Id: <20170822132255.23945-9-marcandre.lureau@redhat.com>\nReviewed-by: Markus Armbruster \n[Rebased, commit message rewritten]\nCc: \"Dr. David Alan Gilbert\" \nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-6-git-send-email-armbru@redhat.com>\n---\n hmp.c | 23 ++++++++++-------------\n 1 file changed, 10 insertions(+), 13 deletions(-)","diff":"diff --git a/hmp.c b/hmp.c\nindex 03c1a783b6..7e0bd3d63b 100644\n--- a/hmp.c\n+++ b/hmp.c\n@@ -1527,23 +1527,20 @@ void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict)\n bool state = qdict_get_bool(qdict, \"state\");\n Error *err = NULL;\n MigrationCapabilityStatusList *caps = g_malloc0(sizeof(*caps));\n- int i;\n+ int val;\n \n- for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {\n- if (strcmp(cap, MigrationCapability_lookup[i]) == 0) {\n- caps->value = g_malloc0(sizeof(*caps->value));\n- caps->value->capability = i;\n- caps->value->state = state;\n- caps->next = NULL;\n- qmp_migrate_set_capabilities(caps, &err);\n- break;\n- }\n+ val = qapi_enum_parse(MigrationCapability_lookup, cap, -1, &err);\n+ if (val < 0) {\n+ goto end;\n }\n \n- if (i == MIGRATION_CAPABILITY__MAX) {\n- error_setg(&err, QERR_INVALID_PARAMETER, cap);\n- }\n+ caps->value = g_malloc0(sizeof(*caps->value));\n+ caps->value->capability = val;\n+ caps->value->state = state;\n+ caps->next = NULL;\n+ qmp_migrate_set_capabilities(caps, &err);\n \n+end:\n qapi_free_MigrationCapabilityStatusList(caps);\n \n if (err) {\n","prefixes":["PULL","v2","36/47"]}