From 1be3aa47182e94944e57b176a5c4ee4e74f1ce33 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 18 Sep 2007 11:27:27 +0200 Subject: [PATCH] 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 Signed-off-by: Avi Kivity --- drivers/kvm/kvm_main.c | 5 ++++- drivers/kvm/x86_emulate.c | 8 ++------ drivers/kvm/x86_emulate.h | 11 ++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 1c662f63b7a..800ab5028ed 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1287,7 +1287,10 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 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; diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index 540589c5d42..c191093982d 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; diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h index c354200d583..28acad416bc 100644 --- a/drivers/kvm/x86_emulate.h +++ b/drivers/kvm/x86_emulate.h @@ -178,12 +178,9 @@ struct x86_emulate_ctxt { #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64 #endif -/* - * x86_emulate_memop: Emulate an instruction that faulted attempting to - * read/write a 'special' memory area. - * Returns -1 on failure, 0 on success. - */ -int x86_emulate_memop(struct x86_emulate_ctxt *ctxt, - struct x86_emulate_ops *ops); +int x86_decode_insn(struct x86_emulate_ctxt *ctxt, + struct x86_emulate_ops *ops); +int x86_emulate_insn(struct x86_emulate_ctxt *ctxt, + struct x86_emulate_ops *ops); #endif /* __X86_EMULATE_H__ */ -- 2.20.1