diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2010-09-10 17:31:04 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2010-10-24 10:52:46 +0200 |
| commit | 55c5e464fcc28ee763d40561abf2b259131dd703 (patch) | |
| tree | a285f4cbad347bb3adcae3c66d92d4dca32ed006 /arch | |
| parent | KVM: SVM: Initialize Nested Nested MMU context on VMRUN (diff) | |
| download | linux-dev-55c5e464fcc28ee763d40561abf2b259131dd703.tar.xz linux-dev-55c5e464fcc28ee763d40561abf2b259131dd703.zip | |
KVM: SVM: Expect two more candiates for exit_int_info
This patch adds INTR and NMI intercepts to the list of
expected intercepts with an exit_int_info set. While this
can't happen on bare metal it is architectural legal and may
happen with KVMs SVM emulation.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/svm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 3184772dedfe..de1930ee2abb 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2991,7 +2991,8 @@ static int handle_exit(struct kvm_vcpu *vcpu) if (is_external_interrupt(svm->vmcb->control.exit_int_info) && exit_code != SVM_EXIT_EXCP_BASE + PF_VECTOR && - exit_code != SVM_EXIT_NPF && exit_code != SVM_EXIT_TASK_SWITCH) + exit_code != SVM_EXIT_NPF && exit_code != SVM_EXIT_TASK_SWITCH && + exit_code != SVM_EXIT_INTR && exit_code != SVM_EXIT_NMI) printk(KERN_ERR "%s: unexpected exit_ini_info 0x%x " "exit_code 0x%x\n", __func__, svm->vmcb->control.exit_int_info, |