The xen sources contains violations of MISRA C:2012 Rule 7.2 whose
headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants
that are represented in an unsigned type".
Add the 'U' suffix to integers literals with unsigned type.
For the sake of uniformity, the following change is made:
- add the 'U' suffix to switch cases in 'cpuid.c'
Signed-off-by: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v6:
- new patch obtained by splitting LIB related changes from
"xen/x86: address violations of MISRA C:2012 Rule 7.2 (v5)"
---
xen/lib/x86/cpuid.c | 8 ++++----
xen/lib/x86/policy.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c
index 2006cbaa1c..eb7698dc73 100644
--- a/xen/lib/x86/cpuid.c
+++ b/xen/lib/x86/cpuid.c
@@ -217,10 +217,10 @@ void x86_cpu_policy_fill_native(struct cpu_policy *p)
}
/* Extended leaves. */
- cpuid_leaf(0x80000000, &p->extd.raw[0]);
+ cpuid_leaf(0x80000000U, &p->extd.raw[0]);
for ( i = 1; i <= MIN(p->extd.max_leaf & 0xffffU,
ARRAY_SIZE(p->extd.raw) - 1); ++i )
- cpuid_leaf(0x80000000 + i, &p->extd.raw[i]);
+ cpuid_leaf(0x80000000U + i, &p->extd.raw[i]);
/* Don't report leaves from possible lower level hypervisor, for now. */
p->hv_limit = 0;
@@ -421,7 +421,7 @@ int x86_cpuid_copy_to_buffer(const struct cpu_policy *p,
/* Extended leaves. */
for ( leaf = 0; leaf <= MIN(p->extd.max_leaf & 0xffffUL,
ARRAY_SIZE(p->extd.raw) - 1); ++leaf )
- COPY_LEAF(0x80000000 | leaf, XEN_CPUID_NO_SUBLEAF, &p->extd.raw[leaf]);
+ COPY_LEAF(0x80000000U | leaf, XEN_CPUID_NO_SUBLEAF, &p->extd.raw[leaf]);
#undef COPY_LEAF
@@ -521,7 +521,7 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *p,
p->hv2_limit = l.a;
break;
- case 0x80000000 ... 0x80000000 + ARRAY_SIZE(p->extd.raw) - 1:
+ case 0x80000000U ... 0x80000000U + ARRAY_SIZE(p->extd.raw) - 1:
if ( data.subleaf != XEN_CPUID_NO_SUBLEAF )
goto out_of_range;
diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c
index a9c60000af..f033d22785 100644
--- a/xen/lib/x86/policy.c
+++ b/xen/lib/x86/policy.c
@@ -22,7 +22,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host,
FAIL_CPUID(7, 0);
if ( guest->extd.max_leaf > host->extd.max_leaf )
- FAIL_CPUID(0x80000000, NA);
+ FAIL_CPUID(0x80000000U, NA);
/* TODO: Audit more CPUID data. */
--
2.34.1