From: Jan Blunck <jblunck@infradead.org>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 08/15] devargs: use existing functions in rte_eal_devargs_parse()
Date: Fri, 14 Jul 2017 17:12:06 -0400 [thread overview]
Message-ID: <20170714211213.34436-9-jblunck@infradead.org> (raw)
In-Reply-To: <20170714211213.34436-1-jblunck@infradead.org>
This fixes the newly introduces rte_eal_devargs_parse() to make use of:
- snprintf() instead of open coding a while() loop
- rte_eal_parse_devargs_str() instead of duplicating parsing code
- RTE_LOG() instead of direct output to stderr
Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
lib/librte_eal/common/eal_common_devargs.c | 57 +++++++++++++++---------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 205fabb95..b5273287e 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -87,54 +87,53 @@ int
rte_eal_devargs_parse(const char *dev, struct rte_devargs *da)
{
struct rte_bus *bus = NULL;
- const char *devname;
- const size_t maxlen = sizeof(da->name);
- size_t i;
+ char *devname = NULL, *drvargs = NULL;
+ int ret;
if (dev == NULL || da == NULL)
return -EINVAL;
/* Retrieve eventual bus info */
do {
- devname = dev;
bus = rte_bus_find(bus, bus_name_cmp, dev);
if (bus == NULL)
break;
- devname = dev + strlen(bus->name) + 1;
- if (rte_bus_find_by_device_name(devname) == bus)
+ dev += strlen(bus->name) + 1;
+ if (rte_bus_find_by_device_name(dev) == bus)
break;
} while (1);
+
+ ret = rte_eal_parse_devargs_str(dev, &devname, &drvargs);
+ if (ret != 0)
+ return ret;
+
/* Store device name */
- i = 0;
- while (devname[i] != '\0' && devname[i] != ',') {
- da->name[i] = devname[i];
- i++;
- if (i == maxlen) {
- fprintf(stderr, "WARNING: Parsing \"%s\": device name should be shorter than %zu\n",
- dev, maxlen);
- da->name[i - 1] = '\0';
- return -EINVAL;
- }
+ ret = snprintf(da->name, sizeof(da->name), "%s", devname);
+ if (ret < 0 || ret >= (int)sizeof(da->name)) {
+ RTE_LOG(ERR, EAL, "Invalid device name: \"%s\"\n", devname);
+ ret = -EINVAL;
+ goto fail;
}
- da->name[i] = '\0';
+
+ /* Store drivers arguments */
+ da->args = drvargs;
+ drvargs = NULL;
+
if (bus == NULL) {
bus = rte_bus_find_by_device_name(da->name);
if (bus == NULL) {
- fprintf(stderr, "ERROR: failed to parse device \"%s\"\n",
+ RTE_LOG(ERR, EAL, "Failed to parse device: \"%s\"\n",
da->name);
- return -EFAULT;
+ ret = -EFAULT;
+ goto fail;
}
}
da->bus = bus;
- /* Parse eventual device arguments */
- if (devname[i] == ',')
- da->args = strdup(&devname[i + 1]);
- else
- da->args = strdup("");
- if (da->args == NULL) {
- fprintf(stderr, "ERROR: not enough memory to parse arguments\n");
- return -ENOMEM;
- }
- return 0;
+ ret = 0;
+
+fail:
+ free(devname);
+ free(drvargs);
+ return ret;
}
static const struct rte_bus_conf BUS_CONF_WHITELIST = {
--
2.13.2
next prev parent reply other threads:[~2017-07-14 21:12 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-11 23:24 [dpdk-dev] [PATCH 00/13] devargs fixes Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 01/13] Revert "devargs: make device types generic" Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 02/13] devargs: fix unittest Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 03/13] devargs: deprecate enum rte_devtype based functions Jan Blunck
2017-08-07 23:02 ` Thomas Monjalon
2017-07-11 23:25 ` [dpdk-dev] [PATCH 04/13] pci: use scan_mode configuration Jan Blunck
2017-07-13 17:59 ` Gaëtan Rivet
2017-07-13 19:42 ` Jan Blunck
2017-07-13 20:48 ` Thomas Monjalon
2017-07-11 23:25 ` [dpdk-dev] [PATCH 05/13] bus: add configuration interface for buses Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 06/13] devargs: use bus configuration interface to set scanning mode Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 07/13] devargs: add busname string field Jan Blunck
2017-07-13 13:17 ` Gaëtan Rivet
2017-07-11 23:25 ` [dpdk-dev] [PATCH 08/13] devargs: use busname Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 09/13] devargs: parse "bus=" argument Jan Blunck
2017-07-13 13:40 ` Gaëtan Rivet
2017-07-13 19:34 ` Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 10/13] pci: use busname Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 11/13] vdev: " Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 12/13] devargs: remove type field Jan Blunck
2017-07-11 23:25 ` [dpdk-dev] [PATCH 13/13] devargs: remove bus field Jan Blunck
2017-07-12 7:29 ` [dpdk-dev] [PATCH 00/13] devargs fixes Thomas Monjalon
2017-07-12 8:09 ` Jan Blunck
2017-07-12 8:50 ` Thomas Monjalon
2017-07-12 9:25 ` Jan Blunck
2017-07-14 21:11 ` [dpdk-dev] [PATCH v2 00/15] " Jan Blunck
2017-07-14 21:11 ` [dpdk-dev] [PATCH v2 01/15] Revert "devargs: make device types generic" Jan Blunck
2017-09-04 16:05 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 02/15] devargs: fix unittest Jan Blunck
2017-09-04 16:05 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 03/15] devargs: extend unittest Jan Blunck
2017-09-04 16:05 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 04/15] devargs: deprecate enum rte_devtype based functions Jan Blunck
2017-09-04 16:06 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 05/15] pci: use scan_mode configuration Jan Blunck
2017-09-04 16:22 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 06/15] bus: add configuration interface for buses Jan Blunck
2017-09-04 16:23 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 07/15] devargs: use bus configuration interface to set scanning mode Jan Blunck
2017-07-14 21:12 ` Jan Blunck [this message]
2017-09-04 16:24 ` [dpdk-dev] [PATCH v2 08/15] devargs: use existing functions in rte_eal_devargs_parse() Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 09/15] devargs: add busname string field Jan Blunck
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 10/15] devargs: use busname Jan Blunck
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 11/15] pci: " Jan Blunck
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 12/15] vdev: " Jan Blunck
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 13/15] devargs: pass busname argument when parsing Jan Blunck
2017-07-15 14:48 ` Gaëtan Rivet
2017-09-04 16:28 ` Ferruh Yigit
2017-09-04 16:28 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 14/15] devargs: remove type field Jan Blunck
2017-09-04 16:29 ` Ferruh Yigit
2017-07-14 21:12 ` [dpdk-dev] [PATCH v2 15/15] devargs: remove bus field Jan Blunck
2017-07-15 18:20 ` [dpdk-dev] [PATCH v2 00/15] devargs fixes Thomas Monjalon
2017-09-04 16:04 ` Ferruh Yigit
2017-09-05 8:20 ` Gaëtan Rivet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170714211213.34436-9-jblunck@infradead.org \
--to=jblunck@infradead.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).