Failed in applying to current master (
apply log)
Maintainers: Viktor Prutyanov <viktor.prutyanov@phystech.edu>, Peter Maydell <peter.maydell@linaro.org>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, Eric Auger <eric.auger@redhat.com>, Shannon Zhao <shannon.zhaosl@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Tyrone Ting <kfting@nuvoton.com>, Hao Wu <wuhaotsh@google.com>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>
MAINTAINERS | 2 +-
docs/system/arm/emulation.rst | 1 +
hw/arm/smmuv3-internal.h | 38 ++++++++
include/hw/arm/bsa.h | 35 +++++++
include/hw/arm/exynos4210.h | 2 +-
include/hw/{misc => arm}/raspberrypi-fw-defs.h | 0
include/hw/arm/virt.h | 12 +--
include/hw/nvram/xlnx-bbram.h | 2 +-
target/arm/common-semi-target.h | 4 +-
target/arm/cpu-qom.h | 2 -
target/arm/cpu.h | 22 +++++
contrib/elf2dmp/addrspace.c | 7 +-
contrib/elf2dmp/main.c | 11 +--
contrib/elf2dmp/pdb.c | 32 ++++---
contrib/elf2dmp/qemu_elf.c | 7 +-
hw/arm/boot.c | 95 +++++--------------
hw/arm/sbsa-ref.c | 21 ++---
hw/arm/smmuv3.c | 8 +-
hw/arm/virt-acpi-build.c | 12 +--
hw/arm/virt.c | 24 +++--
hw/misc/bcm2835_property.c | 2 +-
hw/nvram/xlnx-bbram.c | 8 +-
hw/nvram/xlnx-versal-efuse-ctrl.c | 8 +-
hw/nvram/xlnx-zynqmp-efuse.c | 8 +-
hw/timer/npcm7xx_timer.c | 3 +
target/arm/arm-powerctl.c | 53 +----------
target/arm/cpu.c | 95 +++++++++++++++++++
target/arm/helper.c | 19 +---
target/arm/kvm.c | 28 ++----
target/arm/kvm64.c | 124 +++++++------------------
target/arm/tcg/cpu32.c | 4 +
target/arm/tcg/cpu64.c | 1 +
target/arm/tcg/translate.c | 37 +++++---
33 files changed, 368 insertions(+), 359 deletions(-)
create mode 100644 include/hw/arm/bsa.h
rename include/hw/{misc => arm}/raspberrypi-fw-defs.h (100%)