1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index f2a696d6a243..932f216d890c 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
         c->use_modrm_ea = 1;
 
         if (c->modrm_mod == 3) {
-                c->modrm_val = *(unsigned long *)
-                        decode_register(c->modrm_rm, c->regs, c->d & ByteOp);
+                c->modrm_ptr = decode_register(c->modrm_rm,
+                                               c->regs, c->d & ByteOp);
+                c->modrm_val = *(unsigned long *)c->modrm_ptr;
                 return rc;
         }
 
@@ -1005,6 +1006,7 @@ done_prefixes:
                 if ((c->d & ModRM) && c->modrm_mod == 3) {
                         c->src.type = OP_REG;
                         c->src.val = c->modrm_val;
+                        c->src.ptr = c->modrm_ptr;
                         break;
                 }
                 c->src.type = OP_MEM;
@@ -1049,6 +1051,7 @@ done_prefixes:
                 if ((c->d & ModRM) && c->modrm_mod == 3) {
                         c->dst.type = OP_REG;
                         c->dst.val = c->dst.orig_val = c->modrm_val;
+                        c->dst.ptr = c->modrm_ptr;
                         break;
                 }
                 c->dst.type = OP_MEM;
@@ -1724,7 +1727,8 @@ twobyte_insn:
                         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;