From 5f997a70bdd9353b76808ed090fb58612660db47 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 14 Apr 2025 11:31:08 -0700 Subject: [PATCH] cmd/podman/pods/create: fix break statement This code was [somewhat messy but] correct until commit 51fbf3da9e started to use switch instead of if, and since that time break is breaking from the inner "switch" (rather than on the outer "for" as originally intended). This also fixes the following staticcheck warnings: > cmd/podman/pods/create.go:242:5: SA4011: ineffective break statement. Did you mean to break out of the outer loop? (staticcheck) > break > ^ > cmd/podman/pods/create.go:245:5: SA4011: ineffective break statement. Did you mean to break out of the outer loop? (staticcheck) > break > ^ Signed-off-by: Kir Kolyshkin --- cmd/podman/pods/create.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 78809068e9..b0ef3f1bab 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -233,17 +233,17 @@ func create(cmd *cobra.Command, args []string) error { } } sort.Ints(vals) +loop: for ind, core := range vals { switch { case core > int(cpuSet): if copy == "" { copy = "0-" + strconv.Itoa(int(cpuSet)) infraOptions.CPUSetCPUs = copy - break } else { infraOptions.CPUSetCPUs = copy - break } + break loop case ind != 0: copy += "," + strconv.Itoa(core) default: @@ -252,6 +252,7 @@ func create(cmd *cobra.Command, args []string) error { } createOptions.Cpus = infraOptions.CPUS createOptions.CpusetCpus = infraOptions.CPUSetCPUs + podSpec := specgen.NewPodSpecGenerator() podSpec, err = entities.ToPodSpecGen(*podSpec, &createOptions) if err != nil {