---

yaml --- r: 54055 b: refs/heads/master c: 510043d h: refs/heads/master i: 54053: 8e777ba 54051: 5e559d1 54047: 624d9a1 v: v3
git-mirror · May 3, 2007 · 2bd2e69 · 2bd2e69
1 parent dd47088
commit 2bd2e69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);
 }