[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 4/6] target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[] |
Date: |
Tue, 21 Apr 2020 15:19:24 +0200 |
Suggested-by: Richard Henderson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
target/arm/cpu.c | 8 +++-----
target/arm/cpu64.c | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 6c84e99a38..9023d9e2cf 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2735,7 +2735,6 @@ static const ARMCPUInfo arm_cpus[] = {
{ .name = "any", .initfn = arm_max_initfn },
#endif
#endif
- { .name = NULL }
};
static Property arm_cpu_properties[] = {
@@ -2883,14 +2882,13 @@ static const TypeInfo idau_interface_type_info = {
static void arm_cpu_register_types(void)
{
- const ARMCPUInfo *info = arm_cpus;
+ size_t i;
type_register_static(&arm_cpu_type_info);
type_register_static(&idau_interface_type_info);
- while (info->name) {
- arm_cpu_register(info);
- info++;
+ for (i = 0; i < ARRAY_SIZE(arm_cpus); ++i) {
+ arm_cpu_register(&arm_cpus[i]);
}
#ifdef CONFIG_KVM
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index e89388378b..5daafba937 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -733,7 +733,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)
@@ -839,13 +838,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]);
}
}
--
2.21.1
- [PATCH 0/6] target/arm: Restrict TCG cpus to TCG accel, Philippe Mathieu-Daudé, 2020/04/21
- [PATCH 2/6] target/arm: Make set_feature() available for other files, Philippe Mathieu-Daudé, 2020/04/21
- [PATCH 1/6] target/arm: Restric the Address Translate write operation to TCG accel, Philippe Mathieu-Daudé, 2020/04/21
- [PATCH 4/6] target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[],
Philippe Mathieu-Daudé <=
- [PATCH 3/6] target/arm: Make cpu_register() available for other files, Philippe Mathieu-Daudé, 2020/04/21
- [PATCH 5/6] target/arm/cpu: Update coding style to make checkpatch.pl happy, Philippe Mathieu-Daudé, 2020/04/21
- [PATCH 6/6] target/arm: Restrict TCG cpus to TCG accel, Philippe Mathieu-Daudé, 2020/04/21