From ac569cb4896459310dfc81a0a682d57edf29809b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 21 May 2008 15:34:25 +0300
Subject: [PATCH] --- yaml --- r: 97969 b: refs/heads/master c:
 33e3885de25148e00595c4dd808d6eb15db2edcf h: refs/heads/master i:   97967:
 37efb3826a16503debb775b65e81813245116105 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kvm/x86_emulate.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 405956a60cc6..6f569fc80a11 100644
--- 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
index 8a96320ab071..932f216d890c 100644
--- 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;