Add audio device to limayaml and qemu

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

examples/default.yaml

@@ -244,6 +244,12 @@ firmware:
   # 🟢 Builtin default: false
   legacyBIOS: null
 
+audio:
+  # QEMU audiodev, e.g., "none", "coreaudio", "pa", "alsa", "oss".
+  # Choosing "none" will mute the audio output, and not play any sound.
+  # 🟢 Builtin default: ""
+  device: null
+
 video:
   # QEMU display, e.g., "none", "cocoa", "sdl", "gtk", "vnc", "default".
   # Choosing "none" will hide the video output, and not show any window.

pkg/limayaml/defaults.go

@@ -199,6 +199,16 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 
 	y.AdditionalDisks = append(append(o.AdditionalDisks, y.AdditionalDisks...), d.AdditionalDisks...)
 
+	if y.Audio.Device == nil {
+		y.Audio.Device = d.Audio.Device
+	}
+	if o.Audio.Device != nil {
+		y.Audio.Device = o.Audio.Device
+	}
+	if y.Audio.Device == nil {
+		y.Audio.Device = pointer.String("")
+	}
+
 	if y.Video.Display == nil {
 		y.Video.Display = d.Video.Display
 	}

pkg/limayaml/defaults_test.go

@@ -77,6 +77,9 @@ func TestFillDefault(t *testing.T) {
 		Firmware: Firmware{
 			LegacyBIOS: pointer.Bool(false),
 		},
+		Audio: Audio{
+			Device: pointer.String(""),
+		},
 		Video: Video{
 			Display: pointer.String("none"),
 			VNC: VNCOptions{
@@ -281,6 +284,9 @@ func TestFillDefault(t *testing.T) {
 		Firmware: Firmware{
 			LegacyBIOS: pointer.Bool(true),
 		},
+		Audio: Audio{
+			Device: pointer.String("coreaudio"),
+		},
 		Video: Video{
 			Display: pointer.String("cocoa"),
 			VNC: VNCOptions{
@@ -449,6 +455,9 @@ func TestFillDefault(t *testing.T) {
 		Firmware: Firmware{
 			LegacyBIOS: pointer.Bool(true),
 		},
+		Audio: Audio{
+			Device: pointer.String("coreaudio"),
+		},
 		Video: Video{
 			Display: pointer.String("cocoa"),
 			VNC: VNCOptions{

pkg/limayaml/limayaml.go

@@ -19,6 +19,7 @@ type LimaYAML struct {
 	MountType       *MountType      `yaml:"mountType,omitempty" json:"mountType,omitempty"`
 	SSH             SSH             `yaml:"ssh,omitempty" json:"ssh,omitempty"` // REQUIRED (FIXME)
 	Firmware        Firmware        `yaml:"firmware,omitempty" json:"firmware,omitempty"`
+	Audio           Audio           `yaml:"audio,omitempty" json:"audio,omitempty"`
 	Video           Video           `yaml:"video,omitempty" json:"video,omitempty"`
 	Provision       []Provision     `yaml:"provision,omitempty" json:"provision,omitempty"`
 	Containerd      Containerd      `yaml:"containerd,omitempty" json:"containerd,omitempty"`
@@ -122,6 +123,11 @@ type Firmware struct {
 	LegacyBIOS *bool `yaml:"legacyBIOS,omitempty" json:"legacyBIOS,omitempty"`
 }
 
+type Audio struct {
+	// Device is a QEMU audiodev string
+	Device *string `yaml:"device,omitempty" json:"device,omitempty"`
+}
+
 type VNCOptions struct {
 	Display *string `yaml:"display,omitempty" json:"display,omitempty"`
 }

pkg/qemu/qemu.go

@@ -378,8 +378,9 @@ func Cmdline(cfg Config) (string, []string, error) {
 			// https://qemu-project.gitlab.io/qemu/system/invocation.html?highlight=tcg%20opts
 			// this will make sure each vCPU will be backed by 1 host user thread.
 			args = appendArgsIfNoConflict(args, "-accel", "tcg,thread=multi,tb-size=512")
-			// This will disable CPU S3 state.
+			// This will disable CPU S3/S4 state.
 			args = append(args, "-global", "ICH9-LPC.disable_s3=1")
+			args = append(args, "-global", "ICH9-LPC.disable_s4=1")
 		} else if runtime.GOOS == "windows" && accel == "whpx" {
 			// whpx: injection failed, MSI (0, 0) delivery: 0, dest_mode: 0, trigger mode: 0, vector: 0
 			args = appendArgsIfNoConflict(args, "-machine", "q35,accel="+accel+",kernel-irqchip=off")
@@ -589,6 +590,18 @@ func Cmdline(cfg Config) (string, []string, error) {
 	// virtio-rng-pci accelerates starting up the OS, according to https://wiki.gentoo.org/wiki/QEMU/Options
 	args = append(args, "-device", "virtio-rng-pci")
 
+	// Sound
+	if *y.Audio.Device != "" {
+		id := "default"
+		// audio device
+		audiodev := *y.Audio.Device
+		audiodev += fmt.Sprintf(",id=%s", id)
+		args = append(args, "-audiodev", audiodev)
+		// audio controller
+		args = append(args, "-device", "ich9-intel-hda")
+		// audio codec
+		args = append(args, "-device", fmt.Sprintf("hda-output,audiodev=%s", id))
+	}
 	// Graphics
 	if *y.Video.Display != "" {
 		display := *y.Video.Display