Fix parsing of PCI domains longer than 4 digits

Signed-off-by: Ian Bishop <151477169+ianb-mp@users.noreply.github.com>
jaypipes · Sep 4, 2024 · ccca41a · ccca41a
1 parent 22ffa03
commit ccca41a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/pci/address/address.go b/pkg/pci/address/address.go
@@ -13,7 +13,7 @@ import (
 
 var (
 	regexAddress *regexp.Regexp = regexp.MustCompile(
-		`^(([0-9a-f]{0,8}):)?([0-9a-f]{2}):([0-9a-f]{2})\.([0-9a-f]{1})$`,
+		`^((1?[0-9a-f]{0,4}):)?([0-9a-f]{2}):([0-9a-f]{2})\.([0-9a-f]{1})$`,
 	)
 )
 

diff --git a/pkg/pci/address/address_test.go b/pkg/pci/address/address_test.go
@@ -62,6 +62,16 @@ func TestPCIAddressFromString(t *testing.T) {
 				Function: "a",
 			},
 		},
+		{
+			// PCI-X / PCI Express extentions may use 5-digit domain
+			addrStr: "10000:03:00.A",
+			expected: &pciaddr.Address{
+				Domain:   "10000",
+				Bus:      "03",
+				Device:   "00",
+				Function: "a",
+			},
+		},
 	}
 	for x, test := range tests {
 		got := pciaddr.FromString(test.addrStr)