fix pci.py
PATCH 1/1 fix pci.py
hi,
this patch adds support for older pciutils without -vmm option, and improves error handling in get_info_from_lspci().
see the test case and test result for detail.
thanks,
zhigang
share/tmp/pci.py renamed from pci.py +18 -13
@@ -221,11 +221,16 @@ def _create_lspci_info(): for paragraph in os.popen(LSPCI_CMD + ' -vmm').read().split('\n\n'): device_name = None device_info = {} + # FIXME: workaround for pciutils without the -mm option. + # see: git://git.kernel.org/pub/scm/utils/pciutils/pciutils.git + # commit: 3fd6b4d2e2fda814047664ffc67448ac782a8089 + first_device = True for line in paragraph.split('\n'): try: (opt, value) = line.split(':\t') - if opt == 'Slot': + if opt == 'Slot' or (opt == 'Device' and first_device): device_name = PCI_DEV_FORMAT_STR % parse_pci_name(value) + first_device = False else: device_info[opt] = value except:
@@ -979,18 +984,18 @@ class PciDevice: if lspci_info is None: _create_lspci_info() - try: - device_info = lspci_info[self.name] - self.revision = int(device_info['Rev'], 16) - self.vendorname = device_info['Vendor'] - self.devicename = device_info['Device'] - self.classname = device_info['Class'] - self.subvendorname = device_info['SVendor'] - self.subdevicename = device_info['SDevice'] - except KeyError: - pass - - return True + device_info = lspci_info.get(self.name) + if device_info: + try: + self.revision = int(device_info.get('Rev', '0'), 16) + except ValueError: + pass + self.vendorname = device_info.get('Vendor', '') + self.devicename = device_info.get('Device', '') + self.classname = device_info.get('Class', '') + self.subvendorname = device_info.get('SVendor', '') + self.subdevicename = device_info.get('SDevice', '') + return True finally: lspci_info_lock.release()
#!/usr/bin/env python
from pprint import pprint
from xen.util import pci
def pciinfo():
info = {}
for dev in pci.get_all_pci_devices():
dev_info = {
"vendor_id": "0x%04x" % dev.vendor,
"vendor_name": dev.vendorname,
"device_id": "0x%04x" % dev.device,
"device_name": dev.devicename,
"revision_id": "0x%02x" % dev.revision,
"class_code": "0x%x" % dev.classcode,
"class_name": dev.classname,
"subsystem_vendor_id": "0x%04x" % dev.subvendor,
"subsystem_vendor_name": dev.subvendorname,
"subsystem_id": dev.subdevice,
"subsystem_name": dev.subdevicename,
"iomem": dev.iomem,
"ioports": dev.ioports,
"irq": dev.irq,
"driver": dev.driver}
info[dev.name] = dev_info
return infopprint(pciinfo())
{'0000:00:00.0': {'class_code': '0x60000',
'class_name': 'Host bridge',
'device_id': '0x2990',
'device_name': '82Q963/Q965 Memory Controller Hub',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:01.0': {'class_code': '0x60400',
'class_name': 'PCI bridge',
'device_id': '0x2991',
'device_name': '82Q963/Q965 PCI Express Root Port',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1279,
'revision_id': '0x02',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:02.0': {'class_code': '0x30000',
'class_name': 'VGA compatible controller',
'device_id': '0x2992',
'device_name': '82Q963/Q965 Integrated Graphics Controller',
'driver': '',
'iomem': [(3755999232L, 1048576L),
(3221225472L, 268435456L)],
'ioports': [(60600, 8)],
'irq': 11,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:02.1': {'class_code': '0x38000',
'class_name': 'Display controller',
'device_id': '0x2993',
'device_name': '82Q963/Q965 Integrated Graphics Controller',
'driver': '',
'iomem': [(3757047808L, 1048576L)],
'ioports': [],
'irq': 0,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1a.0': {'class_code': '0xc0300',
'class_name': 'USB Controller',
'device_id': '0x2834',
'device_name': '82801H (ICH8 Family) USB UHCI #4',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65312, 32)],
'irq': 16,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1a.1': {'class_code': '0xc0300',
'class_name': 'USB Controller',
'device_id': '0x2835',
'device_name': '82801H (ICH8 Family) USB UHCI #5',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65280, 32)],
'irq': 17,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1a.7': {'class_code': '0xc0320',
'class_name': 'USB Controller',
'device_id': '0x283a',
'device_name': '82801H (ICH8 Family) USB2 EHCI #2',
'driver': 'ehci_hcd',
'iomem': [(3755981824L, 1024L)],
'ioports': [],
'irq': 20,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1b.0': {'class_code': '0x40300',
'class_name': 'Audio device',
'device_id': '0x284b',
'device_name': '82801H (ICH8 Family) HD Audio Controller',
'driver': 'HDA Intel',
'iomem': [(3755982848L, 16384L)],
'ioports': [],
'irq': 16,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1c.0': {'class_code': '0x60400',
'class_name': 'PCI bridge',
'device_id': '0x283f',
'device_name': '82801H (ICH8 Family) PCI Express Port 1',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1278,
'revision_id': '0x02',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1c.4': {'class_code': '0x60400',
'class_name': 'PCI bridge',
'device_id': '0x2847',
'device_name': '82801H (ICH8 Family) PCI Express Port 5',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1277,
'revision_id': '0x02',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1d.0': {'class_code': '0xc0300',
'class_name': 'USB Controller',
'device_id': '0x2830',
'device_name': '82801H (ICH8 Family) USB UHCI #1',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65408, 32)],
'irq': 18,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1d.1': {'class_code': '0xc0300',
'class_name': 'USB Controller',
'device_id': '0x2831',
'device_name': '82801H (ICH8 Family) USB UHCI #2',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65376, 32)],
'irq': 17,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1d.2': {'class_code': '0xc0300',
'class_name': 'USB Controller',
'device_id': '0x2832',
'device_name': '82801H (ICH8 Family) USB UHCI #3',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65344, 32)],
'irq': 19,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1d.7': {'class_code': '0xc0320',
'class_name': 'USB Controller',
'device_id': '0x2836',
'device_name': '82801H (ICH8 Family) USB2 EHCI #1',
'driver': 'ehci_hcd',
'iomem': [(4288153600L, 1024L)],
'ioports': [],
'irq': 18,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1e.0': {'class_code': '0x60401',
'class_name': 'PCI bridge',
'device_id': '0x244e',
'device_name': '82801 PCI Bridge',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0xf2',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1f.0': {'class_code': '0x60100',
'class_name': 'ISA bridge',
'device_id': '0x2810',
'device_name': '82801HB/HR (ICH8/R) LPC Interface Controller',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0x02',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1f.2': {'class_code': '0x1018a',
'class_name': 'IDE interface',
'device_id': '0x2820',
'device_name': '82801H (ICH8 Family) 4 port SATA IDE Controller',
'driver': '',
'iomem': [],
'ioports': [(65216, 16), (60608, 16)],
'irq': 21,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1f.3': {'class_code': '0xc0500',
'class_name': 'SMBus',
'device_id': '0x283e',
'device_name': '82801H (ICH8 Family) SMBus Controller',
'driver': 'i801_smbus',
'iomem': [(3755981568L, 256L)],
'ioports': [(60640, 32)],
'irq': 21,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:00:1f.5': {'class_code': '0x10185',
'class_name': 'IDE interface',
'device_id': '0x2825',
'device_name': '82801H (ICH8 Family) 2 port SATA IDE Controller',
'driver': 'ata_piix',
'iomem': [],
'ioports': [(65088, 8),
(65104, 4),
(65120, 8),
(65136, 4),
(65232, 16),
(60624, 16)],
'irq': 21,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'},
'0000:03:00.0': {'class_code': '0x20000',
'class_name': 'Ethernet controller',
'device_id': '0x167a',
'device_name': 'NetXtreme BCM5754 Gigabit Ethernet PCI Express',
'driver': 'tg3',
'iomem': [(3752787968L, 65536L)],
'ioports': [],
'irq': 1276,
'revision_id': '0x02',
'subsystem_id': 474,
'subsystem_name': 'Unknown device 01da',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': 'Dell',
'vendor_id': '0x14e4',
'vendor_name': 'Broadcom Corporation'},
'0000:04:02.0': {'class_code': '0x20000',
'class_name': 'Ethernet controller',
'device_id': '0x107c',
'device_name': '82541PI Gigabit Ethernet Controller',
'driver': 'e1000',
'iomem': [(3750494208L, 131072L),
(3750625280L, 131072L),
(2281701376L, 131072L)],
'ioports': [(56512, 64)],
'irq': 19,
'revision_id': '0x05',
'subsystem_id': 4982,
'subsystem_name': 'PRO/1000 GT Desktop Adapter',
'subsystem_vendor_id': '0x8086',
'subsystem_vendor_name': 'Intel Corporation',
'vendor_id': '0x8086',
'vendor_name': 'Intel Corporation'}}
{'0000:00:00.0': {'class_code': '0x60000',
'class_name': '',
'device_id': '0x2990',
'device_name': '',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:01.0': {'class_code': '0x60400',
'class_name': '',
'device_id': '0x2991',
'device_name': '',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1279,
'revision_id': '0x00',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:02.0': {'class_code': '0x30000',
'class_name': '',
'device_id': '0x2992',
'device_name': '',
'driver': '',
'iomem': [(3755999232L, 1048576L),
(3221225472L, 268435456L)],
'ioports': [(60600, 8)],
'irq': 11,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:02.1': {'class_code': '0x38000',
'class_name': '',
'device_id': '0x2993',
'device_name': '',
'driver': '',
'iomem': [(3757047808L, 1048576L)],
'ioports': [],
'irq': 0,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1a.0': {'class_code': '0xc0300',
'class_name': '',
'device_id': '0x2834',
'device_name': '',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65312, 32)],
'irq': 16,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1a.1': {'class_code': '0xc0300',
'class_name': '',
'device_id': '0x2835',
'device_name': '',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65280, 32)],
'irq': 17,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1a.7': {'class_code': '0xc0320',
'class_name': '',
'device_id': '0x283a',
'device_name': '',
'driver': 'ehci_hcd',
'iomem': [(3755981824L, 1024L)],
'ioports': [],
'irq': 20,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1b.0': {'class_code': '0x40300',
'class_name': '',
'device_id': '0x284b',
'device_name': '',
'driver': 'HDA Intel',
'iomem': [(3755982848L, 16384L)],
'ioports': [],
'irq': 16,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1c.0': {'class_code': '0x60400',
'class_name': '',
'device_id': '0x283f',
'device_name': '',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1278,
'revision_id': '0x00',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1c.4': {'class_code': '0x60400',
'class_name': '',
'device_id': '0x2847',
'device_name': '',
'driver': 'pcieport-driver',
'iomem': [],
'ioports': [],
'irq': 1277,
'revision_id': '0x00',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1d.0': {'class_code': '0xc0300',
'class_name': '',
'device_id': '0x2830',
'device_name': '',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65408, 32)],
'irq': 18,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1d.1': {'class_code': '0xc0300',
'class_name': '',
'device_id': '0x2831',
'device_name': '',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65376, 32)],
'irq': 17,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1d.2': {'class_code': '0xc0300',
'class_name': '',
'device_id': '0x2832',
'device_name': '',
'driver': 'uhci_hcd',
'iomem': [],
'ioports': [(65344, 32)],
'irq': 19,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1d.7': {'class_code': '0xc0320',
'class_name': '',
'device_id': '0x2836',
'device_name': '',
'driver': 'ehci_hcd',
'iomem': [(4288153600L, 1024L)],
'ioports': [],
'irq': 18,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1e.0': {'class_code': '0x60401',
'class_name': '',
'device_id': '0x244e',
'device_name': '',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0x00',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1f.0': {'class_code': '0x60100',
'class_name': '',
'device_id': '0x2810',
'device_name': '',
'driver': '',
'iomem': [],
'ioports': [],
'irq': 0,
'revision_id': '0x00',
'subsystem_id': 0,
'subsystem_name': '',
'subsystem_vendor_id': '0x0000',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1f.2': {'class_code': '0x1018a',
'class_name': '',
'device_id': '0x2820',
'device_name': '',
'driver': '',
'iomem': [],
'ioports': [(65216, 16), (60608, 16)],
'irq': 21,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1f.3': {'class_code': '0xc0500',
'class_name': '',
'device_id': '0x283e',
'device_name': '',
'driver': 'i801_smbus',
'iomem': [(3755981568L, 256L)],
'ioports': [(60640, 32)],
'irq': 21,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:00:1f.5': {'class_code': '0x10185',
'class_name': '',
'device_id': '0x2825',
'device_name': '',
'driver': 'ata_piix',
'iomem': [],
'ioports': [(65088, 8),
(65104, 4),
(65120, 8),
(65136, 4),
(65232, 16),
(60624, 16)],
'irq': 21,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''},
'0000:03:00.0': {'class_code': '0x20000',
'class_name': '',
'device_id': '0x167a',
'device_name': '',
'driver': 'tg3',
'iomem': [(3752787968L, 65536L)],
'ioports': [],
'irq': 1276,
'revision_id': '0x00',
'subsystem_id': 474,
'subsystem_name': '',
'subsystem_vendor_id': '0x1028',
'subsystem_vendor_name': '',
'vendor_id': '0x14e4',
'vendor_name': ''},
'0000:04:02.0': {'class_code': '0x20000',
'class_name': '',
'device_id': '0x107c',
'device_name': '',
'driver': 'e1000',
'iomem': [(3750494208L, 131072L),
(3750625280L, 131072L),
(2281701376L, 131072L)],
'ioports': [(56512, 64)],
'irq': 19,
'revision_id': '0x00',
'subsystem_id': 4982,
'subsystem_name': '',
'subsystem_vendor_id': '0x8086',
'subsystem_vendor_name': '',
'vendor_id': '0x8086',
'vendor_name': ''}}_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 8 lines · Zhigang Wang
hi,
this patch adds support for older pciutils without -vmm option, and improves error handling in
get_info_from_lspci().see the test case and test result for detail.
Signed-off-by Zhigang Wang <[email protected]>
Hi,
This looks good, but could you make a more informative subject-line?
Quoted 6 lines · Simon Horman
Quoted 5 lines · Zhigang Wang
hi,
this patch adds support for older pciutils without -vmm option, and improves error handling in
get_info_from_lspci().
Quoted 8 lines
Quoted 3 lines
see the test case and test result for detail.
Signed-off-by Zhigang Wang <[email protected]>Hi,
This looks good, but could you make a more informative subject-line?
ok.
This patch adds support for older pciutils without -vmm option, and improves error handling in get_info_from_lspci().
pciutils before commit: 3fd6b4d2e2fda814047664ffc67448ac782a8089 ingit://git.kernel.org/pub/scm/utils/pciutils/pciutils.git
has no -vmm option (it equals -vm). the result of lspci -vmm looks like:
Device: 02:00.0 Class: Ethernet controller Vendor: Broadcom Corporation Device: NetXtreme BCM5751 Gigabit Ethernet PCI Express SVendor: Dell SDevice: Optiplex GX620 Rev: 01
Two Device as key.
pciutils with -vmm option:
Slot: 07:07.0 Class: IDE interface Vendor: Silicon Image, Inc. Device: PCI0680 Ultra ATA-133 Host Controller SVendor: Silicon Image, Inc. SDevice: SiI 0680 ATA/133 Controller Rev: 02 ProgIf: 85
The first Device becomes Slot.
For the second part of this patch: without this patch, only an KeyError raise, it will not parse the extra keys, while the other keys still contains useful info.
Eg.
Slot: 07:02.0 Class: VGA compatible controller Vendor: ATI Technologies Inc Device: Radeon RV100 QY [Radeon 7000/VE] SVendor: Dell SDevice: Device 0183
without a "Rev", it will not parse any of these fields.
thanks,
zhigang
Quoted 5 lines
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel