From 7d2a2f528c0d79ef2750cc6ccb57d7b1a2047e88 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Thu, 19 Jul 2018 12:55:44 -0700
Subject: [PATCH] build: Disable vhost/virtio if the user specifies an
 alternate env

Change-Id: Ife8b46f1448d71c245b9c853d0c2ebbf1896e5ab
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/419913
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
---
 configure | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure b/configure
index 775c017c7..b50cf77cd 100755
--- a/configure
+++ b/configure
@@ -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