refactor: migrate `cpuType` to `vmOpts.qemu` #3500

unsuman · 2025-05-06T22:48:19Z

Description

This PR fixes #3486 by relocating the cpuType field to vmOpts.qemu.cpuType in both the YAML schema and limayaml.LimaYAML struct in Go. To maintain compatibility, the old top-level cpuType is still accepted and merged into the new path at runtime, with a warning to encourage migration. Validation and default logic have been moved to the qemu package.

AkihiroSuda · 2025-05-07T01:25:05Z

pkg/limayaml/validate.go

+		if !slices.Contains(ArchTypes, arch) {
+			return fmt.Errorf("field `vmOpts.qemu.cpuType` uses unsupported arch %q", arch)
+		}
+	}


Probably defaults.go should just replicate the top-level CPUType to VMOpts (with a warning when they conflict), then no need to validate the CPUTypes here twice?

The validation should happen in pkg/qemu.
pkg/limayaml shouldn't be aware of the archs implemented by the QEMU driver

pkg/limayaml/limayaml.go

unsuman · 2025-05-07T10:34:32Z

pkg/limayaml/defaults.go

+	// TODO: This check should be removed when we completely eliminate `CPUType` from limayaml.
+	if len(y.CPUType) > 0 {
+		if warn {
+			logrus.Warn("The top-level `cpuType` field is deprecated and will be removed in a future release. Please migrate to `vmOpts.qemu.cpuType`.")


I don't know why this is not executing even if warn is set true by default

jandubois

There is also a linter error to fix.

jandubois · 2025-05-08T21:34:39Z

templates/default.yaml

 # 🟢 Builtin default: "Linux"
 os: null

+# DEPRECATED: Use vmOpts.qemu.cpuType instead.


I think the duplicate documentation should be removed from the deprecated entry. Just point it to the new location instead.

jandubois

I would prefer that we hold off on merging this PR until we have agreement on how the final config settings are supposed to look like. Otherwise we might end up with double-migrations, which complicates the code, the docs, and confuses users.

See also #3520 (comment)

Signed-off-by: Ansuman Sahoo <anshumansahoo500@gmail.com>

AkihiroSuda

Thanks

AkihiroSuda · 2025-07-28T02:27:06Z

Can we merge? @jandubois

jandubois

Thanks, LGTM

⚠️ **CAUTION: this is a major update, indicating a breaking change!** ⚠️ This MR contains the following updates: | Package | Update | Change | |---|---|---| | [lima-vm/lima](https://github.com/lima-vm/lima) | major | `v1.2.2` -> `v2.0.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>lima-vm/lima (lima-vm/lima)</summary> ### [`v2.0.1`](https://github.com/lima-vm/lima/releases/tag/v2.0.1) [Compare Source](lima-vm/lima@v2.0.0...v2.0.1) #### Changes - Binary release artifacts: - Fix a regression in v2.0.0 `level=fatal msg="template \"_images/<IMAGE>.yaml\" not found"` ([#4313](lima-vm/lima#4313), thanks to [@vvoland](https://github.com/vvoland)) - Misc: - pkg/networks/usernet: use `SIGINT` instead of `SIGKILL` ([#4310](lima-vm/lima#4310), thanks to [@norio-nomura](https://github.com/norio-nomura)) Full changes: <https://github.com/lima-vm/lima/milestone/64?closed=1> #### Usage ```console $ limactl create $ limactl start ... INFO[0029] READY. Run `lima` to open the shell. $ lima uname Linux ``` *** The binaries were built automatically on GitHub Actions. The build log is available for 90 days: <https://github.com/lima-vm/lima/actions/runs/19137304035> The sha256sum of the SHA256SUMS file itself is `25ad222fa1cf91a85ef7be67664f2ba65228a5d82a39be1adbbe842096854e24` . *** Release manager: [@AkihiroSuda](https://github.com/AkihiroSuda) ### [`v2.0.0`](https://github.com/lima-vm/lima/releases/tag/v2.0.0) [Compare Source](lima-vm/lima@v1.2.2...v2.0.0) This is the second major release of Lima, featuring the support for [pluggable VM drivers](https://lima-vm.io/docs/dev/drivers/), [GPU acceleration](https://lima-vm.io/docs/config/gpu/), and [MCP](https://lima-vm.io/docs/config/ai/outside/mcp/). This release also commemorates the promotion of the project from CNCF [Sandbox](https://www.cncf.io/sandbox-projects/) to [Incubating](https://www.cncf.io/projects/) 🎉. #### Highlights - [Experimental plug-in subsystem for VM driver infrastructure](https://lima-vm.io/docs/dev/drivers/). This will help implementing third-party plugins without modifying the code base of Lima. Thanks to [GSoC 2025](https://gist.github.com/unsuman/ff31a323ecef2289bf065882726ed7f0) contributor [@unsuman](https://github.com/unsuman) . - [Experimental krunkit VM driver](https://lima-vm.io/docs/config/vmtype/krunkit/) for supporting GPU acceleration ([#4137](lima-vm/lima#4137), thanks to [@unsuman](https://github.com/unsuman)) - [Experimental integration for Model Context Protocol (MCP)](https://lima-vm.io/docs/config/ai/outside/) ([#3744](lima-vm/lima#3744)). i.e., Lima can be now used as a sandbox for AI agents such as Gemini. - Add `limactl (start|restart) --progress` flag to show the progress of provisioning ([#3846](lima-vm/lima#3846), [#3915](lima-vm/lima#3915), thanks to [@olamilekan000](https://github.com/olamilekan000) [@norio-nomura](https://github.com/norio-nomura)) - Add `limactl shell --preserve-env` flag to propagate env vars from the host to VM ([#3830](lima-vm/lima#3830), thanks to [@olamilekan000](https://github.com/olamilekan000)) #### Other notable changes - `/tmp/lima` is no longer mounted by default ([#3951](lima-vm/lima#3951)) - SSH port is no longer hard-coded to 60022 for the "default" instance ([#3780](lima-vm/lima#3780)) - Forward UDP ports by default ([#4054](lima-vm/lima#4054)) - Support CLI plugins ([#3834](lima-vm/lima#3834), [#4009](lima-vm/lima#4009), thanks to [@olamilekan000](https://github.com/olamilekan000)) - Support custom URL scheme plugins ([#3937](lima-vm/lima#3937), thanks to [@jandubois](https://github.com/jandubois)). `template://default` is now recommended to be written as `template:default`. The old form is still supported. ##### Details - VM driver infrastructure: - [Experimental plug-in subsystem for VM driver infrastructure](https://lima-vm.io/docs/dev/drivers/) ([multiple MRs](https://github.com/lima-vm/lima/pulls?q=is%3Apr+milestone%3Av2.0.0+is%3Aclosed+label%3Aarea%2Fvmdrivers), thanks to [@unsuman](https://github.com/unsuman)) - krunkit: - [Experimental krunkit VM driver](https://lima-vm.io/docs/config/vmtype/krunkit/) for supporting GPU acceleration ([#4137](lima-vm/lima#4137), thanks to [@unsuman](https://github.com/unsuman)) - VZ: - Support Rosetta AOT Caching with CDI ([#3858](lima-vm/lima#3858), thanks to [@norio-nomura](https://github.com/norio-nomura)) - Support accelerating SSH using `AF_VSOCK` ([#3979](lima-vm/lima#3979), thanks to [@norio-nomura](https://github.com/norio-nomura)) - QEMU: - Fallback to TCG when KVM is not available on Linux hosts ([#4204](lima-vm/lima#4204)) - MCP: - [Experimental integration for Model Context Protocol (MCP)](https://lima-vm.io/docs/config/ai/outside/) ([#3744](lima-vm/lima#3744)). Lima now provides MCP tools for reading, writing, and executing local files using a VM sandbox. Known to work with Google Gemini CLI. - `limactl` CLI: - Add `limactl (start|restart) --progress` flag to show the progress of provisioning ([#3846](lima-vm/lima#3846), [#3915](lima-vm/lima#3915), thanks to [@olamilekan000](https://github.com/olamilekan000) [@norio-nomura](https://github.com/norio-nomura)) - Add `limactl (create|start|edit) --port-forward` flag for static port forwarding ([#3699](lima-vm/lima#3699), thanks to [@Horiodino](https://github.com/Horiodino)). Usually not needed, but useful for instances created with `--plain`. - Add `limactl (create|start|edit) --ssh-port` flag ([#3791](lima-vm/lima#3791)) - Add `limactl (create|start|edit) --mount-only` flag ([#3947](lima-vm/lima#3947)). Similar to `--mount`, but overrides the existing mounts. Useful for mounting `$(pwd)`. - Support specifying `--set` multiple times in `limactl (create|start|edit)` ([#4197](lima-vm/lima#4197), thanks to [@AndiDog](https://github.com/AndiDog)) - Add `limactl shell --preserve-env` flag to propagate env vars from the host to VM ([#3830](lima-vm/lima#3830), thanks to [@olamilekan000](https://github.com/olamilekan000)). See also [`LIMA_SHELLENV_ALLOW`](https://lima-vm.io/docs/config/environment-variables/#lima_shellenv_allow) and [`LIMA_SHELLENV_BLOCK`](https://lima-vm.io/docs/config/environment-variables/#lima_shellenv_block). - Support CLI plugins ([#3834](lima-vm/lima#3834), [#4009](lima-vm/lima#4009), thanks to [@olamilekan000](https://github.com/olamilekan000)) - Support custom URL scheme plugins ([#3937](lima-vm/lima#3937), thanks to [@jandubois](https://github.com/jandubois)). `template://default` is now recommended to be written as `template:default`. The old form is still supported. - Add `limactl copy --backend=rsync` flag as an alternative to `scp` backend ([#3143](lima-vm/lima#3143), thanks to [@olamilekan000](https://github.com/olamilekan000)) - Add `limactl list--yq` and `limactl info --yq` flags ([#3998](lima-vm/lima#3998), thanks to [@jandubois](https://github.com/jandubois)) - Add `limactl rename OLD NEW` ([#4207](lima-vm/lima#4207)) - Deprecate `--yes` and introduce `limactl (clone|rename|edit|shell) --start` instead ([#4108](lima-vm/lima#4108), [#4285](lima-vm/lima#4285), thanks to [@Horiodino](https://github.com/Horiodino) [@nlordell](https://github.com/nlordell)) - YAML: - Migrate `cpuType` to `vmOpts.qemu` ([#3500](lima-vm/lima#3500), thanks to [@unsuman](https://github.com/unsuman)) - Add `yq` provision mode ([#3892](lima-vm/lima#3892), thanks to [@norio-nomura](https://github.com/norio-nomura)) - Prohibit relative paths in YAML ([#3950](lima-vm/lima#3950)). Relative paths were never intended to be supported, but they were accidentally allowed due to a regression in v1.1.0. The CLI command `limactl (create|start|edit) --mount DIR` still supports relative paths. - Default template: - Remove `/tmp/lima` mount ([#3951](lima-vm/lima#3951)) - Stop hardcoding SSH port 60022 ([#3780](lima-vm/lima#3780)) - Network: - Enable mDNS for vzNAT and socket\_vmnet ([#4272](lima-vm/lima#4272), thanks to [@norio-nomura](https://github.com/norio-nomura)) - Port forwarding: - Support port forwarding in plain mode ([#3699](lima-vm/lima#3699), thanks to [@Horiodino](https://github.com/Horiodino)) - Support host sockets in gRPC port forwarder ([#4008](lima-vm/lima#4008), thanks to [@norio-nomura](https://github.com/norio-nomura)) - Forward UDP ports by default ([#4054](lima-vm/lima#4054)) - Eliminated 3-second delay for detecting ports ([#4066](lima-vm/lima#4066)) - Removed iptables watcher for `sudo nerdctl run -p ...` ([#4107](lima-vm/lima#4107)). `sudo nerdctl run -p ...` now requires nerdctl v2.1.6 or later. - Improved performance of gRPC forwarder ([#4247](lima-vm/lima#4247), thanks to [@balajiv113](https://github.com/balajiv113)) - Support UDP in Kubernetes ([#4233](lima-vm/lima#4233)) - Change default of `guestIPMustBeZero` to `true` when `guestIP` is `0.0.0.0` ([#4221](lima-vm/lima#4221), thanks to [@jandubois](https://github.com/jandubois)) - Build system: - Remove `Kconfig` and `config.mk`, in favor of Makefile variables ([#3732](lima-vm/lima#3732)) - Support Fedora, RHEL, and relevant host distributions ([#4228](lima-vm/lima#4228), thanks to [@valdela1](https://github.com/valdela1)) - Templates: - `alpine`, `alpine-iso`: update to Alpine 3.22 ([#4184](lima-vm/lima#4184), [#4190](lima-vm/lima#4190), thanks to [@jandubois](https://github.com/jandubois)) - `debian`: update to Debian 13 ([#4029](lima-vm/lima#4029), thanks to [@unsuman](https://github.com/unsuman)) - `docker`, `docker-rootful`: Enable containerd image store ([#3941](lima-vm/lima#3941), thanks to [@norio-nomura](https://github.com/norio-nomura)) - `fedora`: update to Fedora 43 ([#4255](lima-vm/lima#4255)) - `opensuse`: update to openSUSE Leap 16 ([#4203](lima-vm/lima#4203)) - `oraclelinux`: update to Oracle Linux 10 ([#4236](lima-vm/lima#4236), thanks to [@valdela1](https://github.com/valdela1)) - `ubuntu`, `default`: update Ubuntu to 25.10 ([#4202](lima-vm/lima#4202)) - `k0s`: New template ([#3728](lima-vm/lima#3728), thanks to [@plandem](https://github.com/plandem)) - `experimental/ubuntu-next`: update to Ubuntu 26.04 pre-release ([#4311](lima-vm/lima#4311)) - Project: - Invite Ansuman Sahoo ([@unsuman](https://github.com/unsuman)) as a Reviewer ([#4003](lima-vm/lima#4003), thanks to [@jandubois](https://github.com/jandubois)) - Promote from CNCF Sandbox to Incubating ([#4201](lima-vm/lima#4201)) Full changes: <https://github.com/lima-vm/lima/milestone/59?closed=1> Thanks to [@AndiDog](https://github.com/AndiDog) [@Horiodino](https://github.com/Horiodino) [@afbjorklund](https://github.com/afbjorklund) [@alexandear](https://github.com/alexandear) [@ashwat287](https://github.com/ashwat287) [@balajiv113](https://github.com/balajiv113) [@bonifaido](https://github.com/bonifaido) [@dharsanb](https://github.com/dharsanb) [@gnawhleinad](https://github.com/gnawhleinad) [@iamleot](https://github.com/iamleot) [@jandubois](https://github.com/jandubois) [@kachick](https://github.com/kachick) [@muchzill4](https://github.com/muchzill4) [@ningmingxiao](https://github.com/ningmingxiao) [@nlordell](https://github.com/nlordell) [@norio-nomura](https://github.com/norio-nomura) [@olamilekan000](https://github.com/olamilekan000) [@plandem](https://github.com/plandem) [@stek29](https://github.com/stek29) [@unsuman](https://github.com/unsuman) [@valdela1](https://github.com/valdela1) [@vax-r](https://github.com/vax-r) [@vishalanarase](https://github.com/vishalanarase) [@zyfy29](https://github.com/zyfy29) #### EOL of v1.2 Lima v1.2 will continue to receive security updates and critical bug fixes until **2026-02-06** (3 months from now). See also <https://lima-vm.io/docs/releases/>. #### Usage ```console $ limactl create $ limactl start ... INFO[0029] READY. Run `lima` to open the shell. $ lima uname Linux ``` *** The binaries were built automatically on GitHub Actions. The build log is available for 90 days: <https://github.com/lima-vm/lima/actions/runs/19130682878> The sha256sum of the SHA256SUMS file itself is `112f1ef1d9850e29b4be425ca71e8b6ac686f593ff741164885b51fbd6919ca6` . *** Release manager: [@AkihiroSuda](https://github.com/AkihiroSuda) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

AkihiroSuda reviewed May 7, 2025

View reviewed changes

AkihiroSuda added this to the v1.1.0 milestone May 7, 2025

AkihiroSuda added the component/qemu QEMU label May 7, 2025

AkihiroSuda reviewed May 7, 2025

View reviewed changes

pkg/limayaml/limayaml.go Show resolved Hide resolved

unsuman force-pushed the fix/revamp-cputype branch 3 times, most recently from aca2e46 to 3ee6999 Compare May 7, 2025 09:56

unsuman commented May 7, 2025

View reviewed changes

unsuman mentioned this pull request May 7, 2025

Eventually VMOpts should be defined as map[string]any, and QEMUOpts should be moved to pkg/qemu. #3506

Closed

jandubois reviewed May 8, 2025

View reviewed changes

jandubois requested changes May 9, 2025

View reviewed changes

AkihiroSuda modified the milestones: v1.1.0, v1.1.x (?) May 9, 2025

unsuman force-pushed the fix/revamp-cputype branch from 3ee6999 to e1df631 Compare May 18, 2025 11:58

AkihiroSuda modified the milestones: v1.1.x (?), v2.0 (?) Jun 30, 2025

unsuman force-pushed the fix/revamp-cputype branch 2 times, most recently from 924ef42 to d712d43 Compare July 8, 2025 10:48

refactor: migrate cpuType to qemu

cf8706e

Signed-off-by: Ansuman Sahoo <anshumansahoo500@gmail.com>

unsuman force-pushed the fix/revamp-cputype branch from d712d43 to cf8706e Compare July 8, 2025 10:56

AkihiroSuda requested a review from jandubois July 14, 2025 08:19

AkihiroSuda approved these changes Jul 15, 2025

View reviewed changes

AkihiroSuda requested a review from afbjorklund July 15, 2025 02:52

unsuman mentioned this pull request Jul 25, 2025

refactor: move driver specific code to drivers #3770

Closed

jandubois approved these changes Jul 28, 2025

View reviewed changes

This comment was marked as duplicate.

Sign in to view

jandubois merged commit 2bfc04a into lima-vm:master Jul 28, 2025
36 checks passed

refactor: migrate cpuType to vmOpts.qemu #3500

refactor: migrate cpuType to vmOpts.qemu #3500

Uh oh!

Conversation

unsuman commented May 6, 2025

Description

Uh oh!

AkihiroSuda May 7, 2025

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda May 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

unsuman May 7, 2025

Choose a reason for hiding this comment

Uh oh!

jandubois left a comment

Choose a reason for hiding this comment

Uh oh!

jandubois May 8, 2025

Choose a reason for hiding this comment

Uh oh!

jandubois left a comment

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda left a comment

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda commented Jul 28, 2025

Uh oh!

jandubois left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as duplicate.

Uh oh!

This comment was marked as duplicate.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

refactor: migrate `cpuType` to `vmOpts.qemu` #3500

refactor: migrate `cpuType` to `vmOpts.qemu` #3500