Merge pull request #1355 from elezar/fix-device-filtering

elezar · web-flow · commit fae680c3d163 · 2025-10-16T09:38:47.000+02:00
Fix bug in device selection in jit-cdi mode
diff --git a/internal/modifier/cdi.go b/internal/modifier/cdi.go
@@ -172,15 +172,17 @@ func newAutomaticCDISpecModifier(logger logger.Interface, cfg *config.Config, de
 	seen := make(map[string]bool)
 	for _, device := range devices {
 		mode, id := getModeIdentifier(device)
+		logger.Debugf("Mapped %v to %v: %v", device, mode, id)
 		if !seen[mode] {
 			uniqueModes = append(uniqueModes, mode)
 			seen[mode] = true
 		}
 		if id != "" {
-			perModeIdentifiers[id] = append(perModeIdentifiers[id], id)
+			perModeIdentifiers[mode] = append(perModeIdentifiers[mode], id)
 		}
 	}
 
+	logger.Debugf("Per-mode identifiers: %v", perModeIdentifiers)
 	var modifiers oci.SpecModifiers
 	for _, mode := range uniqueModes {
 		cdilib, err := nvcdi.New(

Original file line number	Diff line number	Diff line change
`@@ -172,15 +172,17 @@ func newAutomaticCDISpecModifier(logger logger.Interface, cfg *config.Config, de`
`172`	`172`	`seen := make(map[string]bool)`
`173`	`173`	`for _, device := range devices {`
`174`	`174`	`mode, id := getModeIdentifier(device)`
	`175`	`+ logger.Debugf("Mapped %v to %v: %v", device, mode, id)`
`175`	`176`	`if !seen[mode] {`
`176`	`177`	`uniqueModes = append(uniqueModes, mode)`
`177`	`178`	`seen[mode] = true`
`178`	`179`	`}`
`179`	`180`	`if id != "" {`
`180`		`- perModeIdentifiers[id] = append(perModeIdentifiers[id], id)`
	`181`	`+ perModeIdentifiers[mode] = append(perModeIdentifiers[mode], id)`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`
	`185`	`+ logger.Debugf("Per-mode identifiers: %v", perModeIdentifiers)`
`184`	`186`	`var modifiers oci.SpecModifiers`
`185`	`187`	`for _, mode := range uniqueModes {`
`186`	`188`	`cdilib, err := nvcdi.New(`