Failed in applying to current master (
apply log)
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Akihiko Odaki <akihiko.odaki@gmail.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <r.bolshakov@yadro.com>, Aurelien Jarno <aurelien@aurel32.net>, Peter Maydell <peter.maydell@linaro.org>, "Alex Bennée" <alex.bennee@linaro.org>
MAINTAINERS | 8 ++
audio/audio.c | 25 +++---
audio/audio_template.h | 27 +++----
audio/{coreaudio.c => coreaudio.m} | 23 +++---
audio/meson.build | 4 +-
block/file-posix.c | 14 +++-
configure | 31 ++++++++
include/qemu/osdep.h | 10 +--
meson.build | 17 +++-
qapi/ui.json | 29 +++++++
qemu-options.hx | 15 ++++
target/i386/hvf/vmx.h | 19 +++--
target/i386/hvf/x86.c | 6 +-
target/i386/hvf/x86.h | 34 --------
target/i386/hvf/x86_mmu.c | 2 +-
target/i386/hvf/x86_task.c | 4 +-
target/i386/hvf/x86hvf.c | 6 +-
target/i386/hvf/x86hvf.h | 2 -
tests/fp/meson.build | 5 ++
ui/cocoa.m | 122 ++++++++++++++++++++++++++---
20 files changed, 283 insertions(+), 120 deletions(-)
rename audio/{coreaudio.c => coreaudio.m} (97%)