Failed in applying to current master (
apply log)
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>
qapi/audio.json | 2 +-
audio/audio_int.h | 1 +
audio/audio_template.h | 12 ++--
audio/mixeng.h | 6 +-
audio/alsaaudio.c | 2 +-
audio/audio.c | 25 ++++++---
audio/mixeng.c | 83 ++++++++++++++++++++++++----
hw/audio/asc.c | 9 ++-
qemu-options.hx | 4 +-
tests/functional/test_m68k_q800.py | 3 +-
tests/functional/test_m68k_replay.py | 3 +-
11 files changed, 119 insertions(+), 31 deletions(-)