{"id":808770,"url":"http://patchwork.ozlabs.org/api/patches/808770/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-40-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-40-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:50","name":"[PULL,v2,39/47] quorum: Use qapi_enum_parse() in quorum_open()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8ba3f1c4b41554d4ba9192383ceef5b652d508ec","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-40-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/808770/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808770/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xkPCR2bzxz9s2G\n\tfor ;\n\tSat, 2 Sep 2017 02:02:43 +1000 (AEST)","from localhost ([::1]:46653 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoP3-0006I3-Dq\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:02:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51588)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1O-0006fw-Gr\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1M-0001jk-LU\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:14 -0400","from mx1.redhat.com ([209.132.183.28]:34466)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1M-0001ij-GE\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:12 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 7C4177F7B0;\n\tFri, 1 Sep 2017 15:38:11 +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 450BF17C34;\n\tFri, 1 Sep 2017 15:38:11 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid B5B4C1132F48; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7C4177F7B0","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:50 +0200","Message-Id":"<20170901153758.8628-40-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 01 Sep 2017 15:38:11 +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 39/47] quorum: Use qapi_enum_parse() in\n\tquorum_open()","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\tAlberto Garcia ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nSigned-off-by: Marc-André Lureau \nMessage-Id: <20170822132255.23945-12-marcandre.lureau@redhat.com>\nReviewed-by: Markus Armbruster \n[Rebased, qemu_opt_get() factored out, commit message tweaked]\nCc: Alberto Garcia \nReviewed-by: Alberto Garcia \nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-9-git-send-email-armbru@redhat.com>\n---\n block/quorum.c | 28 +++++++++-------------------\n 1 file changed, 9 insertions(+), 19 deletions(-)","diff":"diff --git a/block/quorum.c b/block/quorum.c\nindex d04da4f430..cb6617703c 100644\n--- a/block/quorum.c\n+++ b/block/quorum.c\n@@ -22,6 +22,7 @@\n #include \"qapi/qmp/qjson.h\"\n #include \"qapi/qmp/qlist.h\"\n #include \"qapi/qmp/qstring.h\"\n+#include \"qapi/util.h\"\n #include \"qapi-event.h\"\n #include \"crypto/hash.h\"\n \n@@ -867,30 +868,13 @@ static QemuOptsList quorum_runtime_opts = {\n },\n };\n \n-static int parse_read_pattern(const char *opt)\n-{\n- int i;\n-\n- if (!opt) {\n- /* Set quorum as default */\n- return QUORUM_READ_PATTERN_QUORUM;\n- }\n-\n- for (i = 0; i < QUORUM_READ_PATTERN__MAX; i++) {\n- if (!strcmp(opt, QuorumReadPattern_lookup[i])) {\n- return i;\n- }\n- }\n-\n- return -EINVAL;\n-}\n-\n static int quorum_open(BlockDriverState *bs, QDict *options, int flags,\n Error **errp)\n {\n BDRVQuorumState *s = bs->opaque;\n Error *local_err = NULL;\n QemuOpts *opts = NULL;\n+ const char *pattern_str;\n bool *opened;\n int i;\n int ret = 0;\n@@ -925,7 +909,13 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,\n goto exit;\n }\n \n- ret = parse_read_pattern(qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN));\n+ pattern_str = qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN);\n+ if (!pattern_str) {\n+ ret = QUORUM_READ_PATTERN_QUORUM;\n+ } else {\n+ ret = qapi_enum_parse(QuorumReadPattern_lookup, pattern_str,\n+ -EINVAL, NULL);\n+ }\n if (ret < 0) {\n error_setg(&local_err, \"Please set read-pattern as fifo or quorum\");\n goto exit;\n","prefixes":["PULL","v2","39/47"]}