Merge pull request #931 from afbjorklund/maxcpu-windows

whpx: Don't use -cpu max, add kernel-irqchip=off

Author: AkihiroSuda

pkg/limayaml/defaults.go

@@ -108,7 +108,7 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 		if IsNativeArch(arch) && IsAccelOS() {
 			if HasHostCPU() {
 				cpuType[arch] = "host"
-			} else {
+			} else if HasMaxCPU() {
 				cpuType[arch] = "max"
 			}
 		}
@@ -637,6 +637,11 @@ func HasHostCPU() bool {
 	return false
 }
 
+func HasMaxCPU() bool {
+	// WHPX: Unexpected VP exit code 4
+	return runtime.GOOS != "windows"
+}
+
 func IsNativeArch(arch Arch) bool {
 	nativeX8664 := arch == X8664 && runtime.GOARCH == "amd64"
 	nativeAARCH64 := arch == AARCH64 && runtime.GOARCH == "arm64"

pkg/limayaml/defaults_test.go

@@ -86,7 +86,7 @@ func TestFillDefault(t *testing.T) {
 	if IsAccelOS() {
 		if HasHostCPU() {
 			builtin.CPUType[arch] = "host"
-		} else {
+		} else if HasMaxCPU() {
 			builtin.CPUType[arch] = "max"
 		}
 	}

pkg/qemu/qemu.go

@@ -369,7 +369,7 @@ func Cmdline(cfg Config) (string, []string, error) {
 	args = appendArgsIfNoConflict(args, "-cpu", cpu)
 	switch *y.Arch {
 	case limayaml.X8664:
-		if strings.HasPrefix(cpu, "qemu64") {
+		if strings.HasPrefix(cpu, "qemu64") && runtime.GOOS != "windows" {
 			// use q35 machine with vmware io port disabled.
 			args = appendArgsIfNoConflict(args, "-machine", "q35,vmport=off")
 			// use tcg accelerator with multi threading with 512MB translation block size
@@ -379,6 +379,9 @@ func Cmdline(cfg Config) (string, []string, error) {
 			args = appendArgsIfNoConflict(args, "-accel", "tcg,thread=multi,tb-size=512")
 			// This will disable CPU S3 state.
 			args = append(args, "-global", "ICH9-LPC.disable_s3=1")
+		} else if runtime.GOOS == "windows" && accel == "whpx" {
+			// whpx: injection failed, MSI (0, 0) delivery: 0, dest_mode: 0, trigger mode: 0, vector: 0
+			args = appendArgsIfNoConflict(args, "-machine", "q35,accel="+accel+",kernel-irqchip=off")
 		} else {
 			args = appendArgsIfNoConflict(args, "-machine", "q35,accel="+accel)
 		}
@@ -608,7 +611,7 @@ func getAccel(arch limayaml.Arch) string {
 		case "netbsd":
 			return "nvmm"
 		case "windows":
-			return "whpx" // untested
+			return "whpx"
 		}
 	}
 	return "tcg"