Skip to content

Commit 75d79f5

Browse files
committed
qemu: 9p: graduate from experimental
Signed-off-by: Akihiro Suda <[email protected]>
1 parent a26c031 commit 75d79f5

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

examples/default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ mounts:
112112
# 🔵 This file: true (only for "/tmp/lima")
113113
writable: true
114114

115-
# Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (EXPERIMENTAL, from QEMU’s virtio-9p-pci, aka virtfs),
115+
# Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (EXPERIMENTAL until Lima v1.0, from QEMU’s virtio-9p-pci, aka virtfs),
116116
# or "virtiofs" (EXPERIMENTAL, needs `vmType: vz`; will graduate from experimental in Lima v1.0)
117117
# 🟢 Builtin default: "reverse-sshfs" (for QEMU), "virtiofs" (for vz)
118118
mountType: null

examples/experimental/9p.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# ⚠️ ⚠️ ⚠️ `template://experimental/9p` will be removed in Lima v1.0,
2+
# as 9p will graduate from experimental and will be the default mount type for QEMU.
3+
#
4+
# For Lima v1.0 and later, use the following command instead:
5+
# ```
6+
# limactl create --vm-type=qemu template://default
7+
# ```
8+
19
# This template requires Lima v0.10.0 or later.
210
# On macOS hosts, QEMU needs to be v7.0.0 or later. Homebrew's QEMU v6.2.0_1 can be used too.
311
# This template is planned to be merged to default.yaml in Lima v1.0 (ETA: 2022 Q2).

pkg/limayaml/validate.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,6 @@ func validatePort(field string, port int) error {
508508
}
509509

510510
func warnExperimental(y *LimaYAML) {
511-
if *y.MountType == NINEP {
512-
logrus.Warn("`mountType: 9p` is experimental")
513-
}
514511
if *y.MountType == VIRTIOFS && runtime.GOOS == "linux" {
515512
logrus.Warn("`mountType: virtiofs` on Linux is experimental")
516513
}

website/content/en/docs/config/mount/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Lima prior to v0.10 had used "builtin" as the SFTP driver.
6363

6464
### 9p
6565
> **Warning**
66-
> "9p" mode is experimental
66+
> "9p" mode is experimental (will graduate from experimental in Lima v1.0)
6767

6868
The "9p" mount type is implemented by using QEMU's virtio-9p-pci devices.
6969
virtio-9p-pci is also known as "virtfs", but note that this is unrelated to [virtio-fs](https://virtio-fs.gitlab.io/).

website/content/en/docs/releases/experimental/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ weight: 10
66

77
The following features are experimental and subject to change:
88

9-
- `mountType: 9p`
9+
- `mountType: 9p` (will graduate from experimental in Lima v1.0)
1010
- `mountType: virtiofs` on Linux
1111
- `vmType: vz` and relevant configurations (`mountType: virtiofs`, `rosetta`, `[]networks.vzNAT`)
1212
(will graduate from experimental in Lima v1.0)

0 commit comments

Comments
 (0)