[no-relote] Minor cleanup of cdi lib construction

elezar · elezar · commit 108ea3bbfb96 · 2025-11-07T11:14:41.000+01:00
Signed-off-by: Evan Lezar &lt;elezar@nvidia.com&gt;
diff --git a/internal/cdi/cdi.go b/internal/cdi/cdi.go
@@ -113,19 +113,25 @@ func New(infolib info.Interface, nvmllib nvml.Interface, devicelib device.Interf
 		return nil, err
 	}
 
-	c.cdilibs = make(map[string]nvcdi.SpecGenerator)
-
-	c.cdilibs["gpu"], err = nvcdi.New(
-		nvcdi.WithInfoLib(c.infolib),
-		nvcdi.WithNvmlLib(c.nvmllib),
+	commonOptions := []nvcdi.Option{
 		nvcdi.WithDeviceLib(c.devicelib),
+		nvcdi.WithDevRoot(c.devRoot),
+		nvcdi.WithDriverRoot(c.driverRoot),
+		nvcdi.WithInfoLib(c.infolib),
 		nvcdi.WithLogger(c.logger),
 		nvcdi.WithNVIDIACDIHookPath(c.nvidiaCTKPath),
-		nvcdi.WithDriverRoot(c.driverRoot),
-		nvcdi.WithDevRoot(c.devRoot),
-		nvcdi.WithDeviceNamers(deviceNamer),
+		nvcdi.WithNvmlLib(c.nvmllib),
 		nvcdi.WithVendor(c.vendor),
-		nvcdi.WithClass("gpu"),
+	}
+
+	c.cdilibs = make(map[string]nvcdi.SpecGenerator)
+
+	c.cdilibs["gpu"], err = nvcdi.New(
+		append(
+			commonOptions,
+			nvcdi.WithDeviceNamers(deviceNamer),
+			nvcdi.WithClass("gpu"),
+		)...,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create nvcdi library: %v", err)
@@ -147,13 +153,10 @@ func New(infolib info.Interface, nvmllib nvml.Interface, devicelib device.Interf
 
 	for _, mode := range c.additionalModes {
 		lib, err := nvcdi.New(
-			nvcdi.WithInfoLib(c.infolib),
-			nvcdi.WithLogger(c.logger),
-			nvcdi.WithNVIDIACDIHookPath(c.nvidiaCTKPath),
-			nvcdi.WithDriverRoot(c.driverRoot),
-			nvcdi.WithDevRoot(c.devRoot),
-			nvcdi.WithVendor(c.vendor),
-			nvcdi.WithMode(mode),
+			append(
+				commonOptions,
+				nvcdi.WithMode(mode),
+			)...,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create nvcdi library: %v", err)
