redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Dor Laor 2007-02-19 18:25:43 +02:00 committed by Avi Kivity
parent 9b22bf5783
commit 510043da85
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/kvm/svm.c
View File

@ -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);
}

2
drivers/kvm/vmx.c
View File

@ -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);
}