From 5742c2dd7998ffb3cd2ded7a349bb79d6cff45e1 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 27 Nov 2009 16:46:26 +0800 Subject: [PATCH] --- yaml --- r: 172337 b: refs/heads/master c: 046d87103addc117f0d397196e85189722d4d7de h: refs/heads/master i: 172335: 41ba9cf13c90df0c2611ae16c5cec1b6e3f2ed49 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c6a5f248867..c16fb0509a12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb +refs/heads/master: 046d87103addc117f0d397196e85189722d4d7de diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 778f059ae423..ed97c6c7e648 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -2309,8 +2309,10 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; if (vmx->vpid == 0) exec_control &= ~SECONDARY_EXEC_ENABLE_VPID; - if (!enable_ept) + if (!enable_ept) { exec_control &= ~SECONDARY_EXEC_ENABLE_EPT; + enable_unrestricted_guest = 0; + } if (!enable_unrestricted_guest) exec_control &= ~SECONDARY_EXEC_UNRESTRICTED_GUEST; if (!ple_gap)