Replace pci-whitelist with pci-include and pci-blacklist with
pci-exclude. Allow the old options for now, but print a nag
warning since old options are deprecated.
The old -b and -w options will be removed in later release.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Luca Boccassi <bl...@debian.org>
---
lib/librte_eal/common/eal_common_options.c | 59 ++++++++++++++--------
lib/librte_eal/common/eal_options.h | 8 ++-
2 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index a5426e12346a..5b2e85aa5f08 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -51,18 +51,20 @@
const char
eal_short_options[] =
- "b:" /* pci-blacklist */
+ "b:" /* deprecated */
"c:" /* coremask */
"s:" /* service coremask */
"d:" /* driver */
"h" /* help */
+ "i:" /* pci-include */
"l:" /* corelist */
"S:" /* service corelist */
"m:" /* memory size */
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
- "w:" /* pci-whitelist */
+ "x:" /* pci-exclude */
+ "w:" /* deprecated */
;
const struct option
@@ -87,8 +89,8 @@ eal_long_options[] = {
{OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM },
{OPT_NO_SHCONF, 0, NULL, OPT_NO_SHCONF_NUM },
{OPT_IN_MEMORY, 0, NULL, OPT_IN_MEMORY_NUM },
- {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },
- {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },
+ {OPT_PCI_EXCLUDE, 1, NULL, OPT_PCI_EXCLUDE_NUM },
+ {OPT_PCI_INCLUDE, 1, NULL, OPT_PCI_INCLUDE_NUM },
{OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM },
{OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM },
{OPT_SOCKET_LIMIT, 1, NULL, OPT_SOCKET_LIMIT_NUM },
@@ -102,6 +104,11 @@ eal_long_options[] = {
{OPT_MATCH_ALLOCATIONS, 0, NULL, OPT_MATCH_ALLOCATIONS_NUM},
{OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM },
{OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
+
+ /* legacy options that will be removed in next LTS */
+ {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },
+ {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },
+
{0, 0, NULL, 0 }
};
@@ -1414,29 +1421,36 @@ int
eal_parse_common_option(int opt, const char *optarg,
struct internal_config *conf)
{
- static int b_used;
- static int w_used;
+ static bool x_used, i_used;
switch (opt) {
- /* blacklist */
+ /* deprecated option */
case 'b':
- if (w_used)
- goto bw_used;
- if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,
+ fprintf(stderr, "Option -b, --blacklist is deprecated, use -x,
--pci-exclude option instead\n");
+ /* fallthrough */
+ case 'x':
+ /* excluded list */
+ if (i_used)
+ goto include_exclude;
+ if (eal_option_device_add(RTE_DEVTYPE_BLOCKED_PCI,
optarg) < 0) {
return -1;
}
- b_used = 1;
+ x_used = true;
break;
- /* whitelist */
+
case 'w':
- if (b_used)
- goto bw_used;
- if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
+ fprintf(stderr, "Option -w, --whitelist is deprecated, use -i,
--pci-include option instead\n");
+ /* fallthrough */
+ case 'i':
+ /* include device list */
+ if (x_used)
+ goto include_exclude;
+ if (eal_option_device_add(RTE_DEVTYPE_ALLOWED_PCI,
optarg) < 0) {
return -1;
}
- w_used = 1;
+ i_used = true;
break;
/* coremask */
case 'c': {
@@ -1715,9 +1729,10 @@ eal_parse_common_option(int opt, const char *optarg,
}
return 0;
-bw_used:
- RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
- "cannot be used at the same time\n");
+
+include_exclude:
+ RTE_LOG(ERR, EAL,
+ "Options include (-i) and exclude (-x) can't be used at the
same time\n");
return -1;
}
@@ -1926,14 +1941,14 @@ eal_common_usage(void)
" -n CHANNELS Number of memory channels\n"
" -m MB Memory to allocate (see also
--"OPT_SOCKET_MEM")\n"
" -r RANKS Force number of memory ranks (don't
detect)\n"
- " -b, --"OPT_PCI_BLACKLIST" Add a PCI device in black list.\n"
+ " -x, --"OPT_PCI_EXCLUDE" Add a PCI device in excluded list.\n"
" Prevent EAL from using this PCI device.
The argument\n"
" format is <domain:bus:devid.func>.\n"
- " -w, --"OPT_PCI_WHITELIST" Add a PCI device in white list.\n"
+ " -i, --"OPT_PCI_INCLUDE" Add a PCI device in included list.\n"
" Only use the specified PCI devices. The
argument format\n"
" is <[domain:]bus:devid.func>. This option
can be present\n"
" several times (once per device).\n"
- " [NOTE: PCI whitelist cannot be used with
-b option]\n"
+ " [NOTE: " OPT_PCI_INCLUDE " cannot be used
with "OPT_PCI_EXCLUDE" option]\n"
" --"OPT_VDEV" Add a virtual device.\n"
" The argument format is
<driver><id>[,key=val,...]\n"
" (ex: --vdev=net_pcap0,iface=eth2).\n"
diff --git a/lib/librte_eal/common/eal_options.h
b/lib/librte_eal/common/eal_options.h
index 89769d48b487..c3c4d874122c 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -13,11 +13,17 @@ enum {
/* long options mapped to a short option */
#define OPT_HELP "help"
OPT_HELP_NUM = 'h',
+#define OPT_PCI_INCLUDE "pci-include"
+ OPT_PCI_INCLUDE_NUM = 'i',
+#define OPT_PCI_EXCLUDE "pci-exclude"
+ OPT_PCI_EXCLUDE_NUM = 'x',
+
+ /* legacy options that will be removed in next LTS */
#define OPT_PCI_BLACKLIST "pci-blacklist"
OPT_PCI_BLACKLIST_NUM = 'b',
#define OPT_PCI_WHITELIST "pci-whitelist"
OPT_PCI_WHITELIST_NUM = 'w',
-
+
/* first long only option value must be >= 256, so that we won't
* conflict with short options */
OPT_LONG_MIN_NUM = 256,
--
2.26.2
