From 58938d09bf206d64b7441b4d637d28501dc3496f Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 20 Dec 2019 09:50:55 -0700 Subject: [PATCH] env_dpdk: fix DPDK 18.05 legacy-mem check In this case, we want to add --legacy-mem if it was not already specified. This means we need to check if strstr() returned NULL. Reported-by: Alok Kataria Signed-off-by: Jim Harris Change-Id: Ib99dd015ce6e3ee824e4b543a8379d7291e2671e Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478634 Reviewed-by: Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins Community-CI: SPDK CI Jenkins --- lib/env_dpdk/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c index 799ba2299..2ea09cc77 100644 --- a/lib/env_dpdk/init.c +++ b/lib/env_dpdk/init.c @@ -343,7 +343,7 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts) #if RTE_VERSION >= RTE_VERSION_NUM(18, 05, 0, 0) && RTE_VERSION < RTE_VERSION_NUM(18, 5, 1, 0) /* Dynamic memory management is buggy in DPDK 18.05.0. Don't use it. */ - if (!opts->env_context || strstr(opts->env_context, "--legacy-mem") != NULL) { + if (!opts->env_context || strstr(opts->env_context, "--legacy-mem") == NULL) { args = spdk_push_arg(args, &argcount, _sprintf_alloc("--legacy-mem")); if (args == NULL) { return -1;