From ddd71f939dd9b708d508df4e6c248ea1c38152c0 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 25 Nov 2020 21:05:09 +0000 Subject: [PATCH] env_dpdk: start using allow/block command line option pci-whitelist and pci-blacklist are deprecated, so use 'allow' and 'block' instead for DPDK versions that support it. Signed-off-by: Jim Harris Change-Id: I430f73fc402ca9fc07d004e719435e5b3dc963f9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5278 Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- lib/env_dpdk/init.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c index d5eaf050b..e3834fe86 100644 --- a/lib/env_dpdk/init.c +++ b/lib/env_dpdk/init.c @@ -52,6 +52,14 @@ #define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1" #define SPDK_ENV_DPDK_DEFAULT_BASE_VIRTADDR 0x200000000000 +#if RTE_VERSION < RTE_VERSION_NUM(20, 11, 0, 0) +#define DPDK_ALLOW_PARAM "--allow" +#define DPDK_BLOCK_PARAM "--block" +#else +#define DPDK_ALLOW_PARAM "--pci-whitelist" +#define DPDK_BLOCK_PARAM "--pci-blacklist" +#endif + static char **g_eal_cmdline; static int g_eal_cmdline_argcount; static bool g_external_init = true; @@ -345,7 +353,7 @@ build_eal_cmdline(const struct spdk_env_opts *opts) for (i = 0; i < opts->num_pci_addr; i++) { spdk_pci_addr_fmt(bdf, 32, &pci_addr[i]); args = push_arg(args, &argcount, _sprintf_alloc("%s=%s", - (opts->pci_blacklist ? "--pci-blacklist" : "--pci-whitelist"), + (opts->pci_blacklist ? DPDK_BLOCK_PARAM : DPDK_ALLOW_PARAM), bdf)); if (args == NULL) { return -1;