Commit e693d71b authored Jun 01, 2008 by Eli Collins Committed by Avi Kivity Jun 06, 2008

KVM: VMX: Clear CR4.VMXE in hardware_disable



Clear CR4.VMXE in hardware_disable. There's no reason to leave it set
after doing a VMXOFF.

VMware Workstation 6.5 checks CR4.VMXE as a proxy for whether the CPU is
in VMX mode, so leaving VMXE set means we'll refuse to power on. With this
change the user can power on after unloading the kvm-intel module. I
tested on kvm-67 and kvm-69.

Signed-off-by: Eli Collins <ecollins@vmware.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

parent 2f599714

arch/x86/kvm/vmx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1036,6 +1036,7 @@ static void hardware_enable(void *garbage)
		static void hardware_disable(void *garbage)
		{
		asm volatile (ASM_VMX_VMXOFF : : : "cc");
		write_cr4(read_cr4() & ~X86_CR4_VMXE);
		}

		static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt,