[dts] [PATCH V1 3/5]framework/project_dpdk: update method setup_modules_linux for vfio-pci in vm

[Xiao Qimai]

Signed-off-by: Xiao Qimai <qimaix.xiao at intel.com>
---
 framework/project_dpdk.py | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index e8b5d0f..b8cb2bd 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -101,25 +101,15 @@ class DPDKdut(Dut):
 
     def setup_modules_linux(self, target, drivername, drivermode):
         if drivername == "vfio-pci":
-            if 'VirtDut' in str(self.__class__):
-                self.send_expect("modprobe -r vfio_iommu_type1", "#")
-                self.send_expect("modprobe -r vfio", "#")
-                self.send_expect("modprobe vfio enable_unsafe_noiommu_mode=1", "#")
-                self.send_expect("modprobe vfio-pci", "#")
-            else:
-                self.send_expect("rmmod vfio_pci", "#", 70)
-                self.send_expect("rmmod vfio_iommu_type1", "#", 70)
-                self.send_expect("rmmod vfio", "#", 70)
-                self.send_expect("modprobe vfio", "#", 70)
-                self.send_expect("modprobe vfio-pci", "#", 70)
-            out = self.send_expect("lsmod | grep vfio_iommu_type1", "#")
-            if not out:
-                out = self.send_expect("ls /sys/module |grep vfio_pci", "#")
-            assert ("vfio_pci" in out), "Failed to insmod vfio_pci"
-
-
+            self.send_expect("rmmod vfio_pci", "#")
+            self.send_expect("rmmod vfio_iommu_type1", "#")
+            self.send_expect("rmmod vfio", "#")
+            self.send_expect("modprobe vfio", "#")
+            self.send_expect("modprobe vfio-pci", "#")
             if drivermode == "noiommu":
-                self.send_expect("echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode", "#", 70)
+                self.send_expect("echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode", "#")
+            out = self.send_expect("ls /sys/module|grep vfio_pci", "#")
+            assert ("vfio_pci" in out), "load vfio_pci failed"
 
         elif drivername == "uio_pci_generic":
             self.send_expect("modprobe uio", "#", 70)
-- 
1.8.3.1