diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 21:22:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 21:22:14 +0100 |
| commit | 86e2fe9ff3f3eebca2066bcfc2d993f61af787f5 (patch) | |
| tree | 560dfeb27813e95739a12d2cef09a4029af51fd1 /arch | |
| parent | MAINTAINERS: Update email address (diff) | |
| parent | KVM: SVM: Advance instruction pointer in dr_intercept (diff) | |
| download | linux-86e2fe9ff3f3eebca2066bcfc2d993f61af787f5.tar.xz linux-86e2fe9ff3f3eebca2066bcfc2d993f61af787f5.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 54ce246a383e..63fec1531e89 100644 --- 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; } |