[xen master] x86/setup: address MISRA C:2012 Rule 5.3 and 8.3

[patchbot@xxxxxxx]

commit a9de4b62f43d63776aff4299fe043977c7c8402e
Author:     Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
AuthorDate: Tue Aug 8 14:22:51 2023 +0200
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Tue Aug 8 18:17:51 2023 -0700

    x86/setup: address MISRA C:2012 Rule 5.3 and 8.3
    
    The parameters in the function declaration 'construct_dom0' violate
    Rule 8.3:
    "All declarations of an object or function shall use the same names
    and type qualifiers", but also cause shadowing inside the declaration
    scope with the variable "static struct file __initdata kernel;" in
    'xen/common/efi/boot.c'. Renaming the parameters in the declaration
    resolves both issues
    
    The local variable 'mask' is removed because it shadows the homonymous
    variable defined in an outer scope. There's no change to the semantics since
    the last use of this variable is in the scope touched by this commit.
    
    No functional changes.
    
    Signed-off-by: Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/include/asm/setup.h | 2 +-
 xen/arch/x86/setup.c             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h
index 51fce66607..b0e6a39e23 100644
--- a/xen/arch/x86/include/asm/setup.h
+++ b/xen/arch/x86/include/asm/setup.h
@@ -33,7 +33,7 @@ static inline void vesa_init(void) {};
 
 int construct_dom0(
     struct domain *d,
-    const module_t *kernel, unsigned long kernel_headroom,
+    const module_t *image, unsigned long image_headroom,
     module_t *initrd,
     const char *cmdline);
 void setup_io_bitmap(struct domain *d);
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 2dbe9857aa..80ae973d64 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1577,8 +1577,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
         s = map_s;
         if ( s < map_e )
         {
-            uint64_t mask = (1UL << L2_PAGETABLE_SHIFT) - 1;
-
+            mask = (1UL << L2_PAGETABLE_SHIFT) - 1;
             map_s = (s + mask) & ~mask;
             map_e &= ~mask;
             init_boot_pages(map_s, map_e);
--
generated by git-patchbot for /home/xen/git/xen.git#master