cpu: workaround for broken qemu64 (#290)

abiosoft · May 18, 2022 · 1ec5c82 · 1ec5c82
1 parent 5d39343
commit 1ec5c82
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/environment/vm/lima/yaml.go b/environment/vm/lima/yaml.go
@@ -22,11 +22,20 @@ import (
 )
 
 func newConf(ctx context.Context, conf config.Config) (l Config, err error) {
-	l.Arch = environment.Arch(conf.Arch).Value()
+	{
+		l.Arch = environment.Arch(conf.Arch).Value()
 
-	if conf.CPUType != "" && conf.CPUType != "host" {
-		l.CPUType = map[environment.Arch]string{
-			l.Arch: conf.CPUType,
+		if conf.CPUType != "" && conf.CPUType != "host" {
+			l.CPUType = map[environment.Arch]string{
+				l.Arch: conf.CPUType,
+			}
+		}
+
+		sameAsHostArch := l.Arch == environment.HostArch().Value()
+		if conf.CPUType == "qemu64" || (!sameAsHostArch && l.Arch == environment.X8664 && conf.CPUType == "") {
+			l.CPUType = map[environment.Arch]string{
+				l.Arch: "kvm64",
+			}
 		}
 	}