qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1d4706: coreaudio: rename misnamed variable f


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 1d4706: coreaudio: rename misnamed variable fake_as
Date: Tue, 15 Dec 2020 07:47:10 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1d47067394ef79c2a7ed9d4dd0b18cdf24f88f2f
      
https://github.com/qemu/qemu/commit/1d47067394ef79c2a7ed9d4dd0b18cdf24f88f2f
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/coreaudio.c

  Log Message:
  -----------
  coreaudio: rename misnamed variable fake_as

While the variable once was used to fake audio settings, since
commit ed2a4a7941 "audio: proper support for float samples in
mixeng" this is no longer true. Rename the variable to obt_as.
This is the same naming scheme as in audio/sdlaudio.c

Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20201213130528.5863-1-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 53e78d1cfb43df733a278172dd11bc40d2fe69c8
      
https://github.com/qemu/qemu/commit/53e78d1cfb43df733a278172dd11bc40d2fe69c8
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/coreaudio.c

  Log Message:
  -----------
  coreaudio: don't start playback in init routine

Every emulated audio device has a way to enable audio playback. Don't
start playback until the guest enables the audio device to keep the
Core Audio device run state in sync with hw->enabled.

Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20201213130528.5863-2-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: ceb1165e9d60dcf11bd9c2bb04078a96cdc3c65b
      
https://github.com/qemu/qemu/commit/ceb1165e9d60dcf11bd9c2bb04078a96cdc3c65b
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/coreaudio.c

  Log Message:
  -----------
  coreaudio: always stop audio playback on shut down

Always stop audio playback and remove the playback callback when
QEMU exits.

On shut down the function coreaudio_fini_out() destroys the
coreaudio mutex but fails to stop audio playback and to remove the
audio playback callback, because function audio_is_cleaning_up()
always returns true when called from coreaudio_fini_out(). Now
there is a time window from pthread_mutex_destroy() to program
exit where Core Audio may call the audio playback callback which
tries to lock the destroyed coreaudio mutex. This leads to the
following error.

coreaudio: Could not lock voice for audioDeviceIOProc
Reason: Invalid argument

This bug was reported on the qemu-discuss mailing list.
https://lists.nongnu.org/archive/html/qemu-discuss/2020-10/msg00018.html

Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20201213130528.5863-3-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: ba6371b0c374053163a9840a2df05d09848db57a
      
https://github.com/qemu/qemu/commit/ba6371b0c374053163a9840a2df05d09848db57a
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/audio.c
    M audio/audio.h

  Log Message:
  -----------
  audio: remove unused function audio_is_cleaning_up()

The previous commit removed the last call site of
audio_is_cleaning_up(). Remove the now unused function.

Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20201213130528.5863-4-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 44ba6039375615135bb82e9094c43a1cbeb75660
      
https://github.com/qemu/qemu/commit/44ba6039375615135bb82e9094c43a1cbeb75660
  Author: Eduardo Habkost <ehabkost@redhat.com>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M hw/audio/cs4231.c

  Log Message:
  -----------
  cs4231: Get rid of empty property array

An empty props array is unnecessary, we can just not call
device_class_set_props().

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-id: 20201211220529.2290218-2-ehabkost@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: ab32b78cd1b3b31950c4332f0fa8b192295d77fd
      
https://github.com/qemu/qemu/commit/ab32b78cd1b3b31950c4332f0fa8b192295d77fd
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/audio.c

  Log Message:
  -----------
  audio: Simplify audio_bug() removing old code

This code (introduced in commit 1d14ffa97ea, Oct 2005)
is likely unused since years. Time to remove it.  If
the condition is true, simply call abort().

Suggested-by: Gerd Hoffmann <gerd@kraxel.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201210223506.263709-1-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 06c8c375389a54d8e4457d967f4f0896caecefb2
      
https://github.com/qemu/qemu/commit/06c8c375389a54d8e4457d967f4f0896caecefb2
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/audio.c

  Log Message:
  -----------
  audio: add sanity check

Check whenever we actually found the spiceaudio driver
before flipping the can_be_default field.

Fixes: f0c4555edfdd ("audio: remove qemu_spice_audio_init()")
Buglink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977301
Reported-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20201215081151.20095-1-kraxel@redhat.com>


  Commit: ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d
      
https://github.com/qemu/qemu/commit/ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M audio/audio.c
    M audio/audio.h
    M audio/coreaudio.c
    M hw/audio/cs4231.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/audio-20201215-pull-request' into staging

audio: coreaudio playback state fixes.
audio: misc cleanups.

# gpg: Signature made Tue 15 Dec 2020 13:47:57 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20201215-pull-request:
  audio: add sanity check
  audio: Simplify audio_bug() removing old code
  cs4231: Get rid of empty property array
  audio: remove unused function audio_is_cleaning_up()
  coreaudio: always stop audio playback on shut down
  coreaudio: don't start playback in init routine
  coreaudio: rename misnamed variable fake_as

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/5bfbd8170ce7...ffb1e2ed7cd7



reply via email to

[Prev in Thread] Current Thread [Next in Thread]