summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2022-03-09 11:02:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-09 08:27:04 +0100
commit33cf6f26b2254368ffdfcd9e79228bf750d0383c (patch)
tree4f8638637ce9cf1f8d21f64074b08aca531dfa0c
parenta5dea17662d6e91b662a0db2148474abb12e3475 (diff)
downloadpoky-33cf6f26b2254368ffdfcd9e79228bf750d0383c.tar.gz
conf/machine: fix QEMU x86 sound options
This updates the QEMU sounds options for x86 emulation, when "runqemu" is called with the "audio" argument, to fix the below error: runqemu - ERROR - Failed to run qemu: qemu-system-x86_64: warning: '-soundhw ac97' is deprecated, please use '-device AC97' instead (From OE-Core rev: 122dd0fb043234d62468bbaf397b6c388d2844a8) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b802a5dd1a79c7be3bc790223a733ebc9be4f117) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qemuboot.bbclass2
-rw-r--r--meta/conf/machine/include/x86/qemuboot-x86.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 5e7e7c0659..2bde12748d 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -29,7 +29,7 @@
29# 29#
30# QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio 30# QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio
31# 31#
32# QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used 32# QB_AUDIO_OPT: qemu audio option, e.g., "-device AC97", used
33# when QB_AUDIO_DRV is set. 33# when QB_AUDIO_DRV is set.
34# 34#
35# QB_RNG: Pass-through for host random number generator, it can speedup boot 35# QB_RNG: Pass-through for host random number generator, it can speedup boot
diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc
index d3b91070a8..b7b6428e44 100644
--- a/meta/conf/machine/include/x86/qemuboot-x86.inc
+++ b/meta/conf/machine/include/x86/qemuboot-x86.inc
@@ -8,7 +8,7 @@ QB_CPU:x86-64 = "-cpu IvyBridge -machine q35"
8QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35" 8QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
9 9
10QB_AUDIO_DRV = "alsa" 10QB_AUDIO_DRV = "alsa"
11QB_AUDIO_OPT = "-soundhw ac97,es1370" 11QB_AUDIO_OPT = "-device AC97"
12QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1" 12QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1"
13QB_OPT_APPEND = "-usb -device usb-tablet" 13QB_OPT_APPEND = "-usb -device usb-tablet"
14 14