Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Laurent Vivier 2007-09-18 11:27:27 +02:00 committed by Avi Kivity
parent 8b4caf6650
commit 1be3aa4718
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/kvm/kvm_main.c
View File

@ -1287,7 +1287,10 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
vcpu->mmio_is_write = 0; vcpu->mmio_is_write = 0;
vcpu->pio.string = 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) if (vcpu->pio.string)
return EMULATE_DO_MMIO; return EMULATE_DO_MMIO;

8
drivers/kvm/x86_emulate.c
View File

@ -908,18 +908,14 @@ done:
} }
int 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; unsigned long cr2 = ctxt->cr2;
int no_wb = 0; int no_wb = 0;
u64 msr_data; u64 msr_data;
unsigned long _eflags = ctxt->eflags; unsigned long _eflags = ctxt->eflags;
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
int rc; int rc = 0;
rc = x86_decode_insn(ctxt, ops);
if (rc)
return rc;
if ((c->d & ModRM) && (c->modrm_mod != 3)) if ((c->d & ModRM) && (c->modrm_mod != 3))
cr2 = c->modrm_ea; cr2 = c->modrm_ea;

9
drivers/kvm/x86_emulate.h
View File

@ -178,12 +178,9 @@ struct x86_emulate_ctxt {
#define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT64
#endif #endif
/* int x86_decode_insn(struct x86_emulate_ctxt *ctxt,
* x86_emulate_memop: Emulate an instruction that faulted attempting to struct x86_emulate_ops *ops);
* read/write a 'special' memory area. int x86_emulate_insn(struct x86_emulate_ctxt *ctxt,
* Returns -1 on failure, 0 on success.
*/
int x86_emulate_memop(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops); struct x86_emulate_ops *ops);
#endif /* __X86_EMULATE_H__ */ #endif /* __X86_EMULATE_H__ */