summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2016-08-08 08:16:56 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-08 08:16:56 +0000
commitb219f67de8e314e419108d9e15667c2cd2b973d1 (patch)
treecebc017e2af1f3744f7730f18d9cdff313ffc5ec
parent28b133e55f7bb8728c699b1e5db575c12dd01965 (diff)
parentbf3c82b37f22e592ca5b8969ef9526cd7725e93b (diff)
Merge "sriov: PCI IDs must be checked before usage"
-rwxr-xr-xvsperf6
1 files changed, 3 insertions, 3 deletions
diff --git a/vsperf b/vsperf
index f2f443be..d41b92f2 100755
--- a/vsperf
+++ b/vsperf
@@ -557,13 +557,13 @@ def main():
_LOGGER.error("Cannot specify tests with both positional args and --test.")
sys.exit(1)
- # sriov handling
- settings.setValue('SRIOV_ENABLED', enable_sriov(settings.getValue('WHITELIST_NICS')))
-
# modify NIC configuration to decode enhanced PCI IDs
wl_nics_orig = list(networkcard.check_pci(pci) for pci in settings.getValue('WHITELIST_NICS'))
settings.setValue('WHITELIST_NICS_ORIG', wl_nics_orig)
+ # sriov handling is performed on checked/expanded PCI IDs
+ settings.setValue('SRIOV_ENABLED', enable_sriov(wl_nics_orig))
+
nic_list = []
for nic in wl_nics_orig:
tmp_nic = networkcard.get_nic_info(nic)