From fd5444cbeceebf476005070ab69fe5f51144bdf7 Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@startuperic.com>
Date: Tue, 8 Nov 2016 13:04:42 -0600
Subject: [PATCH] Combine PCI Devices and IOMMU Groups on Sysdev page; Sort
 IOMMU and USB Devices properly

---
 plugins/dynamix/SysDevs.page | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/plugins/dynamix/SysDevs.page b/plugins/dynamix/SysDevs.page
index 289e0c5a6..5442c8c2d 100644
--- a/plugins/dynamix/SysDevs.page
+++ b/plugins/dynamix/SysDevs.page
@@ -13,26 +13,19 @@ Title="System Devices"
  * all copies or substantial portions of the Software.
  */
 ?>
-**PCI Devices**
+**PCI Devices and IOMMU Groups**
 
-> This displays the output of the `lspci` command.  The numeric identifiers are used to configure PCI pass-through.
-
-<pre><?=shell_exec("lspci -nn")?></pre>
-
-**IOMMU Groups**
-
-> This displays a list of IOMMU groups available on your system.
+> This displays a list of IOMMU groups available on your system along with the output of the `lspci` command for each IOMMU group.  The numeric identifiers are used to configure PCI pass-through.
 
 <?if (strpos(file_get_contents('/proc/cmdline'), 'pcie_acs_override=') !== false):?>
 <p class="notice">Warning: Your system has booted with the PCIe ACS Override setting enabled. The below list doesn't not reflect the way IOMMU would naturally group devices. To see natural IOMMU groups for your hardware, go to the <b><a href="/Settings/VMSettings">VM Settings</a></b> page and set the <b>PCIe ACS Override</b> setting to <b>No</b>.</p>
 <?endif;?>
 <pre><?
-	$iommu_groups = shell_exec("find /sys/kernel/iommu_groups/ -type l");
+	$iommu_groups = shell_exec('for iommu_group in $(ls /sys/kernel/iommu_groups/ -1 | sort -n);do echo "IOMMU group $iommu_group"; for device in $(ls -1 "/sys/kernel/iommu_groups/$iommu_group"/devices/); do echo -n $\'\t\';lspci -nns "$device"; done; done');
 	if (empty($iommu_groups)) {
-		echo 'No IOMMU Groups';
-	} else {
-		echo $iommu_groups;
+		$iommu_groups = shell_exec("lspci -nn");
 	}
+	echo $iommu_groups;
 ?></pre>
 
 **CPU Thread Pairings**
@@ -45,7 +38,7 @@ Title="System Devices"
 
 > This displays the output of the `lsusb` command.  The numeric identifiers are used to configure PCI pass-through.
 
-<pre><?=shell_exec("lsusb")?></pre>
+<pre><?=shell_exec("lsusb | sort")?></pre>
 
 **SCSI Devices**