Added vendor and id check for PCI devices.  device labels for pci devices has been changed to socket/device#.