Merge pull request #894 from afbjorklund/accel-os

Only use cpuType=host for OS with accel available

Author: AkihiroSuda

pkg/limayaml/defaults.go

@@ -105,7 +105,7 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 		RISCV64: "rv64", // FIXME: what is the right choice for riscv64?
 	}
 	for arch := range cpuType {
-		if IsNativeArch(arch) {
+		if IsNativeArch(arch) && IsAccelOS() {
 			cpuType[arch] = "host"
 		}
 	}
@@ -612,6 +612,16 @@ func ResolveArch(s *string) Arch {
 	return *s
 }
 
+func IsAccelOS() bool {
+	switch runtime.GOOS {
+	case "darwin", "linux", "netbsd", "windows":
+		// Accelerator
+		return true
+	}
+	// Using TCG
+	return false
+}
+
 func IsNativeArch(arch Arch) bool {
 	nativeX8664 := arch == X8664 && runtime.GOARCH == "amd64"
 	nativeAARCH64 := arch == AARCH64 && runtime.GOARCH == "arm64"

pkg/limayaml/defaults_test.go

@@ -83,7 +83,9 @@ func TestFillDefault(t *testing.T) {
 			RemoveDefaults: pointer.Bool(false),
 		},
 	}
-	builtin.CPUType[arch] = "host"
+	if IsAccelOS() {
+		builtin.CPUType[arch] = "host"
+	}
 
 	defaultPortForward := PortForward{
 		GuestIP:        api.IPv4loopback1,