From a75e7f9afa23031f49d67ee4dfb380ea4d01bcf9 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Wed, 30 Apr 2008 17:56:00 +0200 Subject: [PATCH] --- yaml --- r: 103695 b: refs/heads/master c: c47f098d69ed2bd7343e54095ff4aa2533253bee h: refs/heads/master i: 103693: 59fa086cc0f2abaa105cd090d8e8b16459c47ec1 103691: 44e95905dca952bdd84625e101c1e622b4694360 103687: 4cbaba2c04b8ce8161153106cba66c7d32a3a462 103679: 14df2e4bc8faf7cd07a23fffa3e5d193aa70b7cf v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/svm.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1a2bbd90485b..2225cb9e7789 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7bf23babc959b186335d2640959a1b8633588de +refs/heads/master: c47f098d69ed2bd7343e54095ff4aa2533253bee diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c index 6b0d5fa5bab3..8a2118b09fd2 100644 --- a/trunk/arch/x86/kvm/svm.c +++ b/trunk/arch/x86/kvm/svm.c @@ -1081,6 +1081,11 @@ static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) return kvm_emulate_pio(&svm->vcpu, kvm_run, in, size, port); } +static int nmi_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) +{ + return 1; +} + static int nop_on_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { return 1; @@ -1365,7 +1370,7 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm, [SVM_EXIT_EXCP_BASE + NM_VECTOR] = nm_interception, [SVM_EXIT_EXCP_BASE + MC_VECTOR] = mc_interception, [SVM_EXIT_INTR] = nop_on_interception, - [SVM_EXIT_NMI] = nop_on_interception, + [SVM_EXIT_NMI] = nmi_interception, [SVM_EXIT_SMI] = nop_on_interception, [SVM_EXIT_INIT] = nop_on_interception, [SVM_EXIT_VINTR] = interrupt_window_interception,