From a381ef07088ce479610129e37bfef42538f397da Mon Sep 17 00:00:00 2001 From: Jun Nakajima Date: Sat, 17 Dec 2011 19:13:25 -0800 Subject: Changes to existing files to add HAX support HAX (Hardware-based Accelerated eXecution) employes hardware virtualization technology to boost performance of the Android emulator on Mac OS X or Windows hosts. This changeset includes the changes required to the existing files. To pass the compilation, hax.h is added, but CONFIG_HAX is disabled so that no real changes added. Change-Id: Ifa5777e8788e6698747c1ec4cd91315161c2ca0b Signed-off-by: Zhang, Xiantao Signed-off-by: Xin, Xiaohui Signed-off-by: Jiang Yunhong Signed-off-by: Nakajima, Jun --- qemu-options.hx | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'qemu-options.hx') diff --git a/qemu-options.hx b/qemu-options.hx index 880025e..b2ecf1b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1359,6 +1359,17 @@ Enable KVM full virtualization support. This option is only available if KVM support is enabled when compiling. ETEXI +DEF("disable-hax", 0, QEMU_OPTION_disable_hax, \ + "-disable-hax Disable HAX full virtualization support\n") +STEXI +@item -disable-hax +Disable HAX (Hardware-based Acceleration eXecution) support. When HAX +support is detected, the emulator will enable it by default. This +option will disable the default action. HAX is supported only on Mac OS X +and Windows platforms (if VT is present), and it does not conflict +with KVM. +ETEXI + #ifdef CONFIG_XEN DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid, "-xen-domid id specify xen guest domain id\n") -- cgit v1.1