Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1be3aa47 authored by Laurent Vivier's avatar Laurent Vivier Committed by Avi Kivity
Browse files

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: default avatarLaurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 8b4caf66

drivers/kvm/kvm_main.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

drivers/kvm/x86_emulate.c

+2 −6
Original line number Diff line number Diff line
@@ -908,18 +908,14 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
}



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;

drivers/kvm/x86_emulate.h

+4 −7
Original line number Diff line number Diff line
@@ -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,

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__ */