Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808767/?format=api
{ "id": 808767, "url": "http://patchwork.ozlabs.org/api/patches/808767/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-34-armbru@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-34-armbru@redhat.com>", "list_archive_url": null, "date": "2017-09-01T15:37:44", "name": "[PULL,v2,33/47] qapi: Drop superfluous qapi_enum_parse() parameter max", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1d89225d00dbea87e5d140d19474f588d91c2fc3", "submitter": { "id": 2645, "url": "http://patchwork.ozlabs.org/api/people/2645/?format=api", "name": "Markus Armbruster", "email": "armbru@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-34-armbru@redhat.com/mbox/", "series": [ { "id": 1049, "url": "http://patchwork.ozlabs.org/api/series/1049/?format=api", "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/808767/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808767/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.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 3xkPB060Ygz9s2G\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Sep 2017 02:01:28 +1000 (AEST)", "from localhost ([::1]:46589 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnoNq-0005GU-Tw\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:01:26 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51640)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1P-0006g2-S3\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 <armbru@redhat.com>) id 1dno1L-0001if-SB\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:15 -0400", "from mx1.redhat.com ([209.132.183.28]:41324)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1dno1L-0001hH-Fm\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -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 6D2AE3A265\n\tfor <qemu-devel@nongnu.org>; Fri, 1 Sep 2017 15:38:10 +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 E36CA17CFE\n\tfor <qemu-devel@nongnu.org>; Fri, 1 Sep 2017 15:38:09 +0000 (UTC)", "by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A48121132F42; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 6D2AE3A265", "From": "Markus Armbruster <armbru@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Fri, 1 Sep 2017 17:37:44 +0200", "Message-Id": "<20170901153758.8628-34-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.38]);\n\tFri, 01 Sep 2017 15:38:10 +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 33/47] qapi: Drop superfluous\n\tqapi_enum_parse() parameter max", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "The lookup tables have a sentinel, no need to make callers pass their\nsize.\n\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <1503564371-26090-3-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Eric Blake <eblake@redhat.com>\n[Rebased, commit message corrected]\n---\n block.c | 1 -\n block/file-posix.c | 7 +++----\n block/file-win32.c | 2 +-\n block/gluster.c | 6 ++----\n block/parallels.c | 3 ++-\n block/qcow2.c | 6 ++----\n blockdev.c | 1 -\n hmp.c | 2 +-\n include/qapi/util.h | 2 +-\n migration/global_state.c | 3 +--\n qapi/qapi-util.c | 4 ++--\n qemu-img.c | 3 +--\n qemu-nbd.c | 1 -\n tests/qmp-test.c | 3 +--\n tests/test-qapi-util.c | 15 +++++----------\n 15 files changed, 22 insertions(+), 37 deletions(-)", "diff": "diff --git a/block.c b/block.c\nindex 3308814bba..af48b0d26b 100644\n--- a/block.c\n+++ b/block.c\n@@ -1335,7 +1335,6 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,\n BlockdevDetectZeroesOptions value =\n qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,\n detect_zeroes,\n- BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,\n BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,\n &local_err);\n if (local_err) {\ndiff --git a/block/file-posix.c b/block/file-posix.c\nindex cb3bfce147..97e8a92e23 100644\n--- a/block/file-posix.c\n+++ b/block/file-posix.c\n@@ -439,7 +439,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,\n ? BLOCKDEV_AIO_OPTIONS_NATIVE\n : BLOCKDEV_AIO_OPTIONS_THREADS;\n aio = qapi_enum_parse(BlockdevAioOptions_lookup, qemu_opt_get(opts, \"aio\"),\n- BLOCKDEV_AIO_OPTIONS__MAX, aio_default, &local_err);\n+ aio_default, &local_err);\n if (local_err) {\n error_propagate(errp, local_err);\n ret = -EINVAL;\n@@ -448,7 +448,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,\n s->use_linux_aio = (aio == BLOCKDEV_AIO_OPTIONS_NATIVE);\n \n locking = qapi_enum_parse(OnOffAuto_lookup, qemu_opt_get(opts, \"locking\"),\n- ON_OFF_AUTO__MAX, ON_OFF_AUTO_AUTO, &local_err);\n+ ON_OFF_AUTO_AUTO, &local_err);\n if (local_err) {\n error_propagate(errp, local_err);\n ret = -EINVAL;\n@@ -1975,8 +1975,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp)\n nocow = qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false);\n buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);\n prealloc = qapi_enum_parse(PreallocMode_lookup, buf,\n- PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,\n- &local_err);\n+ PREALLOC_MODE_OFF, &local_err);\n g_free(buf);\n if (local_err) {\n error_propagate(errp, local_err);\ndiff --git a/block/file-win32.c b/block/file-win32.c\nindex 4706335cff..978d8058fe 100644\n--- a/block/file-win32.c\n+++ b/block/file-win32.c\n@@ -304,7 +304,7 @@ static bool get_aio_option(QemuOpts *opts, int flags, Error **errp)\n aio_default = (flags & BDRV_O_NATIVE_AIO) ? BLOCKDEV_AIO_OPTIONS_NATIVE\n : BLOCKDEV_AIO_OPTIONS_THREADS;\n aio = qapi_enum_parse(BlockdevAioOptions_lookup, qemu_opt_get(opts, \"aio\"),\n- BLOCKDEV_AIO_OPTIONS__MAX, aio_default, errp);\n+ aio_default, errp);\n \n switch (aio) {\n case BLOCKDEV_AIO_OPTIONS_NATIVE:\ndiff --git a/block/gluster.c b/block/gluster.c\nindex 3064a45047..8367e806d0 100644\n--- a/block/gluster.c\n+++ b/block/gluster.c\n@@ -544,8 +544,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,\n if (!strcmp(ptr, \"tcp\")) {\n ptr = \"inet\"; /* accept legacy \"tcp\" */\n }\n- type = qapi_enum_parse(SocketAddressType_lookup, ptr,\n- SOCKET_ADDRESS_TYPE__MAX, -1, NULL);\n+ type = qapi_enum_parse(SocketAddressType_lookup, ptr, -1, NULL);\n if (type != SOCKET_ADDRESS_TYPE_INET\n && type != SOCKET_ADDRESS_TYPE_UNIX) {\n error_setg(&local_err,\n@@ -1002,8 +1001,7 @@ static int qemu_gluster_create(const char *filename,\n BDRV_SECTOR_SIZE);\n \n tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);\n- prealloc = qapi_enum_parse(PreallocMode_lookup, tmp,\n- PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,\n+ prealloc = qapi_enum_parse(PreallocMode_lookup, tmp, PREALLOC_MODE_OFF,\n &local_err);\n g_free(tmp);\n if (local_err) {\ndiff --git a/block/parallels.c b/block/parallels.c\nindex e1e06d23cc..eb92366e51 100644\n--- a/block/parallels.c\n+++ b/block/parallels.c\n@@ -697,7 +697,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,\n s->prealloc_size = MAX(s->tracks, s->prealloc_size >> BDRV_SECTOR_BITS);\n buf = qemu_opt_get_del(opts, PARALLELS_OPT_PREALLOC_MODE);\n s->prealloc_mode = qapi_enum_parse(prealloc_mode_lookup, buf,\n- PRL_PREALLOC_MODE__MAX, PRL_PREALLOC_MODE_FALLOCATE, &local_err);\n+ PRL_PREALLOC_MODE_FALLOCATE,\n+ &local_err);\n g_free(buf);\n if (local_err != NULL) {\n goto fail_options;\ndiff --git a/block/qcow2.c b/block/qcow2.c\nindex a3679c69e8..470a0dedaa 100644\n--- a/block/qcow2.c\n+++ b/block/qcow2.c\n@@ -2917,8 +2917,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp)\n }\n buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);\n prealloc = qapi_enum_parse(PreallocMode_lookup, buf,\n- PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,\n- &local_err);\n+ PREALLOC_MODE_OFF, &local_err);\n if (local_err) {\n error_propagate(errp, local_err);\n ret = -EINVAL;\n@@ -3608,8 +3607,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,\n \n optstr = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);\n prealloc = qapi_enum_parse(PreallocMode_lookup, optstr,\n- PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,\n- &local_err);\n+ PREALLOC_MODE_OFF, &local_err);\n g_free(optstr);\n if (local_err) {\n goto err;\ndiff --git a/blockdev.c b/blockdev.c\nindex 02cd69bc21..722a61e3fb 100644\n--- a/blockdev.c\n+++ b/blockdev.c\n@@ -440,7 +440,6 @@ static void extract_common_blockdev_options(QemuOpts *opts, int *bdrv_flags,\n *detect_zeroes =\n qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,\n qemu_opt_get(opts, \"detect-zeroes\"),\n- BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,\n BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,\n &local_error);\n if (local_error) {\ndiff --git a/hmp.c b/hmp.c\nindex fd80dce758..03c1a783b6 100644\n--- a/hmp.c\n+++ b/hmp.c\n@@ -1742,7 +1742,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)\n if (read_only) {\n read_only_mode =\n qapi_enum_parse(BlockdevChangeReadOnlyMode_lookup,\n- read_only, BLOCKDEV_CHANGE_READ_ONLY_MODE__MAX,\n+ read_only,\n BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &err);\n if (err) {\n hmp_handle_error(mon, &err);\ndiff --git a/include/qapi/util.h b/include/qapi/util.h\nindex 7436ed815c..4eb8a3fe2f 100644\n--- a/include/qapi/util.h\n+++ b/include/qapi/util.h\n@@ -12,7 +12,7 @@\n #define QAPI_UTIL_H\n \n int qapi_enum_parse(const char * const lookup[], const char *buf,\n- int max, int def, Error **errp);\n+ int def, Error **errp);\n \n int parse_qapi_name(const char *name, bool complete);\n \ndiff --git a/migration/global_state.c b/migration/global_state.c\nindex dcbbcb28be..88c55f8cdb 100644\n--- a/migration/global_state.c\n+++ b/migration/global_state.c\n@@ -89,8 +89,7 @@ static int global_state_post_load(void *opaque, int version_id)\n s->received = true;\n trace_migrate_global_state_post_load(runstate);\n \n- r = qapi_enum_parse(RunState_lookup, runstate, RUN_STATE__MAX,\n- -1, &local_err);\n+ r = qapi_enum_parse(RunState_lookup, runstate, -1, &local_err);\n \n if (r == -1) {\n if (local_err) {\ndiff --git a/qapi/qapi-util.c b/qapi/qapi-util.c\nindex 46eda7d196..ee7594ff19 100644\n--- a/qapi/qapi-util.c\n+++ b/qapi/qapi-util.c\n@@ -16,7 +16,7 @@\n #include \"qapi/util.h\"\n \n int qapi_enum_parse(const char * const lookup[], const char *buf,\n- int max, int def, Error **errp)\n+ int def, Error **errp)\n {\n int i;\n \n@@ -24,7 +24,7 @@ int qapi_enum_parse(const char * const lookup[], const char *buf,\n return def;\n }\n \n- for (i = 0; i < max; i++) {\n+ for (i = 0; lookup[i]; i++) {\n if (!strcmp(buf, lookup[i])) {\n return i;\n }\ndiff --git a/qemu-img.c b/qemu-img.c\nindex 56ef49e214..611ab7ddf3 100644\n--- a/qemu-img.c\n+++ b/qemu-img.c\n@@ -3491,8 +3491,7 @@ static int img_resize(int argc, char **argv)\n break;\n case OPTION_PREALLOCATION:\n prealloc = qapi_enum_parse(PreallocMode_lookup, optarg,\n- PREALLOC_MODE__MAX, PREALLOC_MODE__MAX,\n- NULL);\n+ PREALLOC_MODE__MAX, NULL);\n if (prealloc == PREALLOC_MODE__MAX) {\n error_report(\"Invalid preallocation mode '%s'\", optarg);\n return 1;\ndiff --git a/qemu-nbd.c b/qemu-nbd.c\nindex 27164b8205..96e10d62dc 100644\n--- a/qemu-nbd.c\n+++ b/qemu-nbd.c\n@@ -641,7 +641,6 @@ int main(int argc, char **argv)\n detect_zeroes =\n qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,\n optarg,\n- BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,\n BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,\n &local_err);\n if (local_err) {\ndiff --git a/tests/qmp-test.c b/tests/qmp-test.c\nindex e5fb17c201..ec99814f79 100644\n--- a/tests/qmp-test.c\n+++ b/tests/qmp-test.c\n@@ -182,8 +182,7 @@ static void test_query(const void *data)\n } else {\n g_assert(error);\n g_assert_cmpint(qapi_enum_parse(QapiErrorClass_lookup, error_class,\n- QAPI_ERROR_CLASS__MAX, -1,\n- &error_abort),\n+ -1, &error_abort),\n ==, expected_error_class);\n }\n QDECREF(resp);\ndiff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c\nindex e8697577a5..d72ee8c4e7 100644\n--- a/tests/test-qapi-util.c\n+++ b/tests/test-qapi-util.c\n@@ -20,25 +20,20 @@ static void test_qapi_enum_parse(void)\n Error *err = NULL;\n int ret;\n \n- ret = qapi_enum_parse(QType_lookup, NULL, QTYPE__MAX, QTYPE_NONE,\n- &error_abort);\n+ ret = qapi_enum_parse(QType_lookup, NULL, QTYPE_NONE, &error_abort);\n g_assert_cmpint(ret, ==, QTYPE_NONE);\n \n- ret = qapi_enum_parse(QType_lookup, \"junk\", QTYPE__MAX, -1,\n- NULL);\n+ ret = qapi_enum_parse(QType_lookup, \"junk\", -1, NULL);\n g_assert_cmpint(ret, ==, -1);\n \n- ret = qapi_enum_parse(QType_lookup, \"junk\", QTYPE__MAX, -1,\n- &err);\n+ ret = qapi_enum_parse(QType_lookup, \"junk\", -1, &err);\n error_free_or_abort(&err);\n \n- ret = qapi_enum_parse(QType_lookup, \"none\", QTYPE__MAX, -1,\n- &error_abort);\n+ ret = qapi_enum_parse(QType_lookup, \"none\", -1, &error_abort);\n g_assert_cmpint(ret, ==, QTYPE_NONE);\n \n ret = qapi_enum_parse(QType_lookup, QType_lookup[QTYPE__MAX - 1],\n- QTYPE__MAX, QTYPE__MAX - 1,\n- &error_abort);\n+ QTYPE__MAX - 1, &error_abort);\n g_assert_cmpint(ret, ==, QTYPE__MAX - 1);\n }\n \n", "prefixes": [ "PULL", "v2", "33/47" ] }