Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Alistair Francis <Alistair.Francis@wdc.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Beniamino Galvani <b.galvani@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Eric Auger <eric.auger@redhat.com>, Coiby Xu <Coiby.Xu@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Laurent Vivier <lvivier@redhat.com>, Fam Zheng <fam@euphon.net>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>, Havard Skinnemoen <hskinnemoen@google.com>, Tyrone Ting <kfting@nuvoton.com>
MAINTAINERS | 1 -
docs/about/deprecated.rst | 23 ++++++----
docs/about/removed-features.rst | 10 +++++
configure | 25 +++--------
meson.build | 19 +++++---
include/hw/arm/allwinner-a10.h | 1 -
include/hw/arm/smmuv3.h | 1 -
include/hw/char/ibex_uart.h | 1 -
include/hw/ssi/ibex_spi_host.h | 1 -
include/qemu/vhost-user-server.h | 1 -
include/ui/console.h | 1 -
hw/char/ibex_uart.c | 1 +
hw/display/vhost-user-gpu.c | 1 +
hw/display/virtio-gpu-udmabuf.c | 1 +
hw/display/virtio-gpu-virgl.c | 1 +
hw/misc/applesmc.c | 1 +
hw/misc/sga.c | 71 ------------------------------
hw/s390x/event-facility.c | 3 +-
hw/ssi/ibex_spi_host.c | 1 +
tests/qtest/bios-tables-test.c | 75 ++++++++++++++++++++++++++++++--
tests/qtest/device-plug-test.c | 41 +++++++++++++----
tests/qtest/drive_del-test.c | 65 +++++++++++++++++++++++++++
tests/qtest/fuzz-lsi53c895a-test.c | 4 ++
tests/qtest/hd-geo-test.c | 38 ++++++++++------
tests/qtest/npcm7xx_pwm-test.c | 27 +++++++++---
tests/qtest/pxe-test.c | 4 ++
ui/console.c | 1 +
ui/dbus-clipboard.c | 1 +
ui/dbus-console.c | 1 +
ui/dbus-listener.c | 1 +
ui/dbus.c | 1 +
ui/egl-headless.c | 1 +
ui/gtk.c | 1 +
ui/spice-app.c | 1 +
ui/spice-display.c | 1 +
ui/udmabuf.c | 1 +
ui/vdagent.c | 1 +
util/vhost-user-server.c | 1 +
.gitlab-ci.d/buildtest.yml | 19 ++------
.gitmodules | 3 --
hw/i386/Kconfig | 1 -
hw/misc/Kconfig | 4 --
hw/misc/meson.build | 1 -
meson_options.txt | 5 ++-
pc-bios/README | 6 ---
pc-bios/meson.build | 1 -
pc-bios/sgabios.bin | Bin 4096 -> 0 bytes
roms/Makefile | 9 +---
roms/sgabios | 1 -
scripts/meson-buildoptions.sh | 3 ++
tests/migration/guestperf/engine.py | 2 +-
tests/qemu-iotests/186 | 1 +
tests/qtest/meson.build | 17 +++++---
tests/tcg/s390x/Makefile.softmmu-target | 2 +-
54 files changed, 312 insertions(+), 193 deletions(-)
delete mode 100644 hw/misc/sga.c
delete mode 100644 pc-bios/sgabios.bin
delete mode 160000 roms/sgabios