diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
| commit | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch) | |
| tree | 2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/Kconfig | |
| parent | 51ea8a88aae425915b458bfe295f1f10a3d52781 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index cea0cd9a316..f0ee331feea 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -517,25 +517,6 @@ if PARAVIRT_GUEST source "arch/x86/xen/Kconfig" -config VMI - bool "VMI Guest support (DEPRECATED)" - select PARAVIRT - depends on X86_32 - ---help--- - VMI provides a paravirtualized interface to the VMware ESX server - (it could be used by other hypervisors in theory too, but is not - at the moment), by linking the kernel to a GPL-ed ROM module - provided by the hypervisor. - - As of September 2009, VMware has started a phased retirement - of this feature from VMware's products. Please see - feature-removal-schedule.txt for details. If you are - planning to enable this option, please note that you cannot - live migrate a VMI enabled VM to a future VMware product, - which doesn't support VMI. So if you expect your kernel to - seamlessly migrate to newer VMware products, keep this - disabled. - config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT |