aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/x86_emulate.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/kvm/x86_emulate.c')
-rw-r--r--drivers/kvm/x86_emulate.c8
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:
908} 908}
909 909
910int 910int
911x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 911x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
912{ 912{
913 unsigned long cr2 = ctxt->cr2; 913 unsigned long cr2 = ctxt->cr2;
914 int no_wb = 0; 914 int no_wb = 0;
915 u64 msr_data; 915 u64 msr_data;
916 unsigned long _eflags = ctxt->eflags; 916 unsigned long _eflags = ctxt->eflags;
917 struct decode_cache *c = &ctxt->decode; 917 struct decode_cache *c = &ctxt->decode;
918 int rc; 918 int rc = 0;
919
920 rc = x86_decode_insn(ctxt, ops);
921 if (rc)
922 return rc;
923 919
924 if ((c->d & ModRM) && (c->modrm_mod != 3)) 920 if ((c->d & ModRM) && (c->modrm_mod != 3))
925 cr2 = c->modrm_ea; 921 cr2 = c->modrm_ea;