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

Commit adf52235 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: x86 emulator: Clean up init_emulate_ctxt() 



Use a local pointer to the emulate_ctxt for simplicity.  Then, arrange
the hard-to-read mode selection lines neatly.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d780592b

arch/x86/kvm/x86.c

+11 −10
Original line number Diff line number Diff line
@@ -4508,7 +4508,8 @@ static void inject_emulated_exception(struct kvm_vcpu *vcpu) 


static void init_emulate_ctxt(struct kvm_vcpu *vcpu)

{

	struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;

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

	struct decode_cache *c = &ctxt->decode;

	int cs_db, cs_l;



	/*
@@ -4521,15 +4522,15 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu) 


	kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);



	vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);

	vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);

	vcpu->arch.emulate_ctxt.mode =

		(!is_protmode(vcpu)) ? X86EMUL_MODE_REAL :

		(vcpu->arch.emulate_ctxt.eflags & X86_EFLAGS_VM)

		? X86EMUL_MODE_VM86 : cs_l

		? X86EMUL_MODE_PROT64 :	cs_db

		? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16;

	vcpu->arch.emulate_ctxt.guest_mode = is_guest_mode(vcpu);

	ctxt->eflags = kvm_get_rflags(vcpu);

	ctxt->eip = kvm_rip_read(vcpu);

	ctxt->mode = (!is_protmode(vcpu))		? X86EMUL_MODE_REAL :

		     (ctxt->eflags & X86_EFLAGS_VM)	? X86EMUL_MODE_VM86 :

		     cs_l				? X86EMUL_MODE_PROT64 :

		     cs_db				? X86EMUL_MODE_PROT32 :

							  X86EMUL_MODE_PROT16;

	ctxt->guest_mode = is_guest_mode(vcpu);



	memset(c, 0, sizeof(struct decode_cache));

	memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);

	vcpu->arch.emulate_regs_need_sync_from_vcpu = false;