MISRA C:2012 Ammendment 3 (which is under consideration, but not used by Xen
yet) is more particular about the order of keywords.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
CC: Bertrand Marquis <bertrand.marquis@arm.com>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Nicola Vetrini <nicola.vetrini@bugseng.com>
CC: consulting@bugseng.com
---
xen/arch/arm/gic-v2.c | 2 +-
xen/include/xen/init.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 02043c0d4b1f..b23e72a3d05d 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -1311,7 +1311,7 @@ static void gicv2_do_LPI(unsigned int lpi)
BUG();
}
-const static struct gic_hw_operations gicv2_ops = {
+static const struct gic_hw_operations gicv2_ops = {
.info = &gicv2_info,
.init = gicv2_init,
.secondary_init = gicv2_secondary_cpu_init,
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 0a4223833755..abf275f0eb72 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -63,9 +63,9 @@ typedef int (*initcall_t)(void);
typedef void (*exitcall_t)(void);
#define presmp_initcall(fn) \
- const static initcall_t __initcall_##fn __init_call("presmp") = (fn)
+ static const initcall_t __initcall_##fn __init_call("presmp") = (fn)
#define __initcall(fn) \
- const static initcall_t __initcall_##fn __init_call("1") = (fn)
+ static const initcall_t __initcall_##fn __init_call("1") = (fn)
#define __exitcall(fn) \
static exitcall_t __exitcall_##fn __exit_call = fn
base-commit: befc384d21784affa3daf2abc85b02500e4dc545
--
2.39.5
On 2025-04-03 22:43, Andrew Cooper wrote:
> MISRA C:2012 Ammendment 3 (which is under consideration, but not used
> by Xen
^ typo
> yet) is more particular about the order of keywords.
>
> No functional change.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Any specific reason not to give [1] and [2] the same treatment? Other
than that, looks good to me.
[1]
https://saas.eclairit.com:3787/fs/var/local/eclair/xen-project.ecdf/xen-project/people/bugseng/xen/ECLAIR_normal/MISRA_C_AMD3/X86_64/9616508934/PROJECT.ecd;/sources/xen/arch/x86/genapic/x2apic.c.html#R4145_1
[2]
https://saas.eclairit.com:3787/fs/var/local/eclair/xen-project.ecdf/xen-project/people/bugseng/xen/ECLAIR_normal/MISRA_C_AMD3/X86_64/9616508934/PROJECT.ecd;/sources/xen/arch/x86/hvm/dom0_build.c.html#R13937_1
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien@xen.org>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
> CC: Bertrand Marquis <bertrand.marquis@arm.com>
> CC: Michal Orzel <michal.orzel@amd.com>
> CC: Nicola Vetrini <nicola.vetrini@bugseng.com>
> CC: consulting@bugseng.com
> ---
> xen/arch/arm/gic-v2.c | 2 +-
> xen/include/xen/init.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
> index 02043c0d4b1f..b23e72a3d05d 100644
> --- a/xen/arch/arm/gic-v2.c
> +++ b/xen/arch/arm/gic-v2.c
> @@ -1311,7 +1311,7 @@ static void gicv2_do_LPI(unsigned int lpi)
> BUG();
> }
>
> -const static struct gic_hw_operations gicv2_ops = {
> +static const struct gic_hw_operations gicv2_ops = {
> .info = &gicv2_info,
> .init = gicv2_init,
> .secondary_init = gicv2_secondary_cpu_init,
> diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
> index 0a4223833755..abf275f0eb72 100644
> --- a/xen/include/xen/init.h
> +++ b/xen/include/xen/init.h
> @@ -63,9 +63,9 @@ typedef int (*initcall_t)(void);
> typedef void (*exitcall_t)(void);
>
> #define presmp_initcall(fn) \
> - const static initcall_t __initcall_##fn __init_call("presmp") =
> (fn)
> + static const initcall_t __initcall_##fn __init_call("presmp") =
> (fn)
> #define __initcall(fn) \
> - const static initcall_t __initcall_##fn __init_call("1") = (fn)
> + static const initcall_t __initcall_##fn __init_call("1") = (fn)
> #define __exitcall(fn) \
> static exitcall_t __exitcall_##fn __exit_call = fn
>
>
> base-commit: befc384d21784affa3daf2abc85b02500e4dc545
--
Nicola Vetrini, B.Sc.
Software Engineer
BUGSENG (https://bugseng.com)
LinkedIn: https://www.linkedin.com/in/nicola-vetrini-a42471253
On 03/04/2025 10:04 pm, Nicola Vetrini wrote: > On 2025-04-03 22:43, Andrew Cooper wrote: >> MISRA C:2012 Ammendment 3 (which is under consideration, but not used >> by Xen > ^ typo >> yet) is more particular about the order of keywords. >> >> No functional change. >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Any specific reason not to give [1] and [2] the same treatment? Other > than that, looks good to me. > > [1] > https://saas.eclairit.com:3787/fs/var/local/eclair/xen-project.ecdf/xen-project/people/bugseng/xen/ECLAIR_normal/MISRA_C_AMD3/X86_64/9616508934/PROJECT.ecd;/sources/xen/arch/x86/genapic/x2apic.c.html#R4145_1 > [2] > https://saas.eclairit.com:3787/fs/var/local/eclair/xen-project.ecdf/xen-project/people/bugseng/xen/ECLAIR_normal/MISRA_C_AMD3/X86_64/9616508934/PROJECT.ecd;/sources/xen/arch/x86/hvm/dom0_build.c.html#R13937_1 Oh, inattention to detail with my `git grep`. I'll update to include these. Thanks. ~Andrew
MISRA C:2012 Amendment 3 (which is under consideration, but not used by Xen
yet) is more particular about having the storage class specifier first.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
CC: Bertrand Marquis <bertrand.marquis@arm.com>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Nicola Vetrini <nicola.vetrini@bugseng.com>
CC: consulting@bugseng.com
v2:
* Fix x2apic_mode and orders[] too.
---
xen/arch/arm/gic-v2.c | 2 +-
xen/arch/x86/genapic/x2apic.c | 4 ++--
xen/arch/x86/hvm/dom0_build.c | 4 ++--
xen/include/xen/init.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 02043c0d4b1f..b23e72a3d05d 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -1311,7 +1311,7 @@ static void gicv2_do_LPI(unsigned int lpi)
BUG();
}
-const static struct gic_hw_operations gicv2_ops = {
+static const struct gic_hw_operations gicv2_ops = {
.info = &gicv2_info,
.init = gicv2_init,
.secondary_init = gicv2_secondary_cpu_init,
diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c
index 74a6d808ac30..1d55eb6b8a41 100644
--- a/xen/arch/x86/genapic/x2apic.c
+++ b/xen/arch/x86/genapic/x2apic.c
@@ -216,9 +216,9 @@ static struct notifier_block x2apic_cpu_nfb = {
static int8_t __initdata x2apic_phys = -1;
boolean_param("x2apic_phys", x2apic_phys);
-enum {
+static enum {
unset, physical, mixed
-} static __initdata x2apic_mode = unset;
+} x2apic_mode __initdata = unset;
static int __init cf_check parse_x2apic_mode(const char *s)
{
diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index daf1b6f88b14..9fd68df7b936 100644
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -91,10 +91,10 @@ static int __init pvh_populate_memory_range(struct domain *d,
unsigned long start,
unsigned long nr_pages)
{
- struct {
+ static const struct {
unsigned long align;
unsigned int order;
- } static const __initconst orders[] = {
+ } orders[] __initconst = {
/* NB: must be sorted by decreasing size. */
{ .align = PFN_DOWN(GB(1)), .order = PAGE_ORDER_1G },
{ .align = PFN_DOWN(MB(2)), .order = PAGE_ORDER_2M },
diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 0a4223833755..abf275f0eb72 100644
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -63,9 +63,9 @@ typedef int (*initcall_t)(void);
typedef void (*exitcall_t)(void);
#define presmp_initcall(fn) \
- const static initcall_t __initcall_##fn __init_call("presmp") = (fn)
+ static const initcall_t __initcall_##fn __init_call("presmp") = (fn)
#define __initcall(fn) \
- const static initcall_t __initcall_##fn __init_call("1") = (fn)
+ static const initcall_t __initcall_##fn __init_call("1") = (fn)
#define __exitcall(fn) \
static exitcall_t __exitcall_##fn __exit_call = fn
base-commit: befc384d21784affa3daf2abc85b02500e4dc545
--
2.39.5
On 03/04/2025 23:41, Andrew Cooper wrote: > > > MISRA C:2012 Amendment 3 (which is under consideration, but not used by Xen > yet) is more particular about having the storage class specifier first. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Michal Orzel <michal.orzel@amd.com> #Arm ~Michal
On 03.04.2025 23:41, Andrew Cooper wrote: > MISRA C:2012 Amendment 3 (which is under consideration, but not used by Xen > yet) is more particular about having the storage class specifier first. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
© 2016 - 2025 Red Hat, Inc.