---

yaml --- r: 97969 b: refs/heads/master c: 33e3885 h: refs/heads/master i: 97967: 37efb38 v: v3
git-mirror · Jun 6, 2008 · ac569cb · ac569cb
1 parent b093742
commit ac569cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f20d2752980c144c82649eb18746ef0c29f508dd
+refs/heads/master: 33e3885de25148e00595c4dd808d6eb15db2edcf
diff --git a/trunk/arch/x86/kvm/x86_emulate.c b/trunk/arch/x86/kvm/x86_emulate.c
@@ -1727,7 +1727,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 			if (rc)
 				goto done;
 
-			kvm_emulate_hypercall(ctxt->vcpu);
+			/* Let the processor re-execute the fixed hypercall */
+			c->eip = ctxt->vcpu->arch.rip;
 			/* Disable writeback. */
 			c->dst.type = OP_NONE;
 			break;