]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Feb 2011 20:22:14 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Feb 2011 20:22:14 +0000 (12:22 -0800)
* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Advance instruction pointer in dr_intercept

arch/x86/kvm/svm.c

index 54ce246a383ee0fa029d444b99b8faca2d6c3702..63fec1531e89be18889e0bfd240191c2954f03ac 100644 (file)
@@ -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;
 }