Failed in applying to current master (
apply log)
Maintainers: Rob Herring <robh@kernel.org>, Peter Maydell <peter.maydell@linaro.org>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Clément Chigot" <chigot@adacore.com>, Frederic Konrad <konrad.frederic@yahoo.fr>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, "Michael S. Tsirkin" <mst@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, John Snow <jsnow@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, BALATON Zoltan <balaton@eik.bme.hu>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Paul Burton <paulburton@kernel.org>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Huacai Chen <chenhuacai@kernel.org>
MAINTAINERS | 4 +-
hw/ide/ahci_internal.h | 10 +-
include/hw/arm/allwinner-a10.h | 2 +-
include/hw/arm/allwinner-r40.h | 2 +-
include/hw/arm/xlnx-zynqmp.h | 2 +-
include/hw/char/grlib_uart.h | 32 ++++
include/hw/dma/i8257.h | 2 +-
include/hw/ide/ahci-pci.h | 22 +++
include/hw/ide/ahci-sysbus.h | 35 +++++
include/hw/ide/ahci.h | 38 +----
.../hw/{sparc/grlib.h => intc/grlib_irqmp.h} | 18 +--
include/hw/misc/mips_itu.h | 6 -
include/hw/rx/rx62n.h | 2 -
include/hw/timer/grlib_gptimer.h | 32 ++++
target/mips/cpu.h | 6 +-
target/mips/internal.h | 1 -
target/mips/tcg/translate.h | 1 -
target/sparc/cpu.h | 5 +-
target/sparc/helper.h | 1 +
target/mips/tcg/sysemu_helper.h.inc | 6 -
hw/arm/highbank.c | 2 +-
hw/arm/sbsa-ref.c | 1 +
hw/block/tc58128.c | 4 +-
hw/char/grlib_apbuart.c | 6 +-
hw/dma/i82374.c | 2 +-
hw/dma/i8257.c | 4 +-
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 57 +++----
hw/ide/ahci-allwinner.c | 3 +-
hw/ide/ahci.c | 29 ++--
hw/ide/ich.c | 10 +-
hw/intc/grlib_irqmp.c | 110 ++++++++-----
hw/isa/fdc37m81x-superio.c | 32 ++++
hw/isa/isa-superio.c | 18 ---
hw/isa/lpc_ich9.c | 2 +-
hw/isa/piix.c | 2 +-
hw/isa/smc37c669-superio.c | 1 -
hw/isa/vt82c686.c | 2 +-
hw/mips/boston.c | 14 +-
hw/mips/cps.c | 3 -
hw/mips/jazz.c | 2 +-
hw/mips/mipssim.c | 7 +-
hw/misc/macio/macio.c | 9 +-
hw/misc/mips_itu.c | 35 +----
hw/ppc/prep.c | 2 +-
hw/rx/rx-gdbsim.c | 1 +
hw/rx/rx62n.c | 17 ++-
hw/sh4/r2d.c | 2 +-
hw/sparc/leon3.c | 144 ++++++++++++------
hw/sparc/sun4m.c | 7 +-
hw/sparc64/sparc64.c | 4 +-
hw/timer/grlib_gptimer.c | 6 +-
target/mips/sysemu/machine.c | 4 +-
target/mips/tcg/sysemu/cp0_helper.c | 63 --------
target/mips/tcg/translate.c | 62 --------
target/sparc/helper.c | 16 ++
target/sparc/translate.c | 13 +-
hw/isa/Kconfig | 20 +--
hw/isa/meson.build | 1 +
hw/mips/Kconfig | 6 +-
60 files changed, 491 insertions(+), 461 deletions(-)
create mode 100644 include/hw/char/grlib_uart.h
create mode 100644 include/hw/ide/ahci-pci.h
create mode 100644 include/hw/ide/ahci-sysbus.h
rename include/hw/{sparc/grlib.h => intc/grlib_irqmp.h} (83%)
create mode 100644 include/hw/timer/grlib_gptimer.h
create mode 100644 hw/isa/fdc37m81x-superio.c