Merge pull request #1102 from chrisx8/master

jandubois · web-flow · commit 020d7ee10b21 · 2022-10-13T20:18:30.000-07:00
Enable trimming QEMU disks
diff --git a/pkg/qemu/qemu.go b/pkg/qemu/qemu.go
@@ -433,9 +433,9 @@ func Cmdline(cfg Config) (string, []string, error) {
 		args = appendArgsIfNoConflict(args, "-boot", "order=c,splash-time=0,menu=on")
 	}
 	if diskSize, _ := units.RAMInBytes(*cfg.LimaYAML.Disk); diskSize > 0 {
-		args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio", diffDisk))
+		args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio,discard=on", diffDisk))
 	} else if !isBaseDiskCDROM {
-		args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio", baseDisk))
+		args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio,discard=on", baseDisk))
 	}
 	// cloud-init
 	switch *y.Arch {

Original file line number	Diff line number	Diff line change
`@@ -433,9 +433,9 @@ func Cmdline(cfg Config) (string, []string, error) {`
`433`	`433`	`args = appendArgsIfNoConflict(args, "-boot", "order=c,splash-time=0,menu=on")`
`434`	`434`	`}`
`435`	`435`	`if diskSize, _ := units.RAMInBytes(*cfg.LimaYAML.Disk); diskSize > 0 {`
`436`		`- args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio", diffDisk))`
	`436`	`+ args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio,discard=on", diffDisk))`
`437`	`437`	`} else if !isBaseDiskCDROM {`
`438`		`- args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio", baseDisk))`
	`438`	`+ args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio,discard=on", baseDisk))`
`439`	`439`	`}`
`440`	`440`	`// cloud-init`
`441`	`441`	`switch *y.Arch {`