diff options
| author |   Dor Laor <dor.laor@qumranet.com> | 2007-02-19 18:25:43 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2007-05-03 10:52:22 +0300 |
| commit | 510043da8582ad49d22a1e9a6b211e6ede10cd2e (patch) | |
| tree | 0ded38e3d2fb77d02c59a6afce464d15d75e1cca /drivers/kvm | |
| parent | KVM: Fix guest register corruption on paravirt hypercall (diff) | |
| download | linux-dev-510043da8582ad49d22a1e9a6b211e6ede10cd2e.tar.xz linux-dev-510043da8582ad49d22a1e9a6b211e6ede10cd2e.zip | |
KVM: Use the generic skip_emulated_instruction() in hypercall code
Instead of twiddling the rip registers directly, use the
skip_emulated_instruction() function to do that for us.
Signed-off-by: Dor Laor <dor.laor@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
| -rw-r--r-- | drivers/kvm/svm.c | 3 | ||||
| -rw-r--r-- | drivers/kvm/vmx.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 3d8ea7ac2ecc..6787f11738cf 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -1078,7 +1078,8 @@ static int halt_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - vcpu->svm->vmcb->save.rip += 3; + vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 3; + skip_emulated_instruction(vcpu); return kvm_hypercall(vcpu, kvm_run); } diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index fbbf9d6b299f..a721b60f7385 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -1658,7 +1658,7 @@ static int handle_halt(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - vmcs_writel(GUEST_RIP, vmcs_readl(GUEST_RIP)+3); + skip_emulated_instruction(vcpu); return kvm_hypercall(vcpu, kvm_run); } |