Commit 09d9423d authored by Jinrong Liang's avatar Jinrong Liang Committed by Paolo Bonzini
Browse files

KVM: x86/emulate: Remove unused "ctxt" of setup_syscalls_segments() 



The "struct x86_emulate_ctxt *ctxt" parameter of setup_syscalls_segments()
is not used, so remove it. No functional change intended.

Signed-off-by: default avatarJinrong Liang <cloudliang@tencent.com>
Message-Id: <20220125095909.38122-15-cloudliang@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 019024e5

arch/x86/kvm/emulate.c

+4 −5
Original line number Diff line number Diff line
@@ -2600,8 +2600,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) 
}



static void

setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,

			struct desc_struct *cs, struct desc_struct *ss)

setup_syscalls_segments(struct desc_struct *cs, struct desc_struct *ss)

{

	cs->l = 0;		/* will be adjusted later */

	set_desc_base(cs, 0);	/* flat segment */
@@ -2690,7 +2689,7 @@ static int em_syscall(struct x86_emulate_ctxt *ctxt) 
	if (!(efer & EFER_SCE))

		return emulate_ud(ctxt);



	setup_syscalls_segments(ctxt, &cs, &ss);

	setup_syscalls_segments(&cs, &ss);

	ops->get_msr(ctxt, MSR_STAR, &msr_data);

	msr_data >>= 32;

	cs_sel = (u16)(msr_data & 0xfffc);
@@ -2758,7 +2757,7 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt) 
	if ((msr_data & 0xfffc) == 0x0)

		return emulate_gp(ctxt, 0);



	setup_syscalls_segments(ctxt, &cs, &ss);

	setup_syscalls_segments(&cs, &ss);

	ctxt->eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_IF);

	cs_sel = (u16)msr_data & ~SEGMENT_RPL_MASK;

	ss_sel = cs_sel + 8;
@@ -2795,7 +2794,7 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt) 
	    ctxt->mode == X86EMUL_MODE_VM86)

		return emulate_gp(ctxt, 0);



	setup_syscalls_segments(ctxt, &cs, &ss);

	setup_syscalls_segments(&cs, &ss);



	if ((ctxt->rex_prefix & 0x8) != 0x0)

		usermode = X86EMUL_MODE_PROT64;