[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-4.19] x86/cpu-policy: Adjust CPUID_MAX_SERIALISED_LEAVES to placate MISRA
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Tue, 10 Oct 2023 10:57:48 +0100
- Authentication-results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Tue, 10 Oct 2023 09:58:00 +0000
- Ironport-data: A9a23:ZnkDLq7H718CBBQDGKxgbQxRtCvHchMFZxGqfqrLsTDasY5as4F+v mofCmqHa/+MMGfzct13Oozi9BsGu5SDzNM2GwBvrC8zHi5G8cbLO4+Ufxz6V8+wwm8vb2o8t plDNYOQRCwQZiWBzvt4GuG59RGQ7YnRG/ykTraCY3gtLeNdYH9JoQp5nOIkiZJfj9G8Agec0 fv/uMSaM1K+s9JOGjt8B5mr9lU355wehBtC5gZlPKgS5AeH/5UoJMl3yZ+ZfiOQrrZ8RoZWd 86bpJml82XQ+QsaC9/Nut4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5iXBYoUm9Fii3hojxE4 I4lWapc6+seFvakdOw1C3G0GszlVEFM0OevzXOX6aR/w6BaGpdFLjoH4EweZOUlFuhL7W5my vEqOgxUTFe5wLy9g62Cdc431ukaM5y+VG8fkikIITDxCP8nRdbIQrnQ5M8e1zA17ixMNa+AP YxDM2MpNUmRJUIXUrsUIMtWcOOAr3/zaTBH7nmSorI6+TP7xw1tyrn9dtHSf7RmQO0MxBrJ9 juWojqR7hcyatCe2SWO+2OVvqzNmjnGYocJGeS9z6s/6LGU7jNKU0BHPbehmtGph0j7V99BJ kg8/is1sbN05EGtVsP6XRCzvDiDpBF0c9xRGOo+4UeTx7bO4gCYLmIZQSVMbtNgv8gzLRQI/ FKUm9LiBRR0raaYD3ma89+8sjeaKSUTa2gYakc5oRAtuoe55ttp11SWE4clT/bdYsDJ9S/Y/ D24vhRnpfIpypAAlLqCwnec0x+Vuc2cJuIq3Tk7Tl5J/ysgOt/7NtT4tQmHhRpTBNzHFATd4 hDoj+DbvLhXUs/X/MCYaL9VdIxF8cppJ9E1bbRHJ54k7z2r/DaJcIlb4FmSz28yaZ5aJ1cFj KLJ0D69BaO/31PwN8ebm6rrV6wXIVHITLwJrMz8YNtUeYRWfwSa5ixobkP49zmzwRZ8zv9iY czAKpzE4ZMm5UNPlWXeegvg+eVzmnBWKZ37GPgXMChLIZLBPSXIGN/pwXOFb/wj7bPsnTg5B +13bpPQoz0GCb2WX8Ui2dJLRbz8BSRhVM+eRg0+XrLrHzeK70l6UqSAmulxJ9cNcmY8vr6gw 0xRk3RwkDLX7UAr4y3TApy/QNsDhapCkE8=
- Ironport-hdrordr: A9a23:ShiZn6Efu/JKdW0upLqFnpLXdLJyesId70hD6qkvc3Fom52j/f xGws5x6fatskdlZJjko6HJBEGBKUmsiKKdkrNhSYtKPTOW+FdASbsP0WKM+UyQJ8STzJ8n6U 4kSdkNNDSSNyk4sS+Z2njJLz9I+rDun87Y5pa9vg4dNT2Gc5sB0+46MHfpLqQffngCOXNTLu vh2iMznUvfRZ1hVLXFOpBqZZm4mzT+ruOjXTc2QzI34gyHjTel85/9CQWV0y0fXTRG3Ks4/X KAtwDi/K2sv8ihzBXRzXXe4v1t6b7c4+oGKN2Hj8AULjn2qgKwf4RnRpWJoTAyp4iUmTAXue iJjwYrOsxy73/LXmWtuhvrxizpzToo4W+K8y7+vVLT5eDpTjczC85MnrtDdArIzkI8sNZ3wM twrgakXtdsfEn9dOuU3amIazha0m6P5VYym+8aiHJSFaMYdb9qtIQauHhYFZ8RdRiKpLzORI NVbf301bJzSxe3fnrZtm5gzJiHRXIoBCqLRUAEp4i8zyVWtGoR9TpK+OUv2lM7sL4tQZhN4O rJdo5ykqtVc8MQZaVhQM8cXMqMDHDXSx6kChPDHb3eLtBUB5vxke+o3Fx13pD0RHUw9upvpH 0VaiIIiYYwE3ieRPFmkqc7sGGZfI16NQ6djf22rKIJzYEUf4CbexFqkjgV4pKdSsUkc4vmsr 6ISeRr6t/YXDPT8NVyrlbDs287EwhRbCXj0uxLFG5m5Pi7d7EDuoHgAb/uzZLWYH0ZZl8=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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.vetrini@xxxxxxxxxxx>
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
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
|
