MISRA Rule 8.2 says that parameters must all have names. Rule 8.3 says that the names and types must match between declaration and definition.
No functional change. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Julien Grall <[email protected]> CC: Volodymyr Babchuk <[email protected]> CC: Bertrand Marquis <[email protected]> CC: Michal Orzel <[email protected]> CC: [email protected] <[email protected]> CC: Nicola Vetrini <[email protected]> --- xen/arch/arm/include/asm/pci.h | 2 +- xen/arch/arm/pci/pci-access.c | 4 ++-- xen/arch/x86/include/asm/compat.h | 2 +- xen/arch/x86/include/asm/p2m.h | 2 +- xen/arch/x86/mm/mem_paging.c | 2 +- xen/crypto/vmac.c | 2 +- xen/include/crypto/rijndael.h | 16 ++++++++-------- xen/include/xen/acpi.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 08ffcd443862..73c3be74aef1 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -98,7 +98,7 @@ struct pci_ecam_ops { unsigned int bus_shift; struct pci_ops pci_ops; int (*cfg_reg_index)(struct dt_device_node *dev); - int (*init)(struct pci_config_window *); + int (*init)(struct pci_config_window *cfg); }; /* Default ECAM ops */ diff --git a/xen/arch/arm/pci/pci-access.c b/xen/arch/arm/pci/pci-access.c index 4a9486750199..c0533c00c9a5 100644 --- a/xen/arch/arm/pci/pci-access.c +++ b/xen/arch/arm/pci/pci-access.c @@ -135,9 +135,9 @@ static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, #define PCI_OP_WRITE(size, type) \ void pci_conf_write##size(pci_sbdf_t sbdf, \ - unsigned int reg, type val) \ + unsigned int reg, type data) \ { \ - pci_config_write(sbdf, reg, size / 8, val); \ + pci_config_write(sbdf, reg, size / 8, data); \ } #define PCI_OP_READ(size, type) \ diff --git a/xen/arch/x86/include/asm/compat.h b/xen/arch/x86/include/asm/compat.h index 30ed8f2fd0dc..f12f4f24d802 100644 --- a/xen/arch/x86/include/asm/compat.h +++ b/xen/arch/x86/include/asm/compat.h @@ -16,7 +16,7 @@ typedef unsigned long full_ptr_t; struct domain; #ifdef CONFIG_PV32 -int switch_compat(struct domain *); +int switch_compat(struct domain *d); #else #include <xen/errno.h> static inline int switch_compat(struct domain *d) { return -EOPNOTSUPP; } diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index ef6b02ff0bb6..92be64e134e8 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -773,7 +773,7 @@ static inline int relinquish_p2m_mapping(struct domain *d) */ /* Modify p2m table for shared gfn */ -int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); +int set_shared_p2m_entry(struct domain *d, unsigned long gfn_l, mfn_t mfn); /* Tell xenpaging to drop a paged out frame */ void p2m_mem_paging_drop_page(struct domain *d, gfn_t gfn, p2m_type_t p2mt); diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index ac8d34ffa074..d4b3cb990c54 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -156,7 +156,7 @@ void p2m_mem_paging_populate(struct domain *d, gfn_t gfn) * * If the gfn was dropped the vcpu needs to be unpaused. */ -void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) +void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp) { struct p2m_domain *p2m = p2m_get_hostp2m(d); p2m_type_t p2mt; diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c index acb4e015f511..f1f6d75f8eeb 100644 --- a/xen/crypto/vmac.c +++ b/xen/crypto/vmac.c @@ -702,7 +702,7 @@ static uint64_t l3hash(uint64_t p1, uint64_t p2, /* ----------------------------------------------------------------------- */ -void vhash_update(unsigned char *m, +void vhash_update(unsigned char m[], unsigned int mbytes, /* Pos multiple of VMAC_NHBYTES */ vmac_ctx_t *ctx) { diff --git a/xen/include/crypto/rijndael.h b/xen/include/crypto/rijndael.h index 4386be587851..80c612749f9e 100644 --- a/xen/include/crypto/rijndael.h +++ b/xen/include/crypto/rijndael.h @@ -45,14 +45,14 @@ typedef struct { u32 dk[4*(AES_MAXROUNDS + 1)]; /* decrypt key schedule */ } rijndael_ctx; -int rijndael_set_key(rijndael_ctx *, const unsigned char *, int); -int rijndael_set_key_enc_only(rijndael_ctx *, const unsigned char *, int); -void rijndael_decrypt(rijndael_ctx *, const unsigned char *, unsigned char *); -void rijndael_encrypt(rijndael_ctx *, const unsigned char *, unsigned char *); +int rijndael_set_key(rijndael_ctx *ctx, const unsigned char *key, int bits); +int rijndael_set_key_enc_only(rijndael_ctx *ctx, const unsigned char *key, int bits); +void rijndael_decrypt(rijndael_ctx *ctx, const unsigned char *src, unsigned char *dst); +void rijndael_encrypt(rijndael_ctx *ctx, const unsigned char *src, unsigned char *dst); -int rijndaelKeySetupEnc(unsigned int [], const unsigned char [], int); -int rijndaelKeySetupDec(unsigned int [], const unsigned char [], int); -void rijndaelEncrypt(const unsigned int [], int, const unsigned char [16], - unsigned char [16]); +int rijndaelKeySetupEnc(unsigned int rk[], const unsigned char cipherKey[], int keyBits); +int rijndaelKeySetupDec(unsigned int rk[], const unsigned char cipkerKey[], int keyBits); +void rijndaelEncrypt(const unsigned int rk[], int Nr, const unsigned char pt[16], + unsigned char ct[16]); #endif /* __RIJNDAEL_H */ diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 90635ba0f322..ca87cd15a824 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -75,7 +75,7 @@ typedef int (*acpi_table_handler) (struct acpi_table_header *table); typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); unsigned int acpi_get_processor_id (unsigned int cpu); -char * __acpi_map_table (paddr_t phys_addr, unsigned long size); +char * __acpi_map_table (paddr_t phys, unsigned long size); bool __acpi_unmap_table(const void *ptr, unsigned long size); int acpi_boot_init (void); int acpi_boot_table_init (void); -- 2.39.5
