MAINTAINERS | 8 - docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 6 - docs/about/index.rst | 2 +- docs/about/removed-features.rst | 11 +- docs/devel/style.rst | 9 +- docs/system/index.rst | 2 +- docs/system/introduction.rst | 3 - meson.build | 11 +- bsd-user/bsd-file.h | 6 +- crypto/hmacpriv.h | 13 +- {include/hw => hw/i386}/kvm/clock.h | 14 +- hw/ide/ahci_internal.h | 4 +- hw/usb/quirks.h | 2 +- hw/xen/xen_pt.h | 8 +- include/chardev/char-fe.h | 14 + include/crypto/secret_common.h | 14 +- include/elf.h | 4 +- include/exec/address-spaces.h | 2 - include/exec/exec-all.h | 2 +- include/exec/page-vary.h | 4 +- include/exec/poison.h | 1 - include/exec/translation-block.h | 6 +- include/hw/core/cpu.h | 2 +- include/hw/core/tcg-cpu-ops.h | 2 +- include/hw/i2c/npcm7xx_smbus.h | 2 +- include/hw/misc/aspeed_scu.h | 2 +- include/hw/misc/auxbus.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 4 +- include/hw/qdev-core.h | 4 +- include/io/channel-socket.h | 4 +- include/io/task.h | 2 +- include/qemu/crc-ccitt.h | 4 +- include/qemu/fifo8.h | 2 +- include/qemu/iova-tree.h | 4 +- include/qemu/osdep.h | 4 +- include/qemu/processor.h | 2 - include/qemu/rcu.h | 14 +- include/qemu/sys_membarrier.h | 4 +- include/qemu/uri.h | 6 +- include/qemu/yank.h | 2 +- include/sysemu/accel-blocker.h | 14 +- include/sysemu/hax.h | 49 - include/sysemu/hw_accel.h | 1 - include/sysemu/os-win32.h | 4 +- include/tcg/helper-info.h | 2 +- include/tcg/tcg.h | 4 +- include/ui/kbd-state.h | 2 +- include/ui/spice-display.h | 2 +- include/user/safe-syscall.h | 6 +- target/i386/hax/hax-accel-ops.h | 31 - target/i386/hax/hax-i386.h | 98 -- target/i386/hax/hax-interface.h | 369 ------ target/i386/hax/hax-posix.h | 61 - target/i386/hax/hax-windows.h | 88 -- target/i386/sev.h | 6 +- target/mips/cpu.h | 4 +- target/riscv/pmu.h | 3 - tcg/tcg-internal.h | 4 +- ui/keymaps.h | 2 +- ui/vnc-enc-zywrle.h | 4 +- include/exec/memory_ldst.h.inc | 42 +- accel/stubs/hax-stub.c | 24 - accel/tcg/tb-maint.c | 2 +- contrib/plugins/cache.c | 2 +- contrib/plugins/lockstep.c | 2 +- hw/char/cadence_uart.c | 8 +- hw/char/cmsdk-apb-uart.c | 6 +- hw/char/ibex_uart.c | 8 +- hw/char/nrf51_uart.c | 4 +- hw/char/pl011.c | 58 +- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 2 +- hw/display/bochs-display.c | 2 +- hw/display/qxl.c | 2 +- hw/display/ssd0303.c | 2 +- hw/display/ssd0323.c | 2 +- hw/display/xlnx_dp.c | 2 +- hw/dma/etraxfs_dma.c | 1 + hw/i2c/pm_smbus.c | 2 +- hw/i2c/pmbus_device.c | 19 +- hw/i2c/smbus_slave.c | 2 +- hw/i386/kvm/clock.c | 6 +- hw/i386/microvm.c | 6 +- hw/i386/pc_piix.c | 4 +- hw/i386/pc_q35.c | 6 +- hw/ide/cmd646.c | 2 +- hw/ide/core.c | 2 +- hw/intc/apic_common.c | 3 +- hw/mips/malta.c | 2 +- hw/net/i82596.c | 1 + hw/sd/sd.c | 2 +- hw/sd/sdhci.c | 2 +- hw/sensor/isl_pmbus_vr.c | 2 +- hw/sensor/max34451.c | 2 +- hw/usb/ccid-card-emulated.c | 2 +- hw/usb/hcd-ehci.c | 6 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-xhci.c | 10 +- hw/usb/redirect.c | 4 +- hw/usb/xen-usb.c | 2 +- hw/xtensa/pic_cpu.c | 1 + linux-user/flatload.c | 2 +- linux-user/syscall.c | 4 +- monitor/monitor.c | 2 +- net/vhost-user.c | 2 +- semihosting/config.c | 2 +- semihosting/syscalls.c | 4 +- softmmu/cpus.c | 6 - softmmu/icount.c | 2 +- softmmu/ioport.c | 2 +- softmmu/vl.c | 6 - target/alpha/translate.c | 1 - target/avr/helper.c | 1 + target/cris/op_helper.c | 1 - target/hexagon/translate.c | 1 - target/hppa/translate.c | 1 - target/i386/hax/hax-accel-ops.c | 105 -- target/i386/hax/hax-all.c | 1141 ----------------- target/i386/hax/hax-mem.c | 323 ----- target/i386/hax/hax-posix.c | 305 ----- target/i386/hax/hax-windows.c | 485 ------- target/i386/tcg/fpu_helper.c | 1 + target/i386/tcg/sysemu/excp_helper.c | 1 + target/loongarch/cpu.c | 1 + target/loongarch/iocsr_helper.c | 1 - target/loongarch/op_helper.c | 1 - target/m68k/translate.c | 1 - target/microblaze/translate.c | 1 - target/mips/tcg/fpu_helper.c | 1 - target/mips/tcg/ldst_helper.c | 1 + target/mips/tcg/msa_helper.c | 13 +- target/mips/tcg/mxu_translate.c | 6 +- target/mips/tcg/sysemu/lcsr_helper.c | 5 - target/nios2/op_helper.c | 1 - target/nios2/translate.c | 1 - target/openrisc/translate.c | 1 - target/ppc/int_helper.c | 1 - target/ppc/machine.c | 1 - target/ppc/mem_helper.c | 1 - target/ppc/mmu_common.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/power8-pmu.c | 2 +- target/ppc/translate.c | 2 - target/riscv/csr.c | 1 - target/riscv/m128_helper.c | 1 - target/riscv/op_helper.c | 2 +- target/riscv/pmu.c | 1 + target/riscv/vector_helper.c | 1 + target/s390x/tcg/crypto_helper.c | 1 - target/s390x/tcg/excp_helper.c | 1 - target/s390x/tcg/fpu_helper.c | 1 - target/s390x/tcg/misc_helper.c | 1 - target/sh4/translate.c | 1 - target/sparc/translate.c | 1 - target/xtensa/dbg_helper.c | 1 - target/xtensa/exc_helper.c | 1 + target/xtensa/fpu_helper.c | 1 - target/xtensa/mmu_helper.c | 2 - target/xtensa/op_helper.c | 3 +- target/xtensa/win_helper.c | 1 - tests/tcg/aarch64/bti-1.c | 2 +- tests/tcg/aarch64/bti-3.c | 2 +- ui/sdl2-2d.c | 2 +- ui/sdl2.c | 2 +- util/cpuinfo-aarch64.c | 4 +- util/cpuinfo-i386.c | 4 +- util/cpuinfo-ppc.c | 2 +- util/main-loop.c | 2 +- util/oslib-posix.c | 2 +- util/qdist.c | 2 +- util/qemu-sockets.c | 2 +- util/rcu.c | 2 +- target/mips/cpu-defs.c.inc | 2 +- .../aarch64/{bti-crt.inc.c => bti-crt.c.inc} | 0 ui/vnc-enc-zrle.c.inc | 2 +- accel/Kconfig | 3 - accel/stubs/meson.build | 1 - hw/char/trace-events | 4 +- hw/usb/trace-events | 2 +- meson_options.txt | 2 - qemu-options.hx | 8 +- .../ci/org.centos/stream/8/x86_64/configure | 1 - scripts/meson-buildoptions.sh | 3 - target/i386/hax/meson.build | 7 - target/i386/meson.build | 1 - ui/cocoa.m | 2 +- 187 files changed, 315 insertions(+), 3442 deletions(-) rename {include/hw => hw/i386}/kvm/clock.h (65%) delete mode 100644 include/sysemu/hax.h delete mode 100644 target/i386/hax/hax-accel-ops.h delete mode 100644 target/i386/hax/hax-i386.h delete mode 100644 target/i386/hax/hax-interface.h delete mode 100644 target/i386/hax/hax-posix.h delete mode 100644 target/i386/hax/hax-windows.h delete mode 100644 accel/stubs/hax-stub.c delete mode 100644 target/i386/hax/hax-accel-ops.c delete mode 100644 target/i386/hax/hax-all.c delete mode 100644 target/i386/hax/hax-mem.c delete mode 100644 target/i386/hax/hax-posix.c delete mode 100644 target/i386/hax/hax-windows.c rename tests/tcg/aarch64/{bti-crt.inc.c => bti-crt.c.inc} (100%) delete mode 100644 target/i386/hax/meson.build