meson.build | 4 +- include/exec/cpu-all.h | 4 - include/exec/cpu-common.h | 39 ++++++++++ include/exec/cpu_ldst.h | 1 + include/exec/exec-all.h | 26 ------- include/exec/gdbstub.h | 25 +++--- include/exec/poison.h | 2 - include/hw/core/cpu.h | 33 ++++---- include/qemu/typedefs.h | 2 + include/sysemu/accel-ops.h | 3 + include/sysemu/arch_init.h | 2 + include/sysemu/hax.h | 18 +++-- include/sysemu/hw_accel.h | 5 -- include/sysemu/kvm.h | 6 +- include/sysemu/memory_mapping.h | 5 +- target/alpha/cpu-qom.h | 3 +- target/alpha/cpu.h | 11 +-- target/arm/cpu-qom.h | 3 +- target/arm/cpu.h | 7 +- target/arm/hvf_arm.h | 2 +- target/avr/cpu-qom.h | 3 +- target/avr/cpu.h | 13 +--- target/cris/cpu-qom.h | 3 +- target/cris/cpu.h | 7 +- target/hexagon/cpu.h | 23 ++---- target/hppa/cpu-qom.h | 3 +- target/hppa/cpu.h | 12 +-- target/i386/cpu-qom.h | 3 +- target/i386/cpu.h | 7 +- target/i386/hvf/x86_emu.h | 22 +++--- target/m68k/cpu-qom.h | 3 +- target/m68k/cpu.h | 7 +- target/microblaze/cpu-qom.h | 3 +- target/microblaze/cpu.h | 9 +-- target/microblaze/mmu.h | 2 + target/mips/cpu-qom.h | 3 +- target/mips/cpu.h | 10 +-- target/mips/internal.h | 15 ++-- target/nios2/cpu.h | 9 +-- target/nios2/mmu.h | 2 + target/openrisc/cpu.h | 17 ++--- target/ppc/cpu-qom.h | 5 +- target/ppc/cpu.h | 7 +- target/riscv/cpu.h | 11 +-- target/riscv/pmp.h | 2 + target/rx/cpu-qom.h | 5 +- target/rx/cpu.h | 6 +- target/s390x/cpu-qom.h | 7 +- target/s390x/cpu.h | 7 +- target/sh4/cpu-qom.h | 3 +- target/sh4/cpu.h | 7 +- target/sparc/cpu-qom.h | 3 +- target/sparc/cpu.h | 9 +-- target/tricore/cpu-qom.h | 3 +- target/tricore/cpu.h | 10 +-- target/xtensa/cpu-qom.h | 3 +- target/xtensa/cpu.h | 13 ++-- accel/kvm/kvm-accel-ops.c | 12 +++ accel/qtest/qtest.c | 1 - accel/stubs/hax-stub.c | 2 + accel/stubs/kvm-stub.c | 5 -- accel/tcg/cpu-exec.c | 4 +- accel/tcg/tcg-accel-ops-icount.c | 1 + accel/tcg/tcg-accel-ops-mttcg.c | 1 + accel/tcg/tcg-accel-ops-rr.c | 1 + accel/tcg/tcg-accel-ops.c | 1 + cpu.c | 8 +- softmmu/arch_init.c | 9 +++ softmmu/cpu-timers.c | 1 - softmmu/cpus.c | 23 +++--- softmmu/globals.c | 2 - softmmu/memory_mapping.c | 1 + softmmu/physmem.c | 7 +- softmmu/vl.c | 5 +- target/alpha/translate.c | 1 - target/i386/hax/hax-all.c | 11 +-- target/i386/hvf/x86_emu.c | 110 +++++++++++++-------------- target/i386/nvmm/nvmm-all.c | 14 ++-- target/i386/tcg/sysemu/excp_helper.c | 1 + target/i386/tcg/sysemu/misc_helper.c | 1 + target/i386/whpx/whpx-accel-ops.c | 6 ++ target/i386/whpx/whpx-all.c | 18 ++--- target/riscv/csr.c | 1 + tests/unit/ptimer-test-stubs.c | 1 - accel/meson.build | 12 +-- accel/stubs/meson.build | 11 ++- softmmu/meson.build | 24 +++--- 87 files changed, 371 insertions(+), 402 deletions(-)