xen/arch/arm/traps.c | 4 ++-- xen/arch/x86/hypercall.c | 6 +++--- xen/include/xen/multicall.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
Make function declaration and definition consistent using the same
parameter name ('mcs' do denote a pointer to an 'mc_state').
This addresses a violation of MISRA C:2012 Rule 8.3: "All declarations
of an object or function shall use the same names and type qualifiers".
Signed-off-by: Federico Serafini <federico.serafini@bugseng.com>
---
Changes in v2:
- added forgotten changes about x86.
---
xen/arch/arm/traps.c | 4 ++--
xen/arch/x86/hypercall.c | 6 +++---
xen/include/xen/multicall.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index d1ef787638..eab2fcfc02 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -1470,9 +1470,9 @@ static bool check_multicall_32bit_clean(struct multicall_entry *multi)
return true;
}
-enum mc_disposition arch_do_multicall_call(struct mc_state *state)
+enum mc_disposition arch_do_multicall_call(struct mc_state *mcs)
{
- struct multicall_entry *multi = &state->call;
+ struct multicall_entry *multi = &mcs->call;
if ( multi->op >= ARRAY_SIZE(hypercall_args) )
{
diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c
index cc9a6a9d59..01cd73040d 100644
--- a/xen/arch/x86/hypercall.c
+++ b/xen/arch/x86/hypercall.c
@@ -203,15 +203,15 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr,
return rc;
}
-enum mc_disposition arch_do_multicall_call(struct mc_state *state)
+enum mc_disposition arch_do_multicall_call(struct mc_state *mcs)
{
const struct domain *currd = current->domain;
if ( is_pv_domain(currd) )
- return pv_do_multicall_call(state);
+ return pv_do_multicall_call(mcs);
if ( is_hvm_domain(currd) )
- return hvm_do_multicall_call(state);
+ return hvm_do_multicall_call(mcs);
return mc_exit;
}
diff --git a/xen/include/xen/multicall.h b/xen/include/xen/multicall.h
index ac8238660a..5bebeca7b2 100644
--- a/xen/include/xen/multicall.h
+++ b/xen/include/xen/multicall.h
@@ -25,6 +25,6 @@ enum mc_disposition {
mc_continue,
mc_exit,
mc_preempt,
-} arch_do_multicall_call(struct mc_state *mc);
+} arch_do_multicall_call(struct mc_state *mcs);
#endif /* __XEN_MULTICALL_H__ */
--
2.34.1
On Wed, 26 Jul 2023, Federico Serafini wrote: > Make function declaration and definition consistent using the same > parameter name ('mcs' do denote a pointer to an 'mc_state'). > This addresses a violation of MISRA C:2012 Rule 8.3: "All declarations > of an object or function shall use the same names and type qualifiers". > > Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > Changes in v2: > - added forgotten changes about x86. > --- > xen/arch/arm/traps.c | 4 ++-- > xen/arch/x86/hypercall.c | 6 +++--- > xen/include/xen/multicall.h | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c > index d1ef787638..eab2fcfc02 100644 > --- a/xen/arch/arm/traps.c > +++ b/xen/arch/arm/traps.c > @@ -1470,9 +1470,9 @@ static bool check_multicall_32bit_clean(struct multicall_entry *multi) > return true; > } > > -enum mc_disposition arch_do_multicall_call(struct mc_state *state) > +enum mc_disposition arch_do_multicall_call(struct mc_state *mcs) > { > - struct multicall_entry *multi = &state->call; > + struct multicall_entry *multi = &mcs->call; > > if ( multi->op >= ARRAY_SIZE(hypercall_args) ) > { > diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c > index cc9a6a9d59..01cd73040d 100644 > --- a/xen/arch/x86/hypercall.c > +++ b/xen/arch/x86/hypercall.c > @@ -203,15 +203,15 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, > return rc; > } > > -enum mc_disposition arch_do_multicall_call(struct mc_state *state) > +enum mc_disposition arch_do_multicall_call(struct mc_state *mcs) > { > const struct domain *currd = current->domain; > > if ( is_pv_domain(currd) ) > - return pv_do_multicall_call(state); > + return pv_do_multicall_call(mcs); > > if ( is_hvm_domain(currd) ) > - return hvm_do_multicall_call(state); > + return hvm_do_multicall_call(mcs); > > return mc_exit; > } > diff --git a/xen/include/xen/multicall.h b/xen/include/xen/multicall.h > index ac8238660a..5bebeca7b2 100644 > --- a/xen/include/xen/multicall.h > +++ b/xen/include/xen/multicall.h > @@ -25,6 +25,6 @@ enum mc_disposition { > mc_continue, > mc_exit, > mc_preempt, > -} arch_do_multicall_call(struct mc_state *mc); > +} arch_do_multicall_call(struct mc_state *mcs); > > #endif /* __XEN_MULTICALL_H__ */ > -- > 2.34.1 >
On 26.07.2023 11:34, Federico Serafini wrote: > Make function declaration and definition consistent using the same > parameter name ('mcs' do denote a pointer to an 'mc_state'). > This addresses a violation of MISRA C:2012 Rule 8.3: "All declarations > of an object or function shall use the same names and type qualifiers". > > Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> Acked-by: Jan Beulich <jbeulich@suse.com>
© 2016 - 2024 Red Hat, Inc.