From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 3/7] eal: remove duplicate handling of white/black list
Date: Mon, 22 Sep 2014 10:37:57 +0200 [thread overview]
Message-ID: <1411375081-27986-4-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1411375081-27986-1-git-send-email-david.marchand@6wind.com>
We can handle both short and long options for those in the same case.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
lib/librte_eal/bsdapp/eal/eal.c | 18 ++----------------
lib/librte_eal/linuxapp/eal/eal.c | 18 ++----------------
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 7e9f3aa..8599a35 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -513,8 +513,8 @@ eal_parse_args(int argc, char **argv)
{OPT_PROC_TYPE, 1, 0, 0},
{OPT_FILE_PREFIX, 1, 0, 0},
{OPT_SOCKET_MEM, 1, 0, 0},
- {OPT_PCI_WHITELIST, 1, 0, 0},
- {OPT_PCI_BLACKLIST, 1, 0, 0},
+ {OPT_PCI_WHITELIST, 1, 0, 'w'},
+ {OPT_PCI_BLACKLIST, 1, 0, 'b'},
{OPT_VDEV, 1, 0, 0},
{OPT_SYSLOG, 1, NULL, 0},
{OPT_LOG_LEVEL, 1, NULL, 0},
@@ -629,20 +629,6 @@ eal_parse_args(int argc, char **argv)
else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) {
internal_config.process_type = eal_parse_proc_type(optarg);
}
- else if (!strcmp(lgopts[option_index].name, OPT_PCI_BLACKLIST)) {
- if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
- optarg) < 0) {
- eal_usage(prgname);
- return -1;
- }
- }
- else if (!strcmp(lgopts[option_index].name, OPT_PCI_WHITELIST)) {
- if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI,
- optarg) < 0) {
- eal_usage(prgname);
- return -1;
- }
- }
else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) {
if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL,
optarg) < 0) {
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index bf63744..655c454 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -718,8 +718,8 @@ eal_parse_args(int argc, char **argv)
{OPT_PROC_TYPE, 1, 0, 0},
{OPT_FILE_PREFIX, 1, 0, 0},
{OPT_SOCKET_MEM, 1, 0, 0},
- {OPT_PCI_WHITELIST, 1, 0, 0},
- {OPT_PCI_BLACKLIST, 1, 0, 0},
+ {OPT_PCI_WHITELIST, 1, 0, 'w'},
+ {OPT_PCI_BLACKLIST, 1, 0, 'b'},
{OPT_VDEV, 1, 0, 0},
{OPT_SYSLOG, 1, NULL, 0},
{OPT_LOG_LEVEL, 1, NULL, 0},
@@ -879,20 +879,6 @@ eal_parse_args(int argc, char **argv)
return -1;
}
}
- else if (!strcmp(lgopts[option_index].name, OPT_PCI_BLACKLIST)) {
- if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
- optarg) < 0) {
- eal_usage(prgname);
- return -1;
- }
- }
- else if (!strcmp(lgopts[option_index].name, OPT_PCI_WHITELIST)) {
- if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI,
- optarg) < 0) {
- eal_usage(prgname);
- return -1;
- }
- }
else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) {
if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL,
optarg) < 0) {
--
1.7.10.4
next prev parent reply other threads:[~2014-09-22 8:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 8:37 [dpdk-dev] [PATCH 0/7] cleanup option parsing in bsd/linux eal David Marchand
2014-09-22 8:37 ` [dpdk-dev] [PATCH 1/7] eal: remove unused --use-device option David Marchand
2014-09-22 12:22 ` Neil Horman
2014-09-22 13:49 ` David Marchand
2014-09-22 8:37 ` [dpdk-dev] [PATCH 2/7] eal: factorise unsupported option handling David Marchand
2014-09-22 8:37 ` David Marchand [this message]
2014-09-22 8:37 ` [dpdk-dev] [PATCH 4/7] eal: fix checkpatch issues before moving code David Marchand
2014-09-22 8:37 ` [dpdk-dev] [PATCH 5/7] eal: merge bsd and linux common options parsing David Marchand
2014-09-22 8:38 ` [dpdk-dev] [PATCH 6/7] eal: rework long " David Marchand
2014-09-22 12:42 ` Neil Horman
2014-09-22 8:38 ` [dpdk-dev] [PATCH 7/7] eal: indent files David Marchand
2014-09-22 12:43 ` [dpdk-dev] [PATCH 0/7] cleanup option parsing in bsd/linux eal Neil Horman
2014-09-23 15:37 ` Thomas Monjalon
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=1411375081-27986-4-git-send-email-david.marchand@6wind.com \
--to=david.marchand@6wind.com \
--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).