Re: [PATCH] hw/audio: Fix logic error in hda audio

[Philippe Mathieu-Daudé]

On 16/11/23 08:50, zhouyang23 via wrote:

Commit b7639b7dd0 introduced a logic error about mixer and nomixer.
Cause use micro_mixemu when there is no mixer in HDAAudioState, but
use micro_nomixemu wehen there has a mixer in HDAAuditState.

Cc'ing Marc-André and Volker for
https://lore.kernel.org/qemu-devel/20231105172552.8405-2-vr_q...@t-online.de/

Signed-off-by: zhouyang23 <zhouyan...@xiaomi.com>
---
  hw/audio/hda-codec.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index b9ad1f4c39..87bacb3bee 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -857,7 +857,7 @@ static void hda_audio_init_output(HDACodecDevice *hda, 
Error **errp)
      HDAAudioState *a = HDA_AUDIO(hda);
      const struct desc_codec *desc = &output_nomixemu;

- if (!a->mixer) {

+    if (a->mixer) {
          desc = &output_mixemu;
      }

@@ -869,7 +869,7 @@ static void hda_audio_init_duplex(HDACodecDevice *hda, Error **errp)

      HDAAudioState *a = HDA_AUDIO(hda);
      const struct desc_codec *desc = &duplex_nomixemu;

- if (!a->mixer) {

+    if (a->mixer) {
          desc = &duplex_mixemu;
      }

@@ -881,7 +881,7 @@ static void hda_audio_init_micro(HDACodecDevice *hda, Error **errp)

      HDAAudioState *a = HDA_AUDIO(hda);
      const struct desc_codec *desc = &micro_nomixemu;

- if (!a->mixer) {

+    if (a->mixer) {
          desc = &micro_mixemu;
      }