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é" <f4bug@amsat.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Kashyap Chamarthy <kchamart@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eric Auger <eric.auger@redhat.com>, David Hildenbrand <david@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>
docs/specs/pci-ids.txt | 16 +++--
audio/audio_int.h | 4 +-
audio/audio_template.h | 4 ++
audio/rate_template.h | 11 ++--
include/hw/pci/pci.h | 13 +++-
audio/alsaaudio.c | 38 +++++++++++-
audio/audio.c | 111 +++++++++++++++++++++++------------
audio/dbusaudio.c | 4 +-
audio/noaudio.c | 4 +-
audio/spiceaudio.c | 19 ++++--
audio/wavaudio.c | 2 +-
hw/display/cirrus_vga.c | 2 +-
hw/virtio/virtio-iommu-pci.c | 4 +-
hw/virtio/virtio-mem-pci.c | 2 -
hw/virtio/virtio-pci.c | 2 +-
hw/virtio/virtio-pmem-pci.c | 2 -
qemu-edid.c | 4 ++
ui/gtk-egl.c | 3 +
ui/gtk.c | 25 +++++---
ui/vnc.c | 11 +++-
docs/interop/firmware.json | 21 +++++--
qapi/ui.json | 5 +-
qemu-options.hx | 3 +
23 files changed, 218 insertions(+), 92 deletions(-)