target/riscv/cpu.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 5689368f02..f7083b2d5c 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1875,6 +1875,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor
*v,
}
#endif
+#define ADD_CPU_PROPERTIES_ARRAY(_dev, _array) \
+ do { \
+ for (int i = 0; i < ARRAY_SIZE(_array); i++) { \
+ qdev_property_add_static(_dev, &_array[i]); \
+ } \
+ } while (0)
+
/*
* Add CPU properties with user-facing flags.
*
@@ -1918,17 +1925,9 @@ static void riscv_cpu_add_user_properties(Object *obj)
qdev_property_add_static(dev, prop);
}
- for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) {
- qdev_property_add_static(dev, &riscv_cpu_options[i]);
- }
-
- for (int i = 0; i < ARRAY_SIZE(riscv_cpu_vendor_exts); i++) {
- qdev_property_add_static(dev, &riscv_cpu_vendor_exts[i]);
- }
-
- for (int i = 0; i < ARRAY_SIZE(riscv_cpu_experimental_exts); i++) {
- qdev_property_add_static(dev, &riscv_cpu_experimental_exts[i]);
- }
+ ADD_CPU_PROPERTIES_ARRAY(dev, riscv_cpu_options);
+ ADD_CPU_PROPERTIES_ARRAY(dev, riscv_cpu_vendor_exts);
+ ADD_CPU_PROPERTIES_ARRAY(dev, riscv_cpu_experimental_exts);
}
static Property riscv_cpu_properties[] = {