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>
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 1c662f6..800ab50 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1287,7 +1287,10 @@
vcpu->mmio_is_write = 0;
vcpu->pio.string = 0;
- r = x86_emulate_memop(&emulate_ctxt, &emulate_ops);
+ r = x86_decode_insn(&emulate_ctxt, &emulate_ops);
+ if (r == 0)
+ r = x86_emulate_insn(&emulate_ctxt, &emulate_ops);
+
if (vcpu->pio.string)
return EMULATE_DO_MMIO;