Clean up codes for QEMU < 7.0

- QEMU 7.0 is documented as the minimum requirement since 9eb1396 (Dec 2022)
- Also clean up the hint for QEMU 8.2.0, as QEMU 8.2.0 users should have already updated QEMU to 8.2.1+

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

Author: AkihiroSuda

pkg/qemu/qemu.go

@@ -49,7 +49,7 @@ type Config struct {
 
 // MinimumQemuVersion is the minimum supported QEMU version.
 const (
-	MinimumQemuVersion = "4.0.0"
+	MinimumQemuVersion = "7.0.0"
 )
 
 // EnsureDisk also ensures the kernel and the initrd.
@@ -313,9 +313,6 @@ type features struct {
 	// e.g. "Available CPUs:\n...\nx86 base...\nx86 host...\n...\n"
 	// Not machine-readable, but checking strings.Contains() should be fine.
 	CPUHelp []byte
-
-	// VersionGEQ7 is true when the QEMU version seems v7.0.0 or later
-	VersionGEQ7 bool
 }
 
 func inspectFeatures(exe, machine string) (*features, error) {
@@ -359,7 +356,6 @@ func inspectFeatures(exe, machine string) (*features, error) {
 			f.MachineHelp = stderr.Bytes()
 		}
 	}
-	f.VersionGEQ7 = strings.Contains(string(f.MachineHelp), "-7.0")
 
 	// Avoid error: "No machine specified, and there is no default"
 	cmd = exec.Command(exe, "-cpu", "help", "-machine", machine)
@@ -377,56 +373,15 @@ func inspectFeatures(exe, machine string) (*features, error) {
 	return &f, nil
 }
 
-// showDarwinARM64HVFQEMU620Warning shows a warning on M1 macOS when QEMU is older than 6.2.0_1.
-//
-// See:
-// - https://gitlab.com/qemu-project/qemu/-/issues/899
-// - https://github.com/Homebrew/homebrew-core/pull/96743
-// - https://github.com/lima-vm/lima/issues/712
-func showDarwinARM64HVFQEMU620Warning(exe, accel string, features *features) {
-	if runtime.GOOS != "darwin" {
-		return
-	}
-	if runtime.GOARCH != "arm64" {
-		return
-	}
-	if accel != "hvf" {
-		return
-	}
-	if features.VersionGEQ7 {
-		return
-	}
-	if exeFull, err := exec.LookPath(exe); err == nil {
-		if exeResolved, err2 := filepath.EvalSymlinks(exeFull); err2 == nil {
-			if strings.Contains(exeResolved, "Cellar/qemu/6.2.0_") {
-				// Homebrew's QEMU 6.2.0_1 or later
-				return
-			}
-		}
-	}
-	w := "This version of QEMU might not be able to boot recent Linux guests on M1 macOS hosts."
-	if _, err := exec.LookPath("brew"); err == nil {
-		w += "Run `brew upgrade` and make sure your QEMU version is 6.2.0_1 or later."
-	} else {
-		w += `Reinstall QEMU with the following commits (included in QEMU 7.0.0):
-- https://github.com/qemu/qemu/commit/ad99f64f "hvf: arm: Use macros for sysreg shift/masking"
-- https://github.com/qemu/qemu/commit/7f6c295c "hvf: arm: Handle unknown ID registers as RES0"
-`
-		w += "See https://github.com/Homebrew/homebrew-core/pull/96743 for the further information."
-	}
-	logrus.Warn(w)
-}
-
 // adjustMemBytesDarwinARM64HVF adjusts the memory to be <= 3 GiB, only when the following conditions are met:
 //
 // - Host OS   <  macOS 12.4
 // - Host Arch == arm64
 // - Accel     == hvf
-// - QEMU      >= 7.0
 //
 // This adjustment is required for avoiding host kernel panic. The issue was fixed in macOS 12.4 Beta 1.
 // See https://github.com/lima-vm/lima/issues/795 https://gitlab.com/qemu-project/qemu/-/issues/903#note_911000975
-func adjustMemBytesDarwinARM64HVF(memBytes int64, accel string, features *features) int64 {
+func adjustMemBytesDarwinARM64HVF(memBytes int64, accel string) int64 {
 	const safeSize = 3 * 1024 * 1024 * 1024 // 3 GiB
 	if memBytes <= safeSize {
 		return memBytes
@@ -440,9 +395,6 @@ func adjustMemBytesDarwinARM64HVF(memBytes int64, accel string, features *featur
 	if accel != "hvf" {
 		return memBytes
 	}
-	if !features.VersionGEQ7 {
-		return memBytes
-	}
 	macOSProductVersion, err := osutil.ProductVersion()
 	if err != nil {
 		logrus.Warn(err)
@@ -451,8 +403,8 @@ func adjustMemBytesDarwinARM64HVF(memBytes int64, accel string, features *featur
 	if !macOSProductVersion.LessThan(*semver.New("12.4.0")) {
 		return memBytes
 	}
-	logrus.Warnf("Reducing the guest memory from %s to %s, to avoid host kernel panic on macOS <= 12.3 with QEMU >= 7.0; "+
-		"Please update macOS to 12.4 or later, or downgrade QEMU to 6.2; "+
+	logrus.Warnf("Reducing the guest memory from %s to %s, to avoid host kernel panic on macOS <= 12.3; "+
+		"Please update macOS to 12.4 or later; "+
 		"See https://github.com/lima-vm/lima/issues/795 for the further background.",
 		units.BytesSize(float64(memBytes)), units.BytesSize(float64(safeSize)))
 	memBytes = safeSize
@@ -503,25 +455,20 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
 		if y.VMOpts.QEMU.MinimumVersion != nil && version.LessThan(*semver.New(*y.VMOpts.QEMU.MinimumVersion)) {
 			logrus.Fatalf("QEMU %v is too old, template requires %q or later", version, *y.VMOpts.QEMU.MinimumVersion)
 		}
-		if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" && version.Equal(*semver.New("8.2.0")) {
-			logrus.Fatal("QEMU 8.2.0 is no longer supported on ARM Mac due to <https://gitlab.com/qemu-project/qemu/-/issues/1990>. " +
-				"Please upgrade QEMU to v8.2.1 (or downgrade to v8.1.x).")
-		}
 	}
 
 	// Architecture
 	accel := Accel(*y.Arch)
 	if !strings.Contains(string(features.AccelHelp), accel) {
 		return "", nil, fmt.Errorf("accelerator %q is not supported by %s", accel, exe)
 	}
-	showDarwinARM64HVFQEMU620Warning(exe, accel, features)
 
 	// Memory
 	memBytes, err := units.RAMInBytes(*y.Memory)
 	if err != nil {
 		return "", nil, err
 	}
-	memBytes = adjustMemBytesDarwinARM64HVF(memBytes, accel, features)
+	memBytes = adjustMemBytesDarwinARM64HVF(memBytes, accel)
 	args = appendArgsIfNoConflict(args, "-m", strconv.Itoa(int(memBytes>>20)))
 
 	if *y.MountType == limayaml.VIRTIOFS {
@@ -569,14 +516,6 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
 		}
 	case limayaml.AARCH64:
 		machine := "virt,accel=" + accel
-		// QEMU >= 7.0 requires highmem=off NOT to be set, otherwise fails with "Addressing limited to 32 bits, but memory exceeds it by 1073741824 bytes"
-		// QEMU <  7.0 requires highmem=off to be set, otherwise fails with "VCPU supports less PA bits (36) than requested by the memory map (40)"
-		// https://github.com/lima-vm/lima/issues/680
-		// https://github.com/lima-vm/lima/pull/24
-		// But when the memory size is <= 3 GiB, we can always set highmem=off.
-		if !features.VersionGEQ7 || memBytes <= 3*1024*1024*1024 {
-			machine += ",highmem=off"
-		}
 		args = appendArgsIfNoConflict(args, "-machine", machine)
 	case limayaml.RISCV64:
 		// https://github.com/tianocore/edk2/blob/edk2-stable202408/OvmfPkg/RiscVVirt/README.md#test
@@ -876,23 +815,15 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
 	}
 
 	switch *y.Arch {
+	// FIXME: use virtio-gpu on all the architectures
 	case limayaml.X8664, limayaml.RISCV64:
 		args = append(args, "-device", "virtio-vga")
-		args = append(args, "-device", "virtio-keyboard-pci")
-		args = append(args, "-device", "virtio-"+input+"-pci")
-		args = append(args, "-device", "qemu-xhci,id=usb-bus")
-	case limayaml.AARCH64, limayaml.ARMV7L, limayaml.PPC64LE, limayaml.S390X:
-		if features.VersionGEQ7 {
-			args = append(args, "-device", "virtio-gpu")
-			args = append(args, "-device", "virtio-keyboard-pci")
-			args = append(args, "-device", "virtio-"+input+"-pci")
-		} else { // kernel panic with virtio and old versions of QEMU
-			args = append(args, "-vga", "none", "-device", "ramfb")
-			args = append(args, "-device", "usb-kbd,bus=usb-bus")
-			args = append(args, "-device", "usb-"+input+",bus=usb-bus")
-		}
-		args = append(args, "-device", "qemu-xhci,id=usb-bus")
+	default:
+		args = append(args, "-device", "virtio-gpu")
 	}
+	args = append(args, "-device", "virtio-keyboard-pci")
+	args = append(args, "-device", "virtio-"+input+"-pci")
+	args = append(args, "-device", "qemu-xhci,id=usb-bus")
 
 	// Parallel
 	args = append(args, "-parallel", "none")