Commit b4916f9f authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

configure: do not check for > DPDK 19.05 to enable vhost



SPDK supports two latest DPDK LTS releases and DPDK 20.11
is out now.

Remove all functionality and checks for versions <= DPDK 19.11.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Icc3e2ca15f536effc865c82637bf7f2960d5c11b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5346


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 75e8c5f2
Loading
Loading
Loading
Loading
+0 −23
Original line number Diff line number Diff line
@@ -490,29 +490,6 @@ if [ -z "${CONFIG[ENV]}" ]; then
			CONFIG[DPDK_DIR]="${rootdir}/dpdk/build"
			echo "Using default DPDK in ${CONFIG[DPDK_DIR]}"
		fi

		if [ "${CONFIG[VHOST]}" = "y" ]; then
			# We lookup "common_linux" file to check if DPDK version is >= 19.05.
			# "common_linux" is available since exactly DPDK 19.05 - it was renamed
			# from "common_linuxapp".
			if [ ! -f "$rootdir"/dpdk/config/common_linux ]; then
				echo "ERROR: Vhost only supports DPDK >= 19.05. Please use newer DPDK or disable vhost library --without-vhost."
				exit 1
			fi
		fi
	else
		if [ "${CONFIG[VHOST]}" = "y" ]; then
			# DPDK must be already built, so we can simply try to use the new rte_vhost.
			# It has a number of internal dependencies though, so don't try to link the
			# program, just compile it
			if ! echo -e '#include <rte_vhost.h>\n' \
				'int main(void) { return rte_vhost_extern_callback_register(0, NULL, NULL); }\n' \
				| ${BUILD_CMD[@]} -c -Wno-deprecated-declarations -Werror \
				-I"${CONFIG[DPDK_DIR]}/include" - &>/dev/null; then
				echo "ERROR: Vhost only supports DPDK >= 19.05. Please use newer DPDK or disable vhost library --without-vhost."
				exit 1
			fi
		fi
	fi
else
	if [ -n "${CONFIG[DPDK_DIR]}" ]; then