Passthrough WIP

1 files changed, 10 insertions, 10 deletions

diff --git a/modules-available/statistics/inc/hardwareparser.inc.php b/modules-available/statistics/inc/hardwareparser.inc.php
index d356e226..87dcc4cf 100644
--- a/modules-available/statistics/inc/hardwareparser.inc.php
+++ b/modules-available/statistics/inc/hardwareparser.inc.php
@@ -308,29 +308,29 @@ class HardwareParser
 		foreach ($out as $entry) {
 			if (!isset($pci[$entry['class']])) {
 				$class = 'c.' . $entry['class'];
-				$res = Page_Statistics::getPciId('CLASS', $class);
-				if ($res === false || $res['dateline'] < $NOW) {
+				$res = PciId::getPciId('CLASS', $class);
+				if ($res === false) {
 					$pci[$entry['class']]['lookupClass'] = 'do-lookup';
 					$pci[$entry['class']]['class'] = $class;
 				} else {
-					$pci[$entry['class']]['class'] = $res['value'];
+					$pci[$entry['class']]['class'] = $res;
 				}
 			}
 			$new = array(
 				'ven' => $entry['ven'],
 				'dev' => $entry['ven'] . ':' . $entry['dev'],
 			);
-			$res = Page_Statistics::getPciId('VENDOR', $new['ven']);
-			if ($res === false || $res['dateline'] < $NOW) {
+			$res = PciId::getPciId('VENDOR', $new['ven']);
+			if ($res === false) {
 				$new['lookupVen'] = 'do-lookup';
 			} else {
-				$new['ven'] = $res['value'];
+				$new['ven'] = $res;
 			}
-			$res = Page_Statistics::getPciId('DEVICE', $new['dev']);
-			if ($res === false || $res['dateline'] < $NOW) {
+			$res = PciId::getPciId('DEVICE', $new['dev']);
+			if ($res === false) {
 				$new['lookupDev'] = 'do-lookup';
 			} else {
-				$new['dev'] = $res['value'] . ' (' . $new['dev'] . ')';
+				$new['dev'] = $res . ' (' . $new['dev'] . ')';
 			}
 			$pci[$entry['class']]['entries'][] = $new;
 		}
@@ -717,7 +717,7 @@ class HardwareParser
 			$hwid = self::writeGlobalHardwareData(HardwareInfo::PCI_DEVICE,
 				self::propsFromArray($dev, 'vendor', 'device', 'rev', 'class'));
 			$mappingId = self::writeLocalHardwareData($uuid, $hwid, $dev['slot'] ?? 'unknown',
-				self::propsFromArray($dev, 'slot', 'subsystem', 'subsystem_vendor'));
+				self::propsFromArray($dev, 'slot', 'subsystem', 'subsystem_vendor', 'iommu_group'));
 			$pciHwIds[] = $mappingId;
 		}
 		self::markDisconnected($uuid, HardwareInfo::PCI_DEVICE, $pciHwIds);