[xen staging] x86/pmstat: deal with Misra 8.4 violations

[patchbot@xxxxxxx]

commit 6308301208d60fcd2b9125fe6a602cefa80392e6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Nov 19 09:12:43 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Nov 19 19:53:51 2024 +0000

    x86/pmstat: deal with Misra 8.4 violations
    
    While the override #define-s in x86_64/platform_hypercall.c are good for
    the consuming side of the compat variants of set_{cx,px}_pminfo(), the
    producers lack the respective declarations. Include pmstat.h early,
    before the overrides are put in place, while adding explicit
    declarations of the compat functions (alongside structure forward
    declarations).
    
    Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Tested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/x86_64/platform_hypercall.c | 2 +-
 xen/include/xen/pmstat.h                 | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/x86_64/platform_hypercall.c 
b/xen/arch/x86/x86_64/platform_hypercall.c
index 347f5d6533..9ab631c17f 100644
--- a/xen/arch/x86/x86_64/platform_hypercall.c
+++ b/xen/arch/x86/x86_64/platform_hypercall.c
@@ -4,8 +4,8 @@
 
 EMIT_FILE;
 
-#include <xen/lib.h>
 #include <xen/hypercall.h>
+#include <xen/pmstat.h>
 
 #define xen_platform_op     compat_platform_op
 #define xen_platform_op_t   compat_platform_op_t
diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h
index e6ab1423a9..8350403e95 100644
--- a/xen/include/xen/pmstat.h
+++ b/xen/include/xen/pmstat.h
@@ -7,6 +7,14 @@
 
 int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf);
 long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power);
+
+#ifdef CONFIG_COMPAT
+struct compat_processor_performance;
+int compat_set_px_pminfo(uint32_t acpi_id, struct compat_processor_performance 
*perf);
+struct compat_processor_power;
+long compat_set_cx_pminfo(uint32_t acpi_id, struct compat_processor_power 
*power);
+#endif
+
 uint32_t pmstat_get_cx_nr(unsigned int cpu);
 int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat);
 int pmstat_reset_cx_stat(unsigned int cpu);
--
generated by git-patchbot for /home/xen/git/xen.git#staging