Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41587/?format=api
{ "id": 41587, "url": "http://patches.dpdk.org/api/patches/41587/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d8b8a524d06170ff360d8614049af3c16e321234.1530031921.git.gaetan.rivet@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<d8b8a524d06170ff360d8614049af3c16e321234.1530031921.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d8b8a524d06170ff360d8614049af3c16e321234.1530031921.git.gaetan.rivet@6wind.com", "date": "2018-06-26T16:56:04", "name": "[v8,01/21] devargs: add non-variadic parsing function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d2745ed1856cddf31687d43e7e52e6554803728f", "submitter": { "id": 269, "url": "http://patches.dpdk.org/api/people/269/?format=api", "name": "Gaëtan Rivet", "email": "gaetan.rivet@6wind.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d8b8a524d06170ff360d8614049af3c16e321234.1530031921.git.gaetan.rivet@6wind.com/mbox/", "series": [ { "id": 249, "url": "http://patches.dpdk.org/api/series/249/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=249", "date": "2018-06-26T16:56:03", "name": "Device querying", "version": 8, "mbox": "http://patches.dpdk.org/series/249/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41587/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/41587/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 259B81BDEB;\n\tTue, 26 Jun 2018 18:56:51 +0200 (CEST)", "from mail-wr0-f193.google.com (mail-wr0-f193.google.com\n\t[209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 4C6331BDDE\n\tfor <dev@dpdk.org>; Tue, 26 Jun 2018 18:56:48 +0200 (CEST)", "by mail-wr0-f193.google.com with SMTP id e18-v6so17976170wrs.5\n\tfor <dev@dpdk.org>; Tue, 26 Jun 2018 09:56:48 -0700 (PDT)", "from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tp5-v6sm2680880wre.83.2018.06.26.09.56.46\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Jun 2018 09:56:46 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:in-reply-to:references;\n\tbh=cmYNR272NrQQU/ClBRXU0Ogls9o1jmYrTFobQ2Nviak=;\n\tb=SWez8MWLh0tz0mGbhXDziXLjVEJ2yiGkXaLyx3hMHGNwIIVXz/TdhY4EOwUq2FYsDg\n\tL0GFWoDEjYmjAyXCRo12hjI2+PdykE7WtNw8S9g/S0aySQOtaJcW7xYeOrhBNCLR/7Oe\n\ttSV7BxqSO+yFHZ79A4CnYjmhUYTXlQ0GJRIdpyPRj6ETWkfCm9ibcdfflHyWPRPq+soE\n\thDQvO+LWs/NFFZbYSXLEa8X1FbPxe+xrUyizG+IY2IOt7aflDi4c3Ea38S+XoKG2+ZHV\n\tN9J8M6WRwTgEZUauVN4v1w3+UaYP08VpTcx9EZpBP+puxjAhlXUr328pCAAz0JcoEdbB\n\tw1kQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=cmYNR272NrQQU/ClBRXU0Ogls9o1jmYrTFobQ2Nviak=;\n\tb=j+MYE81qbPCeNbTCz0EuLrSSiiFh5CgoKmt3sklYJui2UsG1U5XSkXhryPhEA5UbJx\n\tYgydKnwiW+EMgYaRH6/pdUpKiwJXsy7bxcNjOvZuREPBhK+npIQwtrYXX9oTN8aRCnpO\n\tuE9NY0VMqX5aHQWGLuvcfGN8YxIQPLdjLbH+UyvbNIkGMMpaJvSoS4tAMxqOhUA98Ahp\n\tC0QX8Aooo/78DJczcrUh7g7iNjPWGRt2dEna8plyhe7j94teCUzgYALdcSYUYmPABLBE\n\tkSOge1goNh9qfQV04eyEQr6cp4v49mv41e21t4o/NA8AORiXDdVcjl7/AF1U6OqKBjaP\n\thhqg==", "X-Gm-Message-State": "APt69E0xSJNsDMlWTMW2xIYDcpiTnt9JVVmBN3O1y5Jiwj3wpcNWsnY6\n\trLJGi4YuoFnCODdMTJubXlSMcDUX", "X-Google-Smtp-Source": "AAOMgpcUNzI5xiTCYhwWegA62ixZrHIcXIiO4EVi4Ph44nbq7A3Koqrb0u4V0jGP5Pf0nQ+w+pHRRA==", "X-Received": "by 2002:adf:a963:: with SMTP id\n\tu90-v6mr986862wrc.248.1530032207509; \n\tTue, 26 Jun 2018 09:56:47 -0700 (PDT)", "From": "Gaetan Rivet <gaetan.rivet@6wind.com>", "To": "dev@dpdk.org", "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>", "Date": "Tue, 26 Jun 2018 18:56:04 +0200", "Message-Id": "<d8b8a524d06170ff360d8614049af3c16e321234.1530031921.git.gaetan.rivet@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": [ "<cover.1530031921.git.gaetan.rivet@6wind.com>", "<cover.1530031921.git.gaetan.rivet@6wind.com>" ], "References": [ "<cover.1521124599.git.gaetan.rivet@6wind.com>\n\t<cover.1530031921.git.gaetan.rivet@6wind.com>", "<cover.1530031921.git.gaetan.rivet@6wind.com>" ], "Subject": "[dpdk-dev] [PATCH v8 01/21] devargs: add non-variadic parsing\n\tfunction", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "rte_devargs_parse becomes non-variadic,\nrte_devargs_parsef becomes the variadic version, to be used to compose\ndevice strings.\n\nSigned-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n drivers/net/failsafe/failsafe_args.c | 2 +-\n drivers/net/failsafe/failsafe_eal.c | 2 +-\n lib/librte_eal/common/eal_common_dev.c | 4 +--\n lib/librte_eal/common/eal_common_devargs.c | 42 ++++++++++++++++++++++-------\n lib/librte_eal/common/include/rte_devargs.h | 40 +++++++++++++++++++++++++--\n lib/librte_eal/rte_eal_version.map | 1 +\n lib/librte_ethdev/rte_ethdev.c | 2 +-\n 7 files changed, 76 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c\nindex 2c002b164..626883ce2 100644\n--- a/drivers/net/failsafe/failsafe_args.c\n+++ b/drivers/net/failsafe/failsafe_args.c\n@@ -63,7 +63,7 @@ fs_parse_device(struct sub_device *sdev, char *args)\n \n \td = &sdev->devargs;\n \tDEBUG(\"%s\", args);\n-\tret = rte_devargs_parse(d, \"%s\", args);\n+\tret = rte_devargs_parse(d, args);\n \tif (ret) {\n \t\tDEBUG(\"devargs parsing failed with code %d\", ret);\n \t\treturn ret;\ndiff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c\nindex 5672f3961..ce1633f13 100644\n--- a/drivers/net/failsafe/failsafe_eal.c\n+++ b/drivers/net/failsafe/failsafe_eal.c\n@@ -86,7 +86,7 @@ fs_bus_init(struct rte_eth_dev *dev)\n \t\t\telse\n \t\t\t\tsnprintf(devstr, sizeof(devstr), \"%s\",\n \t\t\t\t\t rte_eth_devices[pid].device->name);\n-\t\t\tret = rte_devargs_parse(da, \"%s\", devstr);\n+\t\t\tret = rte_devargs_parse(da, devstr);\n \t\t\tif (ret) {\n \t\t\t\tERROR(\"Probed devargs parsing failed with code\"\n \t\t\t\t \" %d\", ret);\ndiff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c\nindex 61cb3b162..ce4b51469 100644\n--- a/lib/librte_eal/common/eal_common_dev.c\n+++ b/lib/librte_eal/common/eal_common_dev.c\n@@ -138,8 +138,8 @@ int __rte_experimental rte_eal_hotplug_add(const char *busname, const char *devn\n \tif (da == NULL)\n \t\treturn -ENOMEM;\n \n-\tret = rte_devargs_parse(da, \"%s:%s,%s\",\n-\t\t\t\t busname, devname, devargs);\n+\tret = rte_devargs_parsef(da, \"%s:%s,%s\",\n+\t\t\t\t busname, devname, devargs);\n \tif (ret)\n \t\tgoto err_devarg;\n \ndiff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c\nindex b0434158b..0a83beb94 100644\n--- a/lib/librte_eal/common/eal_common_devargs.c\n+++ b/lib/librte_eal/common/eal_common_devargs.c\n@@ -62,24 +62,18 @@ bus_name_cmp(const struct rte_bus *bus, const void *name)\n \treturn strncmp(bus->name, name, strlen(bus->name));\n }\n \n-int __rte_experimental\n-rte_devargs_parse(struct rte_devargs *da, const char *format, ...)\n+__rte_experimental\n+int\n+rte_devargs_parse(struct rte_devargs *da, const char *dev)\n {\n \tstruct rte_bus *bus = NULL;\n-\tva_list ap;\n-\tva_start(ap, format);\n-\tchar dev[vsnprintf(NULL, 0, format, ap) + 1];\n \tconst char *devname;\n \tconst size_t maxlen = sizeof(da->name);\n \tsize_t i;\n \n-\tva_end(ap);\n \tif (da == NULL)\n \t\treturn -EINVAL;\n \n-\tva_start(ap, format);\n-\tvsnprintf(dev, sizeof(dev), format, ap);\n-\tva_end(ap);\n \t/* Retrieve eventual bus info */\n \tdo {\n \t\tdevname = dev;\n@@ -124,6 +118,34 @@ rte_devargs_parse(struct rte_devargs *da, const char *format, ...)\n \treturn 0;\n }\n \n+__rte_experimental\n+int\n+rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)\n+{\n+\tva_list ap;\n+\tsize_t len;\n+\tchar *dev;\n+\n+\tif (da == NULL)\n+\t\treturn -EINVAL;\n+\n+\tva_start(ap, format);\n+\tlen = vsnprintf(NULL, 0, format, ap);\n+\tva_end(ap);\n+\n+\tdev = calloc(1, len + 1);\n+\tif (dev == NULL) {\n+\t\tfprintf(stderr, \"ERROR: not enough memory to parse device\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tva_start(ap, format);\n+\tvsnprintf(dev, len, format, ap);\n+\tva_end(ap);\n+\n+\treturn rte_devargs_parse(da, dev);\n+}\n+\n int __rte_experimental\n rte_devargs_insert(struct rte_devargs *da)\n {\n@@ -150,7 +172,7 @@ rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n \tif (devargs == NULL)\n \t\tgoto fail;\n \n-\tif (rte_devargs_parse(devargs, \"%s\", dev))\n+\tif (rte_devargs_parse(devargs, dev))\n \t\tgoto fail;\n \tdevargs->type = devtype;\n \tbus = devargs->bus;\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex 58fbd90a2..6c3b6326b 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -96,6 +96,42 @@ int rte_eal_parse_devargs_str(const char *devargs_str,\n * in argument. Store which bus will handle the device, its name\n * and the eventual device parameters.\n *\n+ * The syntax is:\n+ *\n+ * bus:device_identifier,arg1=val1,arg2=val2\n+ *\n+ * where \"bus:\" is the bus name followed by any character separator.\n+ * The bus name is optional. If no bus name is specified, each bus\n+ * will attempt to recognize the device identifier. The first one\n+ * to succeed will be used.\n+ *\n+ * Examples:\n+ *\n+ * pci:0000:05.00.0,arg=val\n+ * 05.00.0,arg=val\n+ * vdev:net_ring0\n+ *\n+ * @param da\n+ * The devargs structure holding the device information.\n+ *\n+ * @param dev\n+ * String describing a device.\n+ *\n+ * @return\n+ * - 0 on success.\n+ * - Negative errno on error.\n+ */\n+__rte_experimental\n+int\n+rte_devargs_parse(struct rte_devargs *da, const char *dev);\n+\n+/**\n+ * Parse a device string.\n+ *\n+ * Verify that a bus is capable of handling the device passed\n+ * in argument. Store which bus will handle the device, its name\n+ * and the eventual device parameters.\n+ *\n * The device string is built with a printf-like syntax.\n *\n * The syntax is:\n@@ -124,8 +160,8 @@ int rte_eal_parse_devargs_str(const char *devargs_str,\n */\n __rte_experimental\n int\n-rte_devargs_parse(struct rte_devargs *da,\n-\t\t const char *format, ...)\n+rte_devargs_parsef(struct rte_devargs *da,\n+\t\t const char *format, ...)\n __attribute__((format(printf, 2, 0)));\n \n /**\ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex f7dd0e7bc..1c4db72fa 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -254,6 +254,7 @@ EXPERIMENTAL {\n \trte_devargs_insert;\n \trte_devargs_next;\n \trte_devargs_parse;\n+\trte_devargs_parsef;\n \trte_devargs_remove;\n \trte_devargs_type_count;\n \trte_eal_cleanup;\ndiff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c\nindex a9977df97..cce20d9ae 100644\n--- a/lib/librte_ethdev/rte_ethdev.c\n+++ b/lib/librte_ethdev/rte_ethdev.c\n@@ -654,7 +654,7 @@ rte_eth_dev_attach(const char *devargs, uint16_t *port_id)\n \t}\n \n \t/* parse devargs */\n-\tif (rte_devargs_parse(&da, \"%s\", devargs))\n+\tif (rte_devargs_parse(&da, devargs))\n \t\tgoto err;\n \n \tret = rte_eal_hotplug_add(da.bus->name, da.name, da.args);\n", "prefixes": [ "v8", "01/21" ] }