On Mon, Jan 13, 2014 at 10:26:16AM +0000, Peter Maydell wrote:
> Switch the ARMCPUInfo arrays in cpu.c and cpu64.c to use a terminator
> entry rather than looping based on ARRAY_SIZE. The latter causes
> compile warnings on some versions of gcc if the configure options
> happen to result in an empty array.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Thanks Peter,
This fixes the build, I've applied it.
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
> ---
> Edgar, I think this should fix the compile warning you're seeing
> with your gcc version.
>
> target-arm/cpu.c | 9 ++++++---
> target-arm/cpu64.c | 15 ++++++---------
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/target-arm/cpu.c b/target-arm/cpu.c
> index 408d207..c77a16c 100644
> --- a/target-arm/cpu.c
> +++ b/target-arm/cpu.c
> @@ -980,6 +980,7 @@ static const ARMCPUInfo arm_cpus[] = {
> { .name = "any", .initfn = arm_any_initfn },
> #endif
> #endif
> + { .name = NULL }
> };
>
> static Property arm_cpu_properties[] = {
> @@ -1043,11 +1044,13 @@ static const TypeInfo arm_cpu_type_info = {
>
> static void arm_cpu_register_types(void)
> {
> - int i;
> + const ARMCPUInfo *info = arm_cpus;
>
> type_register_static(&arm_cpu_type_info);
> - for (i = 0; i < ARRAY_SIZE(arm_cpus); i++) {
> - cpu_register(&arm_cpus[i]);
> +
> + while (info->name) {
> + cpu_register(info);
> + info++;
> }
> }
>
> diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
> index 60acd24..a639c2e 100644
> --- a/target-arm/cpu64.c
> +++ b/target-arm/cpu64.c
> @@ -58,7 +58,7 @@ static const ARMCPUInfo aarch64_cpus[] = {
> #ifdef CONFIG_USER_ONLY
> { .name = "any", .initfn = aarch64_any_initfn },
> #endif
> - { .name = NULL } /* TODO: drop when we support more CPUs */
> + { .name = NULL }
> };
>
> static void aarch64_cpu_initfn(Object *obj)
> @@ -101,11 +101,6 @@ static void aarch64_cpu_register(const ARMCPUInfo *info)
> .class_init = info->class_init,
> };
>
> - /* TODO: drop when we support more CPUs - all entries will have name set
> */
> - if (!info->name) {
> - return;
> - }
> -
> type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
> type_register(&type_info);
> g_free((void *)type_info.name);
> @@ -124,11 +119,13 @@ static const TypeInfo aarch64_cpu_type_info = {
>
> static void aarch64_cpu_register_types(void)
> {
> - int i;
> + const ARMCPUInfo *info = aarch64_cpus;
>
> type_register_static(&aarch64_cpu_type_info);
> - for (i = 0; i < ARRAY_SIZE(aarch64_cpus); i++) {
> - aarch64_cpu_register(&aarch64_cpus[i]);
> +
> + while (info->name) {
> + aarch64_cpu_register(info);
> + info++;
> }
> }
>
> --
> 1.8.5
>
