From 2bd2e69db88d106cdd3f9d455b9c205ca10e6e67 Mon Sep 17 00:00:00 2001 From: Dor Laor Date: Mon, 19 Feb 2007 18:25:43 +0200 Subject: [PATCH] --- yaml --- r: 54055 b: refs/heads/master c: 510043da8582ad49d22a1e9a6b211e6ede10cd2e h: refs/heads/master i: 54053: 8e777baa20b3b6c00da468a614f3b6508e644442 54051: 5e559d15b62b505e08e9331cf5106c1f4a88670b 54047: 624d9a164e1900019e652961169766c51a971962 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/svm.c | 3 ++- trunk/drivers/kvm/vmx.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 979bfb432448..dc541525f810 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b22bf578332d3e326c349bc8a8789af3d952435 +refs/heads/master: 510043da8582ad49d22a1e9a6b211e6ede10cd2e diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 3d8ea7ac2ecc..6787f11738cf 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/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/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index fbbf9d6b299f..a721b60f7385 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/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); }