Commit 58938d09 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

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: default avatarAlok Kataria <alok.kataria@nutanix.com>
Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ib99dd015ce6e3ee824e4b543a8379d7291e2671e

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478634


Reviewed-by: default avatar <alok.kataria@nutanix.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
parent 232756e1

lib/env_dpdk/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;