Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 046d8710 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: VMX: Disable unrestricted guest when EPT disabled 



Otherwise would cause VMEntry failure when using ept=0 on unrestricted guest
supported processors.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent eb3c79e6

arch/x86/kvm/vmx.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2309,8 +2309,10 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
				~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;

				~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;

		if (vmx->vpid == 0)

		if (vmx->vpid == 0)

			exec_control &= ~SECONDARY_EXEC_ENABLE_VPID;

			exec_control &= ~SECONDARY_EXEC_ENABLE_VPID;

		if (!enable_ept)

		if (!enable_ept) {

			exec_control &= ~SECONDARY_EXEC_ENABLE_EPT;

			exec_control &= ~SECONDARY_EXEC_ENABLE_EPT;

			enable_unrestricted_guest = 0;

		}

		if (!enable_unrestricted_guest)

		if (!enable_unrestricted_guest)

			exec_control &= ~SECONDARY_EXEC_UNRESTRICTED_GUEST;

			exec_control &= ~SECONDARY_EXEC_UNRESTRICTED_GUEST;

		if (!ple_gap)

		if (!ple_gap)