The code inside riscv_cpu_add_user_properties() became quite repetitive
after recent changes. Add a macro to hide the repetition away.

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
---
 target/riscv/cpu.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 520c5c9f96..8e1d944957 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1883,6 +1883,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v,
 }
 #endif
 
+#define ADD_CPU_QDEV_PROPERTIES_ARRAY(_dev, _array) \
+    do { \
+        for (Property *prop = _array; prop && prop->name; prop++) { \
+            qdev_property_add_static(_dev, prop); \
+        } \
+    } while (0)
+
 #ifndef CONFIG_USER_ONLY
 static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name)
 {
@@ -1939,7 +1946,6 @@ static void riscv_cpu_add_kvm_properties(Object *obj)
  */
 static void riscv_cpu_add_user_properties(Object *obj)
 {
-    Property *prop;
     DeviceState *dev = DEVICE(obj);
 
 #ifndef CONFIG_USER_ONLY
@@ -1953,21 +1959,10 @@ static void riscv_cpu_add_user_properties(Object *obj)
 
     riscv_cpu_add_misa_properties(obj);
 
-    for (prop = riscv_cpu_extensions; prop && prop->name; prop++) {
-        qdev_property_add_static(dev, prop);
-    }
-
-    for (prop = riscv_cpu_options; prop && prop->name; prop++) {
-        qdev_property_add_static(dev, prop);
-    }
-
-    for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) {
-        qdev_property_add_static(dev, prop);
-    }
-
-    for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) {
-        qdev_property_add_static(dev, prop);
-    }
+    ADD_CPU_QDEV_PROPERTIES_ARRAY(dev, riscv_cpu_extensions);
+    ADD_CPU_QDEV_PROPERTIES_ARRAY(dev, riscv_cpu_options);
+    ADD_CPU_QDEV_PROPERTIES_ARRAY(dev, riscv_cpu_vendor_exts);
+    ADD_CPU_QDEV_PROPERTIES_ARRAY(dev, riscv_cpu_experimental_exts);
 }
 
 static Property riscv_cpu_properties[] = {
-- 
2.41.0

On 8/15/23 13:15, Daniel Henrique Barboza wrote:
> @@ -1883,6 +1883,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v,
>   }
>   #endif
>   
> +#define ADD_CPU_QDEV_PROPERTIES_ARRAY(_dev, _array) \
> +    do { \
> +        for (Property *prop = _array; prop && prop->name; prop++) { \
> +            qdev_property_add_static(_dev, prop); \
> +        } \
> +    } while (0)

Any reason not to make this a proper function?


r~

On 8/15/23 17:44, Richard Henderson wrote:
> On 8/15/23 13:15, Daniel Henrique Barboza wrote:
>> @@ -1883,6 +1883,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v,
>>   }
>>   #endif
>> +#define ADD_CPU_QDEV_PROPERTIES_ARRAY(_dev, _array) \
>> +    do { \
>> +        for (Property *prop = _array; prop && prop->name; prop++) { \
>> +            qdev_property_add_static(_dev, prop); \
>> +        } \
>> +    } while (0)
> 
> Any reason not to make this a proper function?

It was a macro since early versions and remained this way. I don't have
strong feelings in favor or against it.

I assume that you don't fancy this macro usage, and probably for a good reason,
so I guess I'll do another version without macros in this patch and patch 8 (since
it's a similar macro usage).


Thanks,


Daniel


> 
> 
> r~

On 8/15/23 14:15, Daniel Henrique Barboza wrote:
> I assume that you don't fancy this macro usage, and probably for a good reason,

I prefer to use macros only for things that cannot be done another way.
When debugging, one cannot step through macros in any reasonable way.


r~