From: Andrew Cooper Date: Tue, 10 Oct 2023 09:52:53 +0000 (+0100) Subject: x86/cpu-policy: Adjust CPUID_MAX_SERIALISED_LEAVES to placate MISRA X-Git-Tag: 4.19.0-rc1~1201 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cfff187ed5f2068f48a3d44f0560b1721902a276;p=xen.git x86/cpu-policy: Adjust CPUID_MAX_SERIALISED_LEAVES to placate MISRA 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 Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- diff --git a/xen/include/xen/lib/x86/cpu-policy.h b/xen/include/xen/lib/x86/cpu-policy.h index bab3eecda6..d5e447e9dc 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