From f886e7d2a3abbbed38e1f13e2441b4c40e6a112c Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Tue, 11 Sep 2018 11:01:27 +0100 Subject: [PATCH] dpdk: fix dpdk runtime config file path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The config path was changed in DPDK by the commit 'adf1d86 eal: move runtime config file to new location’. As a result, the dpdk plugins won't be able to link to the DPDK primary application after this change. This commit adds a compile time check for the DPDK verison being used and sets the DPDK runtime config file location accordingly. Suggested-by: Michael Luo Signed-off-by: Kevin Laatz --- src/utils_dpdk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/utils_dpdk.c b/src/utils_dpdk.c index aee97917..3591eae1 100644 --- a/src/utils_dpdk.c +++ b/src/utils_dpdk.c @@ -43,7 +43,11 @@ #include "common.h" #include "utils_dpdk.h" +#if RTE_VERSION <= RTE_VERSION_NUM(18, 5, 0, 0) #define DPDK_DEFAULT_RTE_CONFIG "/var/run/.rte_config" +#else +#define DPDK_DEFAULT_RTE_CONFIG "/var/run/dpdk/rte/config" +#endif #define DPDK_EAL_ARGC 10 // Complete trace should fit into 1024 chars. Trace contain some headers // and text together with traced data from pipe. This is the reason why @@ -184,8 +188,13 @@ int dpdk_helper_eal_config_parse(dpdk_helper_ctx_t *phc, oconfig_item_t *ci) { status = cf_util_get_string_buffer(child, prefix, sizeof(prefix)); if (status == 0) { +#if RTE_VERSION <= RTE_VERSION_NUM(18, 5, 0, 0) snprintf(phc->eal_config.file_prefix, DATA_MAX_NAME_LEN, "/var/run/.%s_config", prefix); +#else + snprintf(phc->eal_config.file_prefix, DATA_MAX_NAME_LEN, + "/var/run/dpdk/%s/config", prefix); +#endif DEBUG("dpdk_common: EAL:File prefix %s", phc->eal_config.file_prefix); } } else if (strcasecmp("LogLevel", child->key) == 0) { -- 2.11.0