[RESEND] conf/machine: fix QEMU x86 sound options

Message ID 20220309100259.607050-1-michael.opdenacker@bootlin.com
State Accepted, archived
Commit b802a5dd1a79c7be3bc790223a733ebc9be4f117
Headers show
Series [RESEND] conf/machine: fix QEMU x86 sound options | expand

Commit Message

Michael Opdenacker March 9, 2022, 10:02 a.m. UTC
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

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
 meta/classes/qemuboot.bbclass                  | 2 +-
 meta/conf/machine/include/x86/qemuboot-x86.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Khem Raj March 9, 2022, 5:22 p.m. UTC | #1
On Wed, Mar 9, 2022 at 2:03 AM Michael Opdenacker via
lists.openembedded.org
<michael.opdenacker=bootlin.com@lists.openembedded.org> wrote:
>
> 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
>
> Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
> ---
>  meta/classes/qemuboot.bbclass                  | 2 +-
>  meta/conf/machine/include/x86/qemuboot-x86.inc | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
> index 755d49acd6..ad8489902a 100644
> --- a/meta/classes/qemuboot.bbclass
> +++ b/meta/classes/qemuboot.bbclass
> @@ -29,7 +29,7 @@
>  #
>  # QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio
>  #
> -# QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used
> +# QB_AUDIO_OPT: qemu audio option, e.g., "-device AC97", used
>  #               when QB_AUDIO_DRV is set.
>  #
>  # 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"
>  QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
>
>  QB_AUDIO_DRV = "alsa"
> -QB_AUDIO_OPT = "-soundhw ac97,es1370"
> +QB_AUDIO_OPT = "-device AC97"

we are also dropping es1370 here, can you comment on it.

>  QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1"
>  QB_OPT_APPEND = "-usb -device usb-tablet"
>
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#162955): https://lists.openembedded.org/g/openembedded-core/message/162955
> Mute This Topic: https://lists.openembedded.org/mt/89658861/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 755d49acd6..ad8489902a 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -29,7 +29,7 @@ 
 #
 # QB_AUDIO_DRV: qemu audio driver, e.g., "alsa", set it when support audio
 #
-# QB_AUDIO_OPT: qemu audio option, e.g., "-soundhw ac97,es1370", used
+# QB_AUDIO_OPT: qemu audio option, e.g., "-device AC97", used
 #               when QB_AUDIO_DRV is set.
 #
 # 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"
 QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
 
 QB_AUDIO_DRV = "alsa"
-QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_AUDIO_OPT = "-device AC97"
 QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1"
 QB_OPT_APPEND = "-usb -device usb-tablet"