review 3

rawahars · rawahars · commit c66dd9d47db5 · 2026-04-16T10:24:53.000+05:30
Signed-off-by: Harsh Rawat &lt;harshrawat@microsoft.com&gt;
diff --git a/cmd/containerd-shim-lcow-v2/main.go b/cmd/containerd-shim-lcow-v2/main.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 // containerd-shim-lcow-v2 is a containerd shim implementation for Linux Containers on Windows (LCOW).
 package main
diff --git a/cmd/containerd-shim-lcow-v2/manager.go b/cmd/containerd-shim-lcow-v2/manager.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package main
 
diff --git a/cmd/containerd-shim-lcow-v2/manager_test.go b/cmd/containerd-shim-lcow-v2/manager_test.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package main
 
diff --git a/cmd/containerd-shim-lcow-v2/service/plugin/plugin.go b/cmd/containerd-shim-lcow-v2/service/plugin/plugin.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package plugin
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service.go b/cmd/containerd-shim-lcow-v2/service/service.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
@@ -45,7 +45,7 @@ type Service struct {
 	sandboxOptions *lcow.SandboxOptions
 
 	// vmController is responsible for managing the lifecycle of the underlying utility VM and its associated resources.
-	vmController vm.Controller
+	vmController *vm.Controller
 
 	// shutdown manages graceful shutdown operations and allows registration of cleanup callbacks.
 	shutdown shutdown.Service
@@ -58,7 +58,7 @@ func NewService(ctx context.Context, eventsPublisher shim.Publisher, sd shutdown
 	svc := &Service{
 		publisher:    eventsPublisher,
 		events:       make(chan interface{}, 128), // Buffered channel for events
-		vmController: vm.NewController(),
+		vmController: vm.New(),
 		shutdown:     sd,
 	}
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_sandbox.go b/cmd/containerd-shim-lcow-v2/service/service_sandbox.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_sandbox_internal.go b/cmd/containerd-shim-lcow-v2/service/service_sandbox_internal.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_shimdiag.go b/cmd/containerd-shim-lcow-v2/service/service_shimdiag.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_shimdiag_internal.go b/cmd/containerd-shim-lcow-v2/service/service_shimdiag_internal.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_task.go b/cmd/containerd-shim-lcow-v2/service/service_task.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/cmd/containerd-shim-lcow-v2/service/service_task_internal.go b/cmd/containerd-shim-lcow-v2/service/service_task_internal.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && lcow
 
 package service
 
diff --git a/internal/controller/vm/vm.go b/internal/controller/vm/vm.go
@@ -69,7 +69,7 @@ type Controller struct {
 	vpciController *vpci.Controller
 
 	// platformControllers embeds platform-specific sub-controllers (e.g., Plan9 for LCOW).
-	platformControllers
+	platformControllers //nolint:unused // used in LCOW builds only.
 }
 
 // New creates a new Controller instance in the [StateNotCreated] state.
diff --git a/internal/controller/vm/vm_wcow.go b/internal/controller/vm/vm_wcow.go
@@ -20,7 +20,7 @@ import (
 
 // platformControllers holds platform-specific sub-controllers embedded in [Controller].
 // For WCOW, no additional controllers are needed as of now (VSMB will be added later).
-type platformControllers struct{}
+type platformControllers struct{} //nolint:unused // embedded in Controller for cross-platform compatibility with LCOW
 
 // setupEntropyListener sets up entropy for WCOW (Windows Containers on Windows) VMs.
 //
diff --git a/internal/vm/guestmanager/device_lcow.go b/internal/vm/guestmanager/device_lcow.go
@@ -1,4 +1,4 @@
-//go:build windows && lcow
+//go:build windows
 
 package guestmanager
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build windows`
	`1`	`+//go:build windows && lcow`
`2`	`2`
`3`	`3`	`// containerd-shim-lcow-v2 is a containerd shim implementation for Linux Containers on Windows (LCOW).`
`4`	`4`	`package main`