From de098367d0a19683241d41ab4a426a064cba0052 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 9 Dec 2025 12:02:58 +0100 Subject: [PATCH] cli/command/container: inline parseWindowsDevice It's not parsing anything, so we may as well inline it to be more clear what's done. Signed-off-by: Sebastiaan van Stijn --- cli/command/container/opts.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index a0cc1cb8f9..853a7f93de 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -997,9 +997,11 @@ func parseDevice(device, serverOS string) (container.DeviceMapping, error) { case "linux": return parseLinuxDevice(device) case "windows": - return parseWindowsDevice(device) + // Windows doesn't support mapping, so passing the given value as-is. + return container.DeviceMapping{PathOnHost: device}, nil + default: + return container.DeviceMapping{}, fmt.Errorf("unknown server OS: %s", serverOS) } - return container.DeviceMapping{}, fmt.Errorf("unknown server OS: %s", serverOS) } // parseLinuxDevice parses a device mapping string to a container.DeviceMapping struct @@ -1030,18 +1032,11 @@ func parseLinuxDevice(device string) (container.DeviceMapping, error) { dst = src } - deviceMapping := container.DeviceMapping{ + return container.DeviceMapping{ PathOnHost: src, PathInContainer: dst, CgroupPermissions: permissions, - } - return deviceMapping, nil -} - -// parseWindowsDevice parses a device mapping string to a container.DeviceMapping struct -// knowing that the target is a Windows daemon -func parseWindowsDevice(device string) (container.DeviceMapping, error) { - return container.DeviceMapping{PathOnHost: device}, nil + }, nil } // validateDeviceCgroupRule validates a device cgroup rule string format