Failed in applying to current master (
apply log)
Maintainers: Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Mads Ynddal <mads@ynddal.dk>, Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Alexander Graf <agraf@csgraf.de>, Stefan Hajnoczi <stefanha@redhat.com>
docs/system/arm/virt.rst | 35 +++-
docs/system/security.rst | 26 +++
include/hw/arm/virt.h | 2 -
include/system/hvf_int.h | 23 ++-
target/arm/internals.h | 6 +-
accel/hvf/hvf-accel-ops.c | 4 +-
cpu-common.c | 3 +
hw/arm/virt.c | 33 +--
hw/gpio/pl061.c | 16 +-
hw/vmapple/vmapple.c | 4 +-
target/arm/cpu.c | 2 +-
target/arm/cpu64.c | 8 +-
target/arm/helper.c | 2 +-
target/arm/hvf/hvf.c | 244 +++++++++++++---------
target/arm/tcg/psci.c | 3 +
target/i386/hvf/hvf.c | 484 +++++++++++++++++++++++---------------------
target/i386/hvf/x86hvf.c | 4 +-
target/arm/hvf/trace-events | 6 +-
target/arm/trace-events | 3 +
trace-events | 2 +
20 files changed, 511 insertions(+), 399 deletions(-)