[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.2 v5 07/11] target/riscv/cpu.c: add ADD_CPU_QDEV_PROPERTIES
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH for-8.2 v5 07/11] target/riscv/cpu.c: add ADD_CPU_QDEV_PROPERTIES_ARRAY() macro |
Date: |
Thu, 20 Jul 2023 14:19:29 -0300 |
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 | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 7c6060ffa3..23169a606f 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_QDEV_PROPERTIES_ARRAY(_dev, _array) \
+ do { \
+ for (int i = 0; i < ARRAY_SIZE(_array); i++) { \
+ qdev_property_add_static(_dev, &_array[i]); \
+ } \
+ } while (0)
+
#ifndef CONFIG_USER_ONLY
static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name)
{
@@ -1944,21 +1951,10 @@ static void riscv_cpu_add_user_properties(Object *obj)
riscv_cpu_add_misa_properties(obj);
- for (int i = 0; i < ARRAY_SIZE(riscv_cpu_extensions); i++) {
- qdev_property_add_static(dev, &riscv_cpu_extensions[i]);
- }
-
- 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_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
- [PATCH for-8.2 v5 00/11] riscv: add 'max' CPU, deprecate 'any', Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 01/11] target/riscv/cpu.c: split CPU options from riscv_cpu_extensions[], Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 02/11] target/riscv/cpu.c: skip 'bool' check when filtering KVM props, Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 03/11] target/riscv/cpu.c: split kvm prop handling to its own helper, Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 04/11] target/riscv/cpu.c: del DEFINE_PROP_END_OF_LIST() from riscv_cpu_extensions, Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 06/11] target/riscv/cpu.c: split non-ratified exts from riscv_cpu_extensions[], Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 07/11] target/riscv/cpu.c: add ADD_CPU_QDEV_PROPERTIES_ARRAY() macro,
Daniel Henrique Barboza <=
- [PATCH for-8.2 v5 05/11] target/riscv/cpu.c: split vendor exts from riscv_cpu_extensions[], Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 08/11] target/riscv/cpu.c: add ADD_UNAVAIL_KVM_PROP_ARRAY() macro, Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 11/11] target/riscv: deprecate the 'any' CPU type, Daniel Henrique Barboza, 2023/07/20
- [PATCH for-8.2 v5 09/11] target/riscv: add 'max' CPU type, Daniel Henrique Barboza, 2023/07/20
[PATCH for-8.2 v5 10/11] avocado, risc-v: add opensbi tests for 'max' CPU, Daniel Henrique Barboza, 2023/07/20