Skip to content

Commit b91b0fc

Browse files
committed
accel: Remove HAX accelerator
HAX is deprecated since commits 73741fd ("MAINTAINERS: Abort HAXM maintenance") and 90c167a ("docs/about/deprecated: Mark HAXM in QEMU as deprecated"), released in v8.0.0. Per the latest HAXM release (v7.8 [*]), the latest QEMU supported is v7.2: Note: Up to this release, HAXM supports QEMU from 2.9.0 to 7.2.0. The next commit (intel/haxm@da1b8ec072) added: HAXM v7.8.0 is our last release and we will not accept pull requests or respond to issues after this. It became very hard to build and test HAXM. Its previous maintainers made it clear they won't help. It doesn't seem to be a very good use of QEMU maintainers to spend their time in a dead project. Save our time by removing this orphan zombie code. [*] https://github.com/intel/haxm/releases/tag/v7.8.0 Reviewed-by: Richard Henderson <[email protected]> Acked-by: Markus Armbruster <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Reviewed-by: Alex Bennée <[email protected]> Message-Id: <[email protected]>
1 parent 17780ed commit b91b0fc

34 files changed

+16
-3149
lines changed

MAINTAINERS

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -543,14 +543,6 @@ F: include/sysemu/xen.h
543543
F: include/sysemu/xen-mapcache.h
544544
F: stubs/xen-hw-stub.c
545545

546-
Guest CPU Cores (HAXM)
547-
---------------------
548-
X86 HAXM CPUs
549-
S: Orphan
550-
F: accel/stubs/hax-stub.c
551-
F: include/sysemu/hax.h
552-
F: target/i386/hax/
553-
554546
Guest CPU Cores (NVMM)
555547
----------------------
556548
NetBSD Virtual Machine Monitor (NVMM) CPU support

accel/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ config WHPX
44
config NVMM
55
bool
66

7-
config HAX
8-
bool
9-
107
config HVF
118
bool
129

accel/stubs/hax-stub.c

Lines changed: 0 additions & 24 deletions
This file was deleted.

accel/stubs/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
sysemu_stubs_ss = ss.source_set()
2-
sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c'))
32
sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
43
sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
54
sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))

docs/about/build-platforms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Those hosts are officially supported, with various accelerators:
5252
* - SPARC
5353
- tcg
5454
* - x86
55-
- hax, hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen
55+
- hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen
5656

5757
Other host architectures are not supported. It is possible to build QEMU system
5858
emulation on an unsupported host architecture using the configure

docs/about/deprecated.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ Use ``-machine hpet=off`` instead.
105105
The ``-no-acpi`` setting has been turned into a machine property.
106106
Use ``-machine acpi=off`` instead.
107107

108-
``-accel hax`` (since 8.0)
109-
''''''''''''''''''''''''''
110-
111-
The HAXM project has been retired (see https://github.com/intel/haxm#status).
112-
Use "whpx" (on Windows) or "hvf" (on macOS) instead.
113-
114108
``-async-teardown`` (since 8.1)
115109
'''''''''''''''''''''''''''''''
116110

docs/about/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ QEMU can be used in several different ways. The most common is for
88
:ref:`System Emulation`, where it provides a virtual model of an
99
entire machine (CPU, memory and emulated devices) to run a guest OS.
1010
In this mode the CPU may be fully emulated, or it may work with a
11-
hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to allow the
11+
hypervisor such as KVM, Xen or Hypervisor.Framework to allow the
1212
guest to run directly on the host CPU.
1313

1414
The second supported way to use QEMU is :ref:`User Mode Emulation`,

docs/about/removed-features.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,15 +659,18 @@ Use ``Icelake-Server`` instead.
659659
System accelerators
660660
-------------------
661661

662-
Userspace local APIC with KVM (x86, removed 8.0)
663-
''''''''''''''''''''''''''''''''''''''''''''''''
662+
Userspace local APIC with KVM (x86, removed in 8.0)
663+
'''''''''''''''''''''''''''''''''''''''''''''''''''
664664

665665
``-M kernel-irqchip=off`` cannot be used on KVM if the CPU model includes
666666
a local APIC. The ``split`` setting is supported, as is using ``-M
667667
kernel-irqchip=off`` when the CPU does not have a local APIC.
668668

669-
System accelerators
670-
-------------------
669+
HAXM (``-accel hax``) (removed in 8.2)
670+
''''''''''''''''''''''''''''''''''''''
671+
672+
The HAXM project has been retired (see https://github.com/intel/haxm#status).
673+
Use "whpx" (on Windows) or "hvf" (on macOS) instead.
671674

672675
MIPS "Trap-and-Emulate" KVM support (removed in 8.0)
673676
''''''''''''''''''''''''''''''''''''''''''''''''''''

docs/system/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ System Emulation
66

77
This section of the manual is the overall guide for users using QEMU
88
for full system emulation (as opposed to user-mode emulation).
9-
This includes working with hypervisors such as KVM, Xen, Hax
9+
This includes working with hypervisors such as KVM, Xen
1010
or Hypervisor.Framework.
1111

1212
.. toctree::

docs/system/introduction.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ Tiny Code Generator (TCG) capable of emulating many CPUs.
2121
* - Xen
2222
- Linux (as dom0)
2323
- Arm, x86
24-
* - Intel HAXM (hax)
25-
- Linux, Windows
26-
- x86
2724
* - Hypervisor Framework (hvf)
2825
- MacOS
2926
- x86 (64 bit only), Arm (64 bit only)

0 commit comments

Comments
 (0)