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

Commit 1498507a authored by Bandan Das's avatar Bandan Das Committed by Paolo Bonzini
Browse files

KVM: emulate: move init_decode_cache to emulate.c 



Core emulator functions all belong in emulator.c,
x86 should have no knowledge of emulator internals

Signed-off-by: default avatarBandan Das <bsd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f5f87dfb

arch/x86/include/asm/kvm_emulate.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt); 
#define EMULATION_OK 0

#define EMULATION_RESTART 1

#define EMULATION_INTERCEPTED 2

void init_decode_cache(struct x86_emulate_ctxt *ctxt);

int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);

int emulator_task_switch(struct x86_emulate_ctxt *ctxt,

			 u16 tss_selector, int idt_index, int reason,

arch/x86/kvm/emulate.c

+13 −0
Original line number Diff line number Diff line
@@ -4534,6 +4534,19 @@ static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)) 
	return X86EMUL_CONTINUE;

}



void init_decode_cache(struct x86_emulate_ctxt *ctxt)

{

	memset(&ctxt->opcode_len, 0,

	       (void *)&ctxt->_regs - (void *)&ctxt->opcode_len);



	ctxt->fetch.start = 0;

	ctxt->fetch.end = 0;

	ctxt->io_read.pos = 0;

	ctxt->io_read.end = 0;

	ctxt->mem_read.pos = 0;

	ctxt->mem_read.end = 0;

}



int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)

{

	const struct x86_emulate_ops *ops = ctxt->ops;

arch/x86/kvm/x86.c

+0 −13
Original line number Diff line number Diff line
@@ -4888,19 +4888,6 @@ static void inject_emulated_exception(struct kvm_vcpu *vcpu) 
		kvm_queue_exception(vcpu, ctxt->exception.vector);

}



static void init_decode_cache(struct x86_emulate_ctxt *ctxt)

{

	memset(&ctxt->opcode_len, 0,

	       (void *)&ctxt->_regs - (void *)&ctxt->opcode_len);



	ctxt->fetch.start = 0;

	ctxt->fetch.end = 0;

	ctxt->io_read.pos = 0;

	ctxt->io_read.end = 0;

	ctxt->mem_read.pos = 0;

	ctxt->mem_read.end = 0;

}



static void init_emulate_ctxt(struct kvm_vcpu *vcpu)

{

	struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt;