Failed in applying to current master (
apply log)
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Richard Henderson <richard.henderson@linaro.org>, Helge Deller <deller@gmx.de>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, Thomas Huth <th.huth+qemu@posteo.eu>, Jason Wang <jasowang@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Alistair Francis <alistair@alistair23.me>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Farhan Ali <alifm@linux.ibm.com>, Laurent Vivier <laurent@vivier.eu>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Marcelo Tosatti <mtosatti@redhat.com>, Fabiano Rosas <farosas@suse.de>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
MAINTAINERS | 10 +-
meson.build | 16 +--
hw/display/ati_int.h | 16 ++-
hw/display/ati_regs.h | 7 +
include/hw/acpi/acpi.h | 1 +
include/hw/acpi/acpi_dev_interface.h | 2 -
include/hw/core/boards.h | 3 -
include/hw/i386/pc.h | 3 -
include/hw/m68k/mcf.h | 5 +-
include/hw/pci-host/astro.h | 2 +
include/hw/s390x/s390-pci-vfio.h | 20 ---
include/qemu/fifo8.h | 10 +-
target/hppa/cpu-qom.h | 8 +-
target/hppa/cpu.h | 35 ++++-
target/i386/cpu.h | 1 -
audio/jackaudio.c | 2 +-
hw/acpi/acpi_interface.c | 19 ---
hw/acpi/aml-build.c | 11 ++
hw/acpi/core.c | 10 ++
hw/arm/aspeed_ast27x0-ssp.c | 7 +-
hw/arm/aspeed_ast27x0-tsp.c | 7 +-
hw/char/diva-gsp.c | 9 +-
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial.c | 47 +++----
hw/core/machine.c | 3 -
hw/display/ati.c | 126 ++++++++++++++++--
hw/display/ati_2d.c | 60 ++++-----
hw/hppa/machine.c | 55 ++++----
hw/i386/pc.c | 16 ---
hw/i386/pc_piix.c | 9 --
hw/i386/pc_q35.c | 9 --
hw/m68k/mcf5208.c | 24 ++--
hw/m68k/mcf_intc.c | 8 +-
hw/misc/ivshmem-pci.c | 13 +-
.../rocker/{qmp-norocker.c => rocker-stubs.c} | 0
hw/net/xilinx_axienet.c | 4 +
hw/net/xilinx_ethlite.c | 12 +-
hw/pci-host/astro.c | 8 +-
hw/s390x/s390-pci-vfio-stubs.c | 32 +++++
hw/uefi/var-service-vars.c | 37 +++++
linux-user/hppa/elfload.c | 2 +-
target/hppa/cpu.c | 55 ++++++--
target/hppa/mem_helper.c | 39 ++----
target/i386/cpu.c | 2 -
target/i386/kvm/kvm.c | 15 +--
tests/qtest/machine-none-test.c | 2 +-
util/fifo8.c | 10 +-
hw/acpi/meson.build | 28 ++--
hw/arm/Kconfig | 2 +-
hw/char/trace-events | 4 +-
hw/cxl/meson.build | 4 +-
hw/i386/kvm/meson.build | 5 +-
hw/mem/meson.build | 4 +-
hw/net/meson.build | 3 +-
hw/net/trace-events | 1 +
hw/nvram/meson.build | 4 +-
hw/pci/meson.build | 2 +-
hw/s390x/meson.build | 1 +
hw/smbios/meson.build | 10 +-
hw/usb/meson.build | 3 +-
hw/virtio/meson.build | 9 +-
semihosting/meson.build | 9 +-
tests/functional/hppa/test_seabios.py | 4 +-
ui/cocoa.m | 9 +-
64 files changed, 538 insertions(+), 358 deletions(-)
rename hw/net/rocker/{qmp-norocker.c => rocker-stubs.c} (100%)
create mode 100644 hw/s390x/s390-pci-vfio-stubs.c