| Message ID | 20220125095909.38122-16-cloudliang@tencent.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: Bulk removal of unused function parameters | expand |
On 1/25/22 10:59, Jinrong Liang wrote: > From: Jinrong Liang <cloudliang@tencent.com> > > The "struct x86_emulate_ctxt *ctxt" parameter of task_switch_{16, 32}() > is not used, so remove it. No functional change intended. This is actually removing tss_selector, but it's okay. Paolo > Signed-off-by: Jinrong Liang <cloudliang@tencent.com> > --- > arch/x86/kvm/emulate.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c > index c2d9fe6449c2..9e4a00d04532 100644 > --- a/arch/x86/kvm/emulate.c > +++ b/arch/x86/kvm/emulate.c > @@ -3020,8 +3020,7 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt, > return X86EMUL_CONTINUE; > } > > -static int task_switch_16(struct x86_emulate_ctxt *ctxt, > - u16 tss_selector, u16 old_tss_sel, > +static int task_switch_16(struct x86_emulate_ctxt *ctxt, u16 old_tss_sel, > ulong old_tss_base, struct desc_struct *new_desc) > { > struct tss_segment_16 tss_seg; > @@ -3159,8 +3158,7 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt, > return ret; > } > > -static int task_switch_32(struct x86_emulate_ctxt *ctxt, > - u16 tss_selector, u16 old_tss_sel, > +static int task_switch_32(struct x86_emulate_ctxt *ctxt, u16 old_tss_sel, > ulong old_tss_base, struct desc_struct *new_desc) > { > struct tss_segment_32 tss_seg; > @@ -3268,10 +3266,9 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, > old_tss_sel = 0xffff; > > if (next_tss_desc.type & 8) > - ret = task_switch_32(ctxt, tss_selector, old_tss_sel, > - old_tss_base, &next_tss_desc); > + ret = task_switch_32(ctxt, old_tss_sel, old_tss_base, &next_tss_desc); > else > - ret = task_switch_16(ctxt, tss_selector, old_tss_sel, > + ret = task_switch_16(ctxt, old_tss_sel, > old_tss_base, &next_tss_desc); > if (ret != X86EMUL_CONTINUE) > return ret;
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index c2d9fe6449c2..9e4a00d04532 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3020,8 +3020,7 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt, return X86EMUL_CONTINUE; } -static int task_switch_16(struct x86_emulate_ctxt *ctxt, - u16 tss_selector, u16 old_tss_sel, +static int task_switch_16(struct x86_emulate_ctxt *ctxt, u16 old_tss_sel, ulong old_tss_base, struct desc_struct *new_desc) { struct tss_segment_16 tss_seg; @@ -3159,8 +3158,7 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt, return ret; } -static int task_switch_32(struct x86_emulate_ctxt *ctxt, - u16 tss_selector, u16 old_tss_sel, +static int task_switch_32(struct x86_emulate_ctxt *ctxt, u16 old_tss_sel, ulong old_tss_base, struct desc_struct *new_desc) { struct tss_segment_32 tss_seg; @@ -3268,10 +3266,9 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt, old_tss_sel = 0xffff; if (next_tss_desc.type & 8) - ret = task_switch_32(ctxt, tss_selector, old_tss_sel, - old_tss_base, &next_tss_desc); + ret = task_switch_32(ctxt, old_tss_sel, old_tss_base, &next_tss_desc); else - ret = task_switch_16(ctxt, tss_selector, old_tss_sel, + ret = task_switch_16(ctxt, old_tss_sel, old_tss_base, &next_tss_desc); if (ret != X86EMUL_CONTINUE) return ret;