Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: SVM: Advance instruction pointer in dr_intercept
2011-02-24 12:22:14 -08:00 · 2011-02-24 12:22:14 -08:00 · 86e2fe9ff3
parent 9f0939bf49 2c46d2aec0
commit 86e2fe9ff3
1 changed files with 2 additions and 0 deletions
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@ -2777,6 +2777,8 @@ static int dr_interception(struct vcpu_svm *svm)
 			kvm_register_write(&svm->vcpu, reg, val);
 	}

+	skip_emulated_instruction(&svm->vcpu);
+
 	return 1;
 }