Failed in applying to current master (
apply log)
include/hw/core/cpu.h | 11 ++---
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 ++++---
accel/hvf/hvf-accel-ops.c | 16 +++----
accel/tcg/tcg-accel-ops-mttcg.c | 4 --
accel/tcg/tcg-accel-ops-rr.c | 3 --
target/arm/hvf/hvf.c | 70 +++++++++++++++----------------
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/nvmm/nvmm-all.c | 38 +++++++----------
target/i386/whpx/whpx-accel-ops.c | 3 --
target/i386/whpx/whpx-all.c | 39 +++++++----------
20 files changed, 123 insertions(+), 130 deletions(-)