From 1c19e8cc2040bb3100e17c426bf6cab0c83debe4 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 29 Mar 2023 16:57:28 +0200 Subject: Update qemu arguments for changed sound options Recent qemu deprecated -soundhw and uses a new syntax. Adapt our wrapper to use it. Bug-AGL: SPEC-4731 Signed-off-by: Jan-Simon Moeller Change-Id: I6af0f2184ba09781a55ae173ece7cea3d7ddaddb --- templates/machines/qemuarm.jinja2 | 2 +- templates/machines/qemuarm64.jinja2 | 2 +- templates/machines/qemux86-64.jinja2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index bdcccaf..29c217c 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -10,7 +10,7 @@ {%- set qemu_cpu = "cortex-a15" %} {%- set qemu_machine = "virt-2.11" %} {%- set qemu_memory = "2048" %} -{%- set qemu_args = "-smp 2 -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=128,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd" %} +{%- set qemu_args = "-smp 2 -audiodev none,id=agl,out.channels=2,in.channels=1 -device ich9-intel-hda -device hda-micro,audiodev=agl -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=128,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd" %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose earlyprintk systemd.log_color=false mem=2048M vmalloc=192M memblock=debug cma=160M " %} {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2 index 0aeb9a1..5425934 100644 --- a/templates/machines/qemuarm64.jinja2 +++ b/templates/machines/qemuarm64.jinja2 @@ -10,7 +10,7 @@ {%- set qemu_cpu = "cortex-a57" %} {%- set qemu_machine = "virt" %} {%- set qemu_memory = "4096" %} -{%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=128,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd " %} +{%- set qemu_args = "-smp 2 -audiodev none,id=agl,out.channels=2,in.channels=1 -device ich9-intel-hda -device hda-micro,audiodev=agl -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=128,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd " %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose mem=4096M systemd.log_color=false " %} {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 74b3915..45dc936 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -7,7 +7,7 @@ {%- set device_mach = "x86" %} {%- set qemu_arch = "x86_64" %} {%- set qemu_model = "model=virtio" %} -{%- set qemu_args = "-machine q35 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio -device qemu-xhci -device usb-tablet -device usb-kbd " %} +{%- set qemu_args = "-machine q35 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -audiodev none,id=agl,out.channels=2,in.channels=1 -device ich9-intel-hda -device hda-micro,audiodev=agl -device usb-ehci -device virtio-rng-pci -vga virtio -device qemu-xhci -device usb-tablet -device usb-kbd " %} {%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/sda verbose systemd.log_color=false rw fstab=no no_timer_check" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} -- cgit 1.2.3-korg