Commit 7d2a2f52 authored by Ben Walker's avatar Ben Walker
Browse files

build: Disable vhost/virtio if the user specifies an alternate env



Change-Id: Ife8b46f1448d71c245b9c853d0c2ebbf1896e5ab
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/419913


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 3c849a4d
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -245,6 +245,17 @@ if [ -z "$CONFIG_ENV" ]; then
		fi
		CONFIG_DPDK_DIR="$rootdir"/dpdk/build
	fi
else
	if [ "$CONFIG_VHOST" = "y" ]; then
		echo "Vhost is only supported when using the default DPDK environment. Disabling it."
	fi
	# Always disable vhost, but only print the error message if the user explicitly turned it on.
	CONFIG_VHOST="n"
	if [ "$CONFIG_VIRTIO" = "y" ]; then
		echo "Virtio is only supported when using the default DPDK environment. Disabling it."
	fi
	# Always disable virtio, but only print the error message if the user explicitly turned it on.
	CONFIG_VIRTIO="n"
fi

if [ "$CONFIG_FIO_PLUGIN" = "y" ]; then