git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/distributor: fix race conditions on shutdown
[dpdk.git]
/
usertools
/
dpdk-pmdinfo.py
diff --git
a/usertools/dpdk-pmdinfo.py
b/usertools/dpdk-pmdinfo.py
index
9d5c636
..
1661982
100755
(executable)
--- a/
usertools/dpdk-pmdinfo.py
+++ b/
usertools/dpdk-pmdinfo.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com>
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com>
@@
-7,8
+7,6
@@
# Utility to dump PMD_INFO_STRING support from an object file
#
# -------------------------------------------------------------------------
# Utility to dump PMD_INFO_STRING support from an object file
#
# -------------------------------------------------------------------------
-from __future__ import print_function
-from __future__ import unicode_literals
import json
import io
import os
import json
import io
import os
@@
-29,7
+27,6
@@
pcidb = None
# ===========================================
# ===========================================
-
class Vendor:
"""
Class for vendors. This is the top level class
class Vendor:
"""
Class for vendors. This is the top level class
@@
-561,7
+558,10
@@
def main(stream=None):
pcifile_default = "./pci.ids" # For unknown OS's assume local file
if platform.system() == 'Linux':
pcifile_default = "./pci.ids" # For unknown OS's assume local file
if platform.system() == 'Linux':
- pcifile_default = "/usr/share/hwdata/pci.ids"
+ # hwdata is the legacy location, misc is supported going forward
+ pcifile_default = "/usr/share/misc/pci.ids"
+ if not os.path.exists(pcifile_default):
+ pcifile_default = "/usr/share/hwdata/pci.ids"
elif platform.system() == 'FreeBSD':
pcifile_default = "/usr/local/share/pciids/pci.ids"
if not os.path.exists(pcifile_default):
elif platform.system() == 'FreeBSD':
pcifile_default = "/usr/local/share/pciids/pci.ids"
if not os.path.exists(pcifile_default):