Merge pull request #1613 from AkihiroSuda/vz-virtiofs-default

vz: enable virtiofs by default

Author: AkihiroSuda

docs/mount.md

@@ -4,11 +4,12 @@ Lima supports several methods for mounting the host filesystem into the guest.
 
 The default mount type is shown in the following table:
 
-| Lima Version     | Default                             |
-| ---------------- | ----------------------------------- |
-| < 0.10           | reverse-sshfs + Builtin SFTP server |
-| >= 0.10          | reverse-sshfs + OpenSSH SFTP server |
-| >= 1.0 (Planned) | 9p for QEMU, virtiofs for VZ        |
+| Lima Version     | Default                                                       |
+| ---------------- | ------------------------------------------------------------- |
+| < 0.10           | reverse-sshfs + Builtin SFTP server                           |
+| >= 0.10          | reverse-sshfs + OpenSSH SFTP server                           |
+| >= 0.17          | reverse-sshfs + OpenSSH SFTP server for QEMU, virtiofs for VZ |
+| >= 1.0 (Planned) | 9p for QEMU, virtiofs for VZ                                  |
 
 ## Mount types
 

examples/default.yaml

@@ -96,7 +96,7 @@ mounts:
 
 # Mount type for above mounts, such as "reverse-sshfs" (from sshocker), "9p" (EXPERIMENTAL, from QEMU’s virtio-9p-pci, aka virtfs),
 # or "virtiofs" (EXPERIMENTAL, needs `vmType: vz`)
-# 🟢 Builtin default: "reverse-sshfs"
+# 🟢 Builtin default: "reverse-sshfs" (for QEMU), "virtiofs" (for vz)
 mountType: null
 
 # Lima disks to attach to the instance. The disks will be accessible from inside the

pkg/limayaml/defaults.go

@@ -565,7 +565,11 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 		y.MountType = o.MountType
 	}
 	if y.MountType == nil || *y.MountType == "" {
-		y.MountType = pointer.String(REVSSHFS)
+		if *y.VMType == VZ {
+			y.MountType = pointer.String(VIRTIOFS)
+		} else {
+			y.MountType = pointer.String(REVSSHFS)
+		}
 	}
 
 	// Note: DNS lists are not combined; highest priority setting is picked

pkg/limayaml/defaults_test.go

@@ -372,7 +372,7 @@ func TestFillDefault(t *testing.T) {
 	expect.HostResolver.Hosts = map[string]string{
 		"default": d.HostResolver.Hosts["default"],
 	}
-	expect.MountType = pointer.String(REVSSHFS)
+	expect.MountType = pointer.String(VIRTIOFS)
 	expect.CACertificates.RemoveDefaults = pointer.Bool(true)
 	expect.CACertificates.Certs = []string{
 		"-----BEGIN CERTIFICATE-----\nYOUR-ORGS-TRUSTED-CA-CERT\n-----END CERTIFICATE-----\n",