KVM: emulate_instruction() calls now x86_decode_insn() and x86_emulate_insn()

emulate_instruction() calls now x86_decode_insn() and x86_emulate_insn().
x86_emulate_insn() is x86_emulate_memop() without the decoding part.

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 540589c5d427..c191093982d8 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -908,18 +908,14 @@ done:
 }
 
 int
-x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
+x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 {
         unsigned long cr2 = ctxt->cr2;
         int no_wb = 0;
         u64 msr_data;
         unsigned long _eflags = ctxt->eflags;
         struct decode_cache *c = &ctxt->decode;
-        int rc;
-
-        rc = x86_decode_insn(ctxt, ops);
-        if (rc)
-                return rc;
+        int rc = 0;
 
         if ((c->d & ModRM) && (c->modrm_mod != 3))
                 cr2 = c->modrm_ea;