diff options
| author |   Jiang, Yunhong <yunhong.jiang@intel.com> | 2016-07-21 17:36:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-21 17:36:49 +0000 |
| commit | 601b400c0678e320af3ba454e0cda5ff29df3cbb (patch) | |
| tree | e105cf1c776099feba5441411857cb460d5c763a /kernel/arch | |
| parent | 5ac3a5e7a251ed41b93e0616fc789f5521a0fcb6 (diff) | |
| parent | ae6912551e1bc31e4b846221b7cf5ec2aac76104 (diff) | |
Merge "KVM: nVMX: avoid incorrect preemption timer vmexit in nested guest"
Diffstat (limited to 'kernel/arch')
| -rw-r--r-- | kernel/arch/x86/kvm/vmx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/arch/x86/kvm/vmx.c b/kernel/arch/x86/kvm/vmx.c index e55417710..937898646 100644 --- a/kernel/arch/x86/kvm/vmx.c +++ b/kernel/arch/x86/kvm/vmx.c @@ -7901,6 +7901,8 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu) return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES); case EXIT_REASON_PCOMMIT: return nested_cpu_has2(vmcs12, SECONDARY_EXEC_PCOMMIT); + case EXIT_REASON_PREEMPTION_TIMER: + return false; default: return true; } |