From 183f492cd3bba890291bd7cfc79624dbc1fb2b01 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Tue, 7 Mar 2017 17:34:05 +0200 Subject: dpdk_setup_ports: fix vfio-pci always raising Change-Id: I523fb4e7df6c9bfb16984a0875a7085e505a6dd3 Signed-off-by: Yaroslav Brustinov --- scripts/dpdk_setup_ports.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/dpdk_setup_ports.py b/scripts/dpdk_setup_ports.py index de73fea1..3ec77fbf 100755 --- a/scripts/dpdk_setup_ports.py +++ b/scripts/dpdk_setup_ports.py @@ -505,15 +505,15 @@ Other network devices raise VFIOBindErr('Could not find file with Kernel boot parameters: %s' % krnl_params_file) with open(krnl_params_file) as f: krnl_params = f.read() - if 'iommu=' in krnl_params: - if 'vfio_pci' not in dpdk_nic_bind.get_loaded_modules(): - ret = os.system('modprobe vfio_pci') - if ret: - raise VFIOBindErr('Could not load vfio_pci') - ret = self.do_bind_all('vfio-pci', to_bind_list) + if 'iommu=' not in krnl_params: + raise VFIOBindErr('vfio-pci is not an option here') + if 'vfio_pci' not in dpdk_nic_bind.get_loaded_modules(): + ret = os.system('modprobe vfio_pci') if ret: - raise VFIOBindErr('Binding to vfio_pci failed') - raise VFIOBindErr('vfio-pci is not an option here') + raise VFIOBindErr('Could not load vfio_pci') + ret = self.do_bind_all('vfio-pci', to_bind_list) + if ret: + raise VFIOBindErr('Binding to vfio_pci failed') def pci_name_to_full_name (self,pci_name): -- cgit 1.2.3-korg