Commit 510043da authored Feb 19, 2007 by Dor Laor Committed by Avi Kivity May 03, 2007

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>

parent 9b22bf57

drivers/kvm/svm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

drivers/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}