Ignore iommu dir for finding VF PCI path
Change-Id: If53f8d81174ff244b19722cf8bc8520ef07327a7
diff --git a/VERSION b/VERSION
index e25d8d9..0664a8f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.5
+1.1.6
diff --git a/vfioveth b/vfioveth
index 028ef9b..7fb74a6 100644
--- a/vfioveth
+++ b/vfioveth
@@ -15,9 +15,9 @@
}
get_mac_with_vfpci() {
- local vfdir=$(find /sys/devices/pci* -name $1)
+ local vfdir=$(find /sys/devices/pci* -name $1 | grep -v iommu)
local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
- local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfdir=$(find /sys/devices/pci* -name $pf | grep -v iommu)
local pfName=$(ls $pfdir/net/ | head -1)
local idx=$(ls -l $pfdir | awk -v vf=$1 'substr($11,4)==vf {print substr($9,7)}')
local mac=$(ip link show dev $pfName | awk -v idx="$idx" '$1=="vf" && $2==idx {print substr($4,1,17)}')
@@ -26,9 +26,9 @@
add_vlan() {
vfpci=$(echo $CNI_CONF | jq -r '.deviceID')
- local vfdir=$(find /sys/devices/pci* -name $vfpci)
+ local vfdir=$(find /sys/devices/pci* -name $vfpci | grep -v iommu)
local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
- local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfdir=$(find /sys/devices/pci* -name $pf | grep -v iommu)
local pfName=$(ls $pfdir/net/ | head -1)
local idx=$(ls -l $pfdir | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')
@@ -68,9 +68,9 @@
delete_vlan() {
vfpci=$(echo $CNI_CONF | jq -r '.deviceID')
- local vfdir=$(find /sys/devices/pci* -name $vfpci)
+ local vfdir=$(find /sys/devices/pci* -name $vfpci | grep -v iommu)
local pf=$(readlink $vfdir/physfn | awk '{print substr($1,4)}')
- local pfdir=$(find /sys/devices/pci* -name $pf)
+ local pfdir=$(find /sys/devices/pci* -name $pf | grep -v iommu)
local pfName=$(ls $pfdir/net/ | head -1)
local idx=$(ls -l $pfdir | awk -v vf=$vfpci 'substr($11,4)==vf {print substr($9,7)}')