{"id":808757,"url":"http://patchwork.ozlabs.org/api/patches/808757/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-39-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-39-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:49","name":"[PULL,v2,38/47] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b074a019799691113072e212086e6164dbcb4388","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-39-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/808757/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808757/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xkP3x71xbz9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:56:13 +1000 (AEST)","from localhost ([::1]:46568 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoIm-0007NY-4O\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:56:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51896)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1f-0006z7-GZ\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 1dno1a-0001td-SG\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:31 -0400","from mx1.redhat.com ([209.132.183.28]:58826)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dno1P-0001nB-Tm; Fri, 01 Sep 2017 11:38:16 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 F09327EBDB;\n\tFri, 1 Sep 2017 15:38:14 +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 9CC63A2D8A;\n\tFri, 1 Sep 2017 15:38:11 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid B2CDA1132F47; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F09327EBDB","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:49 +0200","Message-Id":"<20170901153758.8628-39-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.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tFri, 01 Sep 2017 15:38:15 +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 38/47] block: Use qemu_enum_parse() in\n\tblkdebug_debug_breakpoint()","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":"Kevin Wolf , =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t, qemu-block@nongnu.org,\n\tMax Reitz ","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 blkdebug events changes from\n\n qemu-system-x86_64: LOCATION: Invalid event name \"VALUE\"\n\nto\n\n qemu-system-x86_64: LOCATION: invalid parameter value: VALUE\n\nSlight degradation, but the message is sub-par even before the patch.\nWhen complaining about a parameter value, both parameter name and\nvalue should be mentioned, as the value may well not be unique. Left\nfor another day.\n\nAlso left is the error message's unhelpful location: it points to the\nconfig=FILENAME rather than into that file.\n\nSigned-off-by: Marc-André Lureau \nMessage-Id: <20170822132255.23945-11-marcandre.lureau@redhat.com>\nReviewed-by: Markus Armbruster \n[Rebased, commit message rewritten]\nCc: Kevin Wolf \nCc: Max Reitz \nCc: qemu-block@nongnu.org\nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-8-git-send-email-armbru@redhat.com>\n---\n block/blkdebug.c | 28 ++++++++--------------------\n 1 file changed, 8 insertions(+), 20 deletions(-)","diff":"diff --git a/block/blkdebug.c b/block/blkdebug.c\nindex c19ab28f07..f1bbee9497 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -32,6 +32,7 @@\n #include \"qapi/qmp/qbool.h\"\n #include \"qapi/qmp/qdict.h\"\n #include \"qapi/qmp/qstring.h\"\n+#include \"qapi/util.h\"\n #include \"sysemu/qtest.h\"\n \n typedef struct BDRVBlkdebugState {\n@@ -149,20 +150,6 @@ static QemuOptsList *config_groups[] = {\n NULL\n };\n \n-static int get_event_by_name(const char *name, BlkdebugEvent *event)\n-{\n- int i;\n-\n- for (i = 0; i < BLKDBG__MAX; i++) {\n- if (!strcmp(BlkdebugEvent_lookup[i], name)) {\n- *event = i;\n- return 0;\n- }\n- }\n-\n- return -1;\n-}\n-\n struct add_rule_data {\n BDRVBlkdebugState *s;\n int action;\n@@ -173,7 +160,7 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp)\n struct add_rule_data *d = opaque;\n BDRVBlkdebugState *s = d->s;\n const char* event_name;\n- BlkdebugEvent event;\n+ int event;\n struct BlkdebugRule *rule;\n int64_t sector;\n \n@@ -182,8 +169,9 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp)\n if (!event_name) {\n error_setg(errp, \"Missing event name for rule\");\n return -1;\n- } else if (get_event_by_name(event_name, &event) < 0) {\n- error_setg(errp, \"Invalid event name \\\"%s\\\"\", event_name);\n+ }\n+ event = qapi_enum_parse(BlkdebugEvent_lookup, event_name, -1, errp);\n+ if (event < 0) {\n return -1;\n }\n \n@@ -743,13 +731,13 @@ static int blkdebug_debug_breakpoint(BlockDriverState *bs, const char *event,\n {\n BDRVBlkdebugState *s = bs->opaque;\n struct BlkdebugRule *rule;\n- BlkdebugEvent blkdebug_event;\n+ int blkdebug_event;\n \n- if (get_event_by_name(event, &blkdebug_event) < 0) {\n+ blkdebug_event = qapi_enum_parse(BlkdebugEvent_lookup, event, -1, NULL);\n+ if (blkdebug_event < 0) {\n return -ENOENT;\n }\n \n-\n rule = g_malloc(sizeof(*rule));\n *rule = (struct BlkdebugRule) {\n .event = blkdebug_event,\n","prefixes":["PULL","v2","38/47"]}