[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


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>
  • Date: Wed, 18 Nov 2026 18:17:53 +0100
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s8K1UhyhD8d/PYrkJMQnHID8bEtC613aGqT+nT6QczM=; b=NiJZv9iKgNUdMTIjZFAqb7nVIbWjv3LJ8VMTzkvXBbKy1C+T9VkcGkTz2/EYrgpY538oxeiyTpMX4oUeE2DRquSJ0VqhrL21q/z9fN94tYjlAg76WHh0skiHPLewMdWEsGhEx48x1kyZIV3HARlKSD8V1lUPs6z3Ef55TIdr/eY9FUCdesyKXh3v6xYxjInJwLRDpdwuXKwCVVHOFuD6KZOdIci1vpP4xgbnA4KsgU7aeXGXUmlg/F1ZBFL7ZzbZ2lcZ+DVJt+TyM3UyWZU8FSIFQXBzMciNO9LSP8V4gBhqiRKSGWharGdt/l7Za16WJ3cBe2TiR0vDu/qEDW2HVA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qvpXx1yH1NqBPapbp8nRkhcviBSgyJ0awadaWBW2uUoDnMzByZZakQIWd6nWvxQl/LZnv1g9PTI5krvFVEL4X3Tz2xiUEbF5/Q4Rxv/ItDX6/rMm1Dg3fBGijViBL1xESgOmlJE7qClk4JIHsJlDHqmVC8sG/vCNf2TyRPWHkQlY6Jc5IfLkaSWeljag6oBQaJBAorwi0md35QjHC+UOrwwGs/IhydpVnqz2jNTP7zgmN9DCdGwZcC7M8hv5dp+qRa2jKnMakQOy6Bk/Xpp7MQwqlga95hucH6xgt77jgqvypzofjo/VLIRZMXw8gXoycslor9PrFoBpkdtiSlOeGQ==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Cc: Alejandro Vallejo <alejandro.garciavallejo@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, Teddy Astie <teddy.astie@xxxxxxxxxx>
  • Delivery-date: Wed, 18 Nov 2026 17:18:23 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.