MISRA doesn't like !!CONST being used in place of a 1 (Rule 10.1). Update the expression to just be a plain 1, which still matches the description.
No functional change. Reported-by: Nicola Vetrini <nicola.vetr...@bugseng.com> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Jan Beulich <jbeul...@suse.com> CC: Roger Pau Monné <roger....@citrix.com> CC: Wei Liu <w...@xen.org> CC: Nicola Vetrini <nicola.vetr...@bugseng.com> After considering the comment several times, I've decided to leave it as is. It's slightly awkward grammar but it's ok. --- xen/include/xen/lib/x86/cpu-policy.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index bab3eecda6c1..d5e447e9dc06 100644 --- a/xen/include/xen/lib/x86/cpu-policy.h +++ b/xen/include/xen/lib/x86/cpu-policy.h @@ -100,13 +100,14 @@ const char *x86_cpuid_vendor_to_str(unsigned int vendor); * interaction with the toolstack. (Sum of all leaves in each union, less the * entries in basic which sub-unions hang off of.) */ -#define CPUID_MAX_SERIALISED_LEAVES \ - (CPUID_GUEST_NR_BASIC + \ - CPUID_GUEST_NR_FEAT - !!CPUID_GUEST_NR_FEAT + \ - CPUID_GUEST_NR_CACHE - !!CPUID_GUEST_NR_CACHE + \ - CPUID_GUEST_NR_TOPO - !!CPUID_GUEST_NR_TOPO + \ - CPUID_GUEST_NR_XSTATE - !!CPUID_GUEST_NR_XSTATE + \ - CPUID_GUEST_NR_EXTD + 2 /* hv_limit and hv2_limit */ ) +#define CPUID_MAX_SERIALISED_LEAVES \ + (CPUID_GUEST_NR_BASIC + \ + CPUID_GUEST_NR_FEAT - 1 + \ + CPUID_GUEST_NR_CACHE - 1 + \ + CPUID_GUEST_NR_TOPO - 1 + \ + CPUID_GUEST_NR_XSTATE - 1 + \ + CPUID_GUEST_NR_EXTD + \ + 2 /* hv_limit and hv2_limit */ ) /* Maximum number of MSRs written when serialising a cpu_policy. */ #define MSR_MAX_SERIALISED_ENTRIES 2 base-commit: c035151902689aa5a3765aeb16fa52755917b9ca -- 2.30.2
