{"id":808784,"url":"http://patchwork.ozlabs.org/api/patches/808784/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-41-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-41-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:51","name":"[PULL,v2,40/47] crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6630e50f36be99f613ca516726bb23c9b828dc19","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-41-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/808784/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808784/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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xkPMn35MHz9sRV\n\tfor ;\n\tSat, 2 Sep 2017 02:09:57 +1000 (AEST)","from localhost ([::1]:46760 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoW3-0004WY-7N\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:09:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51715)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1T-0006jh-R3\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1N-0001l1-Cs\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:19 -0400","from mx1.redhat.com ([209.132.183.28]:43802)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1N-0001jO-3M\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:13 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 2613E806CD\n\tfor ; Fri, 1 Sep 2017 15:38:12 +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 DB437C0D85;\n\tFri, 1 Sep 2017 15:38:11 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid B89F71132F49; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2613E806CD","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:51 +0200","Message-Id":"<20170901153758.8628-41-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.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tFri, 01 Sep 2017 15:38:12 +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 40/47] crypto: Use qapi_enum_parse() in\n\tqcrypto_block_luks_name_lookup()","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","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Cc: \"Daniel P. Berrange\" \nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-10-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \nAcked-by: Daniel P. Berrange \n---\n crypto/block-luks.c | 19 +++++++------------\n 1 file changed, 7 insertions(+), 12 deletions(-)","diff":"diff --git a/crypto/block-luks.c b/crypto/block-luks.c\nindex afb8543108..c3cacdb1ed 100644\n--- a/crypto/block-luks.c\n+++ b/crypto/block-luks.c\n@@ -20,6 +20,7 @@\n \n #include \"qemu/osdep.h\"\n #include \"qapi/error.h\"\n+#include \"qapi/util.h\"\n #include \"qemu/bswap.h\"\n \n #include \"crypto/block-luks.h\"\n@@ -265,39 +266,33 @@ qcrypto_block_luks_cipher_alg_lookup(QCryptoCipherAlgorithm alg,\n * make that function emit a more friendly error message */\n static int qcrypto_block_luks_name_lookup(const char *name,\n const char *const *map,\n- size_t maplen,\n const char *type,\n Error **errp)\n {\n- size_t i;\n- for (i = 0; i < maplen; i++) {\n- if (g_str_equal(map[i], name)) {\n- return i;\n- }\n- }\n+ int ret = qapi_enum_parse(map, name, -1, NULL);\n \n- error_setg(errp, \"%s %s not supported\", type, name);\n- return 0;\n+ if (ret < 0) {\n+ error_setg(errp, \"%s %s not supported\", type, name);\n+ return 0;\n+ }\n+ return ret;\n }\n \n #define qcrypto_block_luks_cipher_mode_lookup(name, errp) \\\n qcrypto_block_luks_name_lookup(name, \\\n QCryptoCipherMode_lookup, \\\n- QCRYPTO_CIPHER_MODE__MAX, \\\n \"Cipher mode\", \\\n errp)\n \n #define qcrypto_block_luks_hash_name_lookup(name, errp) \\\n qcrypto_block_luks_name_lookup(name, \\\n QCryptoHashAlgorithm_lookup, \\\n- QCRYPTO_HASH_ALG__MAX, \\\n \"Hash algorithm\", \\\n errp)\n \n #define qcrypto_block_luks_ivgen_name_lookup(name, errp) \\\n qcrypto_block_luks_name_lookup(name, \\\n QCryptoIVGenAlgorithm_lookup, \\\n- QCRYPTO_IVGEN_ALG__MAX, \\\n \"IV generator\", \\\n errp)\n \n","prefixes":["PULL","v2","40/47"]}