d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

env_dpdk: link dmadev if CONFIG_VHOST=y

Browse Source 
rte_dmadev was introduced in DPDK 21.11, and rte_vhost
is now dependent on it. So link rte_dmadev if we find
it and if CONFIG_VHOST is enabled.

Fixes issue #2374.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11594 (master)

(cherry picked from commit 662678dfbe)
Change-Id: Iccbf7cb897f51cbc9d545274d4d00a442b2fd353
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11637
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Jim Harris 2022-02-11 08:32:57 +00:00
parent 89f2df2030
commit bbb4826343
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/env_dpdk/env.mk
View File

@ -105,6 +105,11 @@ LINK_HASH=n
ifeq ($(CONFIG_VHOST),y) ifeq ($(CONFIG_VHOST),y)
DPDK_LIB_LIST += rte_vhost DPDK_LIB_LIST += rte_vhost
ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_dmadev.*))
# Introduced in DPDK 21.11, and rte_vhost became dependent on
# it shortly thereafter
DPDK_LIB_LIST += rte_dmadev
endif
LINK_HASH=y LINK_HASH=y
ifneq ($(DPDK_FRAMEWORK),y) ifneq ($(DPDK_FRAMEWORK),y)
DPDK_LIB_LIST += rte_cryptodev DPDK_LIB_LIST += rte_cryptodev
@ -122,6 +127,7 @@ DPDK_LIB_LIST += rte_rcu
endif endif
endif endif
DPDK_LIB_LIST_SORTED = $(sort $(DPDK_LIB_LIST)) DPDK_LIB_LIST_SORTED = $(sort $(DPDK_LIB_LIST))
DPDK_SHARED_LIB = $(DPDK_LIB_LIST_SORTED:%=$(DPDK_LIB_DIR)/lib%.so) DPDK_SHARED_LIB = $(DPDK_LIB_LIST_SORTED:%=$(DPDK_LIB_DIR)/lib%.so)