Commit 92b6a659 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[] 



Use ARRAY_SIZE() to iterate over ARMCPUInfo[].

Since on the aarch64-linux-user build, arm_cpus[] is empty, add
the cpu_count variable and only iterate when it is non-zero.

Suggested-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200504172448.9402-4-philmd@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 5fda9504

target/arm/cpu.c

+9 −7
Original line number Diff line number Diff line
@@ -2739,7 +2739,6 @@ static const ARMCPUInfo arm_cpus[] = { 
    { .name = "any",         .initfn = arm_max_initfn },

#endif

#endif

    { .name = NULL }

};



static Property arm_cpu_properties[] = {
@@ -2887,19 +2886,22 @@ static const TypeInfo idau_interface_type_info = { 


static void arm_cpu_register_types(void)

{

    const ARMCPUInfo *info = arm_cpus;

    const size_t cpu_count = ARRAY_SIZE(arm_cpus);



    type_register_static(&arm_cpu_type_info);

    type_register_static(&idau_interface_type_info);



    while (info->name) {

        arm_cpu_register(info);

        info++;

    }



#ifdef CONFIG_KVM

    type_register_static(&host_arm_cpu_type_info);

#endif



    if (cpu_count) {

        size_t i;



        for (i = 0; i < cpu_count; ++i) {

            arm_cpu_register(&arm_cpus[i]);

        }

    }

}



type_init(arm_cpu_register_types)

target/arm/cpu64.c

+3 −5
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ static const ARMCPUInfo aarch64_cpus[] = { 
    { .name = "cortex-a53",         .initfn = aarch64_a53_initfn },

    { .name = "cortex-a72",         .initfn = aarch64_a72_initfn },

    { .name = "max",                .initfn = aarch64_max_initfn },

    { .name = NULL }

};



static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp)
@@ -840,13 +839,12 @@ static const TypeInfo aarch64_cpu_type_info = { 


static void aarch64_cpu_register_types(void)

{

    const ARMCPUInfo *info = aarch64_cpus;

    size_t i;



    type_register_static(&aarch64_cpu_type_info);



    while (info->name) {

        aarch64_cpu_register(info);

        info++;

    for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) {

        aarch64_cpu_register(&aarch64_cpus[i]);

    }

}