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>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>, "Dr. David Alan Gilbert" <dave@treblig.org>, Peter Maydell <peter.maydell@linaro.org>, Jan Kiszka <jan.kiszka@web.de>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Laurent Vivier <laurent@vivier.eu>, "Michael S. Tsirkin" <mst@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, BALATON Zoltan <balaton@eik.bme.hu>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Alex Bennée" <alex.bennee@linaro.org>
MAINTAINERS | 1 +
docs/about/deprecated.rst | 20 ++
audio/audio.h | 185 -----------
audio/audio_int.h | 67 ++--
audio/audio_template.h | 44 ++-
audio/mixeng.h | 1 -
hw/audio/lm4549.h | 4 +-
include/hw/audio/asc.h | 4 +-
include/hw/audio/model.h | 14 +
include/hw/audio/soundhw.h | 13 -
include/hw/audio/virtio-snd.h | 4 +-
include/hw/display/xlnx_dp.h | 4 +-
include/hw/isa/vt82c686.h | 4 +-
include/hw/qdev-properties-system.h | 2 +-
include/monitor/qdev.h | 3 +
include/qemu/audio-capture.h | 43 +++
include/qemu/audio.h | 150 +++++++++
include/system/replay.h | 3 +-
ui/vnc.h | 4 +-
audio/alsaaudio.c | 37 +--
audio/audio-hmp-cmds.c | 11 +-
audio/audio.c | 313 +++++++++---------
audio/audio_win_int.c | 2 +-
audio/dbusaudio.c | 20 +-
audio/dsoundaudio.c | 213 +++++-------
audio/jackaudio.c | 3 +-
audio/mixeng.c | 12 +-
audio/noaudio.c | 5 +-
audio/ossaudio.c | 33 +-
audio/paaudio.c | 24 +-
audio/pwaudio.c | 15 +-
audio/sdlaudio.c | 15 +-
audio/sndioaudio.c | 3 +-
audio/spiceaudio.c | 7 +-
audio/wavaudio.c | 6 +-
audio/wavcapture.c | 5 +-
hw/arm/integratorcp.c | 2 +-
hw/arm/musicpal.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/xlnx-zcu102.c | 2 +-
hw/audio/ac97.c | 36 +-
hw/audio/adlib.c | 17 +-
hw/audio/asc.c | 15 +-
hw/audio/cs4231a.c | 16 +-
hw/audio/es1370.c | 30 +-
hw/audio/gus.c | 17 +-
hw/audio/hda-codec.c | 21 +-
hw/audio/intel-hda.c | 22 +-
hw/audio/lm4549.c | 12 +-
hw/audio/marvell_88w8618.c | 2 +-
hw/audio/{soundhw.c => model.c} | 86 ++---
hw/audio/pcspk.c | 13 +-
hw/audio/pl041.c | 2 +-
hw/audio/sb16.c | 23 +-
hw/audio/via-ac97.c | 11 +-
hw/audio/virtio-snd-pci.c | 18 +-
hw/audio/virtio-snd.c | 17 +-
hw/audio/wm8750.c | 37 +--
hw/core/machine.c | 4 +-
hw/core/qdev-properties-system.c | 17 +-
hw/display/xlnx_dp.c | 8 +-
hw/ppc/prep.c | 2 +-
hw/usb/dev-audio.c | 17 +-
qom/object.c | 1 +
replay/replay-audio.c | 4 +-
replay/stubs-system.c | 2 +-
system/qdev-monitor.c | 25 +-
system/runstate.c | 2 +-
system/vl.c | 14 +-
ui/dbus.c | 13 +-
ui/vnc.c | 10 +-
audio/coreaudio.m | 3 +-
audio/meson.build | 7 +-
hmp-commands-info.hx | 6 +-
hmp-commands.hx | 9 +-
hw/audio/meson.build | 2 +-
.../codeconverter/test_regexps.py | 4 +-
79 files changed, 898 insertions(+), 953 deletions(-)
delete mode 100644 audio/audio.h
create mode 100644 include/hw/audio/model.h
delete mode 100644 include/hw/audio/soundhw.h
create mode 100644 include/qemu/audio-capture.h
create mode 100644 include/qemu/audio.h
rename hw/audio/{soundhw.c => model.c} (54%)