X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=tools%2Fsetup.sh;h=faa5eeee18f89a11c57a4f3b52a133de30941d65;hb=948fd64befc3;hp=ac438c2b846cfbd21155f0a2095a46b1d09de69d;hpb=83246086ab6efc93ecdebeef1ec018970e2aa9fc;p=dpdk.git

diff --git a/tools/setup.sh b/tools/setup.sh
index ac438c2b84..faa5eeee18 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -57,6 +57,12 @@ quit()
 	QUIT=$1
 }
 
+# Shortcut for quit.
+q()
+{
+	quit
+}
+
 #
 # Sets up environmental variables for ICC.
 #
@@ -104,14 +110,6 @@ setup_target()
 	echo "------------------------------------------------------------------------------"
 }
 
-#
-# Uninstall all targets.
-#
-uninstall_targets()
-{
-	make uninstall
-}
-
 #
 # Creates hugepage filesystem.
 #
@@ -427,16 +425,16 @@ grep_meminfo()
 #
 show_nics()
 {
-	if  /sbin/lsmod  | grep -q igb_uio ; then
+	if  /sbin/lsmod | grep -q -e igb_uio -e vfio_pci; then
 		${RTE_SDK}/tools/dpdk_nic_bind.py --status
 	else
-		echo "# Please load the 'igb_uio' kernel module before querying or "
-		echo "# adjusting NIC device bindings"
+		echo "# Please load the 'igb_uio' or 'vfio-pci' kernel module before "
+		echo "# querying or adjusting NIC device bindings"
 	fi
 }
 
 #
-# Uses dpdk_nic_bind.py to move devices to work with igb_uio
+# Uses dpdk_nic_bind.py to move devices to work with vfio-pci
 #
 bind_nics_to_vfio()
 {
@@ -477,7 +475,7 @@ unbind_nics()
 {
 	${RTE_SDK}/tools/dpdk_nic_bind.py --status
 	echo ""
-	echo -n "Enter PCI address of device to bind to IGB UIO driver: "
+	echo -n "Enter PCI address of device to unbind: "
 	read PCI_PATH
 	echo ""
 	echo -n "Enter name of kernel driver to bind the device to: "
@@ -571,23 +569,20 @@ step5_func()
 {
 	TITLE="Uninstall and system cleanup"
 
-	TEXT[1]="Uninstall all targets"
-	FUNC[1]="uninstall_targets"
-
-	TEXT[2]="Unbind NICs from IGB UIO driver"
-	FUNC[2]="unbind_nics"
+	TEXT[1]="Unbind NICs from IGB UIO or VFIO driver"
+	FUNC[1]="unbind_nics"
 
-	TEXT[3]="Remove IGB UIO module"
-	FUNC[3]="remove_igb_uio_module"
+	TEXT[2]="Remove IGB UIO module"
+	FUNC[2]="remove_igb_uio_module"
 
-	TEXT[4]="Remove VFIO module"
-	FUNC[4]="remove_vfio_module"
+	TEXT[3]="Remove VFIO module"
+	FUNC[3]="remove_vfio_module"
 
-	TEXT[5]="Remove KNI module"
-	FUNC[5]="remove_kni_module"
+	TEXT[4]="Remove KNI module"
+	FUNC[4]="remove_kni_module"
 
-	TEXT[6]="Remove hugepage mappings"
-	FUNC[6]="clear_huge_pages"
+	TEXT[5]="Remove hugepage mappings"
+	FUNC[5]="clear_huge_pages"
 }
 
 STEPS[1]="step1_func"
@@ -628,6 +623,10 @@ while [ "$QUIT" == "0" ]; do
 	read our_entry
 	echo ""
 	${OPTIONS[our_entry]} ${our_entry}
-	echo
-	echo -n "Press enter to continue ..."; read
+
+	if [ "$QUIT" == "0" ] ; then
+		echo
+		echo -n "Press enter to continue ..."; read
+	fi
+
 done