---

yaml --- r: 125173 b: refs/heads/master c: 448fa4a h: refs/heads/master i: 125171: 9d78a5e v: v3
git-mirror · Dec 31, 2008 · a382e2d · a382e2d
1 parent 5a3baa4
commit a382e2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60637aacfd95c368e1fbc2157275d1b621b5dcdd
+refs/heads/master: 448fa4a9c5dbc6941dd19ed09692c588d815bb06
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -3925,6 +3925,9 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
 
 int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu)
 {
+	vcpu->arch.nmi_pending = false;
+	vcpu->arch.nmi_injected = false;
+
 	return kvm_x86_ops->vcpu_reset(vcpu);
 }