From b36f34bd4cb6b5689237a02f2aca9b0f9bc10362 Mon Sep 17 00:00:00 2001
From: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Date: Tue, 17 Jul 2018 16:21:46 +0200
Subject: [PATCH] env_dpdk: force legacy-mem mode for DPDK 18.05

SPDK holds off with using the new dynamic memory allocation
mode just yet.

Change-Id: I75541135a020c691d981d2b16e7c9509b1cc57b1
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/419567
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/env_dpdk/init.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c
index f5858e44b..4a274328b 100644
--- a/lib/env_dpdk/init.c
+++ b/lib/env_dpdk/init.c
@@ -258,6 +258,14 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts)
 		}
 	}
 
+#if RTE_VERSION >= RTE_VERSION_NUM(18, 05, 0, 0)
+	/* SPDK holds off with using the new memory management model just yet */
+	args = spdk_push_arg(args, &argcount, _sprintf_alloc("--legacy-mem"));
+	if (args == NULL) {
+		return -1;
+	}
+#endif
+
 	if (opts->num_pci_addr) {
 		size_t i;
 		char bdf[32];