x86: refactor macros in 'xen-mca.h'

The macros defined 'xen/include/public/arch-x86/xen-mca.h' are revised
to address the following concerns:
- needless underscore prefixes for parameter names;
- the variable 'i' in function 'mce_action' that is shadowed
  by the local variable in the macro.

Therefore, the refactoring aims to resolve present shadowing
issues, which violate MISRA C:2012 Rule 5.3, and lessen the
probability of future ones with some renames.

No functional change.

Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Nicola Vetrini authored and Stefano Stabellini committed 2023-08-08 18:17:19 -07:00
1 parent 7ee9556518
commit 752fd032bf
1 file changed
+19 -19
+19 -19
View File
@@ -280,39 +280,39 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t);
/* Prototype:
* uint32_t x86_mcinfo_nentries(struct mc_info *mi);
*/
#define x86_mcinfo_nentries(_mi) \
(_mi)->mi_nentries
#define x86_mcinfo_nentries(mi) \
(mi)->mi_nentries
/* Prototype:
* struct mcinfo_common *x86_mcinfo_first(struct mc_info *mi);
*/
#define x86_mcinfo_first(_mi) \
((struct mcinfo_common *)(_mi)->mi_data)
#define x86_mcinfo_first(mi) \
((struct mcinfo_common *)(mi)->mi_data)
/* Prototype:
* struct mcinfo_common *x86_mcinfo_next(struct mcinfo_common *mic);
*/
#define x86_mcinfo_next(_mic) \
((struct mcinfo_common *)((uint8_t *)(_mic) + (_mic)->size))
#define x86_mcinfo_next(mic) \
((struct mcinfo_common *)((uint8_t *)(mic) + (mic)->size))
/* Prototype:
* void x86_mcinfo_lookup(void *ret, struct mc_info *mi, uint16_t type);
* void x86_mcinfo_lookup(void *ret, struct mc_info *mi, uint16_t mc_type);
*/
#define x86_mcinfo_lookup(_ret, _mi, _type) \
#define x86_mcinfo_lookup(ret, mi, mc_type) \
do { \
uint32_t found, i; \
struct mcinfo_common *_mic; \
uint32_t found_, i_; \
struct mcinfo_common *mic_; \
\
found = 0; \
(_ret) = NULL; \
if (_mi == NULL) break; \
_mic = x86_mcinfo_first(_mi); \
for (i = 0; i < x86_mcinfo_nentries(_mi); i++) { \
if (_mic->type == (_type)) { \
found = 1; \
found_ = 0; \
(ret) = NULL; \
if ((mi) == NULL) break; \
mic_ = x86_mcinfo_first(mi); \
for (i_ = 0; i_ < x86_mcinfo_nentries(mi); i_++) { \
if (mic_->type == (mc_type)) { \
found_ = 1; \
break; \
} \
_mic = x86_mcinfo_next(_mic); \
mic_ = x86_mcinfo_next(mic_); \
} \
(_ret) = found ? _mic : NULL; \
(ret) = found_ ? mic_ : NULL; \
} while (0)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.