Adding changes in internal\builder\vm

Signed-off-by: Manish Ranjan Mahanta <mmahanta@microsoft.com>

Author: Manish Ranjan Mahanta

internal/builder/vm/lcow/boot.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 
 	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	hcsschema "github.com/Microsoft/hcsshim/internal/hcs/schema2"
@@ -87,6 +88,11 @@ func parseBootOptions(ctx context.Context, opts *runhcsoptions.Options, annotati
 	// uncompressed and simply named 'kernel' it will still be used
 	// uncompressed automatically.
 	kernelDirectBootSupported := osversion.Build() >= 18286
+	if runtime.GOARCH == "arm64" {
+		// KernelDirectBoot is currently not supported by Hyper-V on arm64.
+		// Todo: enable this by default once KernelDirectBoot on arm64 is supported.
+		kernelDirectBootSupported = false
+	}
 	useKernelDirect := oci.ParseAnnotationsBool(ctx, annotations, shimannotations.KernelDirectBoot, kernelDirectBootSupported)
 
 	log.G(ctx).WithFields(logrus.Fields{

internal/builder/vm/lcow/devices.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/Microsoft/hcsshim/internal/controller/device/vpci"
@@ -45,8 +46,9 @@ func parseDeviceOptions(
 	vpmemCount := oci.ParseAnnotationsUint32(ctx, annotations, shimannotations.VPMemCount, vmutils.DefaultVPMEMCount)
 	vpmemSize := oci.ParseAnnotationsUint64(ctx, annotations, shimannotations.VPMemSize, vmutils.DefaultVPMemSizeBytes)
 
-	// VPMem is not supported by the enlightened kernel for SNP (confidential VMs).
-	if isFullyPhysicallyBacked || isConfidential {
+	// VPMem is not supported by the enlightened kernel for SNP (confidential VMs, and Hyper-V on arm64).
+	// Todo: Remove arm64 check once VPMem is supported by Hyper-V on arm64.
+	if isFullyPhysicallyBacked || isConfidential || runtime.GOARCH == "arm64" {
 		vpmemCount = 0
 	}