|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 2/5] x86/mtrr: Address MISRA C Rules 5.3, 8.3 and 8.4
Define num_var_ranges with the type it is declared with in mtrr.h
(Rule 8.3), make usage_table static as nothing outside main.c uses it
(Rule 8.4), and rename the local variable in is_var_mtrr_overlapped()
that hides the global num_var_ranges (Rule 5.3).
No functional change.
Signed-off-by: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>
---
xen/arch/x86/cpu/mtrr/generic.c | 6 +++---
xen/arch/x86/cpu/mtrr/main.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c
index 4cc7c8bd5d..5df3cf491c 100644
--- a/xen/arch/x86/cpu/mtrr/generic.c
+++ b/xen/arch/x86/cpu/mtrr/generic.c
@@ -57,9 +57,9 @@ get_fixed_ranges(mtrr_type * frs)
bool is_var_mtrr_overlapped(const struct mtrr_state *m)
{
unsigned int seg, i;
- unsigned int num_var_ranges = MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT);
+ unsigned int nr_ranges = MASK_EXTR(m->mtrr_cap, MTRRcap_VCNT);
- for ( i = 0; i < num_var_ranges; i++ )
+ for ( i = 0; i < nr_ranges; i++ )
{
uint64_t base1 = m->var_ranges[i].base >> PAGE_SHIFT;
uint64_t mask1 = m->var_ranges[i].mask >> PAGE_SHIFT;
@@ -67,7 +67,7 @@ bool is_var_mtrr_overlapped(const struct mtrr_state *m)
if ( !(m->var_ranges[i].mask & MTRR_PHYSMASK_VALID) )
continue;
- for ( seg = i + 1; seg < num_var_ranges; seg++ )
+ for ( seg = i + 1; seg < nr_ranges; seg++ )
{
uint64_t base2 = m->var_ranges[seg].base >> PAGE_SHIFT;
uint64_t mask2 = m->var_ranges[seg].mask >> PAGE_SHIFT;
diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c
index eff0500f0d..e49ac1b508 100644
--- a/xen/arch/x86/cpu/mtrr/main.c
+++ b/xen/arch/x86/cpu/mtrr/main.c
@@ -50,9 +50,9 @@
#define get_cpu() smp_processor_id()
#define put_cpu() do {} while(0)
-u32 __read_mostly num_var_ranges = 0;
+unsigned int __read_mostly num_var_ranges = 0;
-unsigned int *__read_mostly usage_table;
+static unsigned int *__read_mostly usage_table;
static DEFINE_MUTEX(mtrr_mutex);
u64 __read_mostly size_or_mask;
--
2.43.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |