From a30d951ff2d4636161d43b0cde7261c7c4688ce9 Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Date: Thu, 7 Feb 2019 12:56:19 +0100
Subject: [PATCH] setup.sh: enhence some other log output

Change-Id: I25a5c048b0adf50a07a1b0d22988e26ff700fe0c
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/443764
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 scripts/setup.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index bd1cd693d..5b9024b73 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -140,6 +140,7 @@ function linux_unbind_driver() {
 	ven_dev_id=$(lspci -n -s $bdf | cut -d' ' -f3 | sed 's/:/ /')
 
 	if ! [ -e "/sys/bus/pci/devices/$bdf/driver" ]; then
+		pci_dev_echo "$bdf" "Can't unbind device as it is not using any driver."
 		return 0
 	fi
 
@@ -493,7 +494,7 @@ function status_linux {
 		else
 			name="-";
 		fi
-		echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t$driver\t\t$name";
+		echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t${driver:--}\t\t$name";
 	done
 
 	echo ""
@@ -509,7 +510,7 @@ function status_linux {
 			node=$(cat /sys/bus/pci/devices/$bdf/numa_node)
 			device=$(cat /sys/bus/pci/devices/$bdf/device)
 			vendor=$(cat /sys/bus/pci/devices/$bdf/vendor)
-			echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t$driver"
+			echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t${driver:--}"
 		done
 	done
 
@@ -528,7 +529,7 @@ function status_linux {
 			vendor=$(cat /sys/bus/pci/devices/$bdf/vendor)
 			blknames=''
 			get_virtio_names_from_bdf "$bdf" blknames
-			echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t\t$driver\t\t$blknames"
+			echo -e "$bdf\t${vendor#0x}\t${device#0x}\t$node\t\t${driver:--}\t\t$blknames"
 		done
 	done
 }