Failed in applying to current master (
apply log)
MAINTAINERS | 4 +-
include/hw/core/cpu.h | 10 +-
include/sysemu/hax.h | 2 +
include/sysemu/hvf_int.h | 2 +-
include/sysemu/kvm.h | 2 +
include/sysemu/nvmm.h | 2 +
include/sysemu/tcg.h | 2 +
include/sysemu/whpx.h | 2 +
include/sysemu/xen.h | 2 +
target/i386/hax/hax-i386.h | 14 +-
target/i386/hvf/vmx.h | 22 +-
target/i386/hvf/x86hvf.h | 12 +-
accel/hvf/hvf-accel-ops.c | 18 +-
accel/tcg/tcg-accel-ops-mttcg.c | 4 -
accel/tcg/tcg-accel-ops-rr.c | 3 -
target/arm/hvf/hvf.c | 108 ++++-----
target/i386/hax/hax-accel-ops.c | 5 +-
target/i386/hax/hax-all.c | 26 ++-
target/i386/hax/hax-posix.c | 4 +-
target/i386/hax/hax-windows.c | 6 +-
target/i386/hvf/hvf.c | 104 ++++-----
target/i386/hvf/x86.c | 28 +--
target/i386/hvf/x86_descr.c | 26 +--
target/i386/hvf/x86_emu.c | 62 ++---
target/i386/hvf/x86_mmu.c | 4 +-
target/i386/hvf/x86_task.c | 10 +-
target/i386/hvf/x86hvf.c | 364 +++++++++++++++---------------
target/i386/nvmm/nvmm-all.c | 42 ++--
target/i386/whpx/whpx-accel-ops.c | 3 -
target/i386/whpx/whpx-all.c | 45 ++--
.mailmap | 3 +-
31 files changed, 462 insertions(+), 479 deletions(-)