| Message ID | 20230824221440.484675-5-dbarboza@ventanamicro.com |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: 'max' CPU, detect user choice in TCG | expand |
On Thu, Aug 24, 2023 at 07:14:24PM -0300, Daniel Henrique Barboza wrote: > Add DEFINE_PROP_END_OF_LIST() and eliminate the ARRAY_SIZE() usage when > iterating in the riscv_cpu_options[] array, making it similar to what > we already do when working with riscv_cpu_extensions[]. > > We also have a more sophisticated motivation behind this change. In the > future we might need to export riscv_cpu_options[] to other files, and > ARRAY_LIST() doesn't work properly in that case because the array size > isn't exposed to the header file. Here's a future sight of what we would > deal with: > > ./target/riscv/kvm.c:1057:5: error: nested extern declaration of 'riscv_cpu_add_misa_properties' [-Werror=nested-externs] > n file included from ../target/riscv/kvm.c:19: > home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid application of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' > 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ > | ^ > ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' > 1047 | for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ > | ^~~~~~~~~~ > ./target/riscv/kvm.c:1059:5: note: in expansion of macro 'ADD_UNAVAIL_KVM_PROP_ARRAY' > 1059 | ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid application of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' > 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ > | ^ > ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' > 1047 | for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ > > Homogenize the present and change the future by using > DEFINE_PROP_END_OF_LIST() in riscv_cpu_options[]. > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > target/riscv/cpu.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index a51b946804..272edaadf0 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -1916,6 +1916,8 @@ static Property riscv_cpu_options[] = { > > DEFINE_PROP_UINT16("cbom_blocksize", RISCVCPU, cfg.cbom_blocksize, 64), > DEFINE_PROP_UINT16("cboz_blocksize", RISCVCPU, cfg.cboz_blocksize, 64), > + > + DEFINE_PROP_END_OF_LIST(), > }; > > #ifndef CONFIG_USER_ONLY > @@ -1967,12 +1969,12 @@ static void riscv_cpu_add_kvm_properties(Object *obj) > riscv_cpu_add_kvm_unavail_prop(obj, prop->name); > } > > - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { > + for (prop = riscv_cpu_options; prop && prop->name; prop++) { Checking prop->name is sufficient. > /* Check if KVM created the property already */ > - if (object_property_find(obj, riscv_cpu_options[i].name)) { > + if (object_property_find(obj, prop->name)) { > continue; > } > - qdev_property_add_static(dev, &riscv_cpu_options[i]); > + qdev_property_add_static(dev, prop); > } > } > #endif > @@ -2003,8 +2005,8 @@ 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 (prop = riscv_cpu_options; prop && prop->name; prop++) { > + qdev_property_add_static(dev, prop); > } > } > > -- > 2.41.0 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index a51b946804..272edaadf0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1916,6 +1916,8 @@ static Property riscv_cpu_options[] = { DEFINE_PROP_UINT16("cbom_blocksize", RISCVCPU, cfg.cbom_blocksize, 64), DEFINE_PROP_UINT16("cboz_blocksize", RISCVCPU, cfg.cboz_blocksize, 64), + + DEFINE_PROP_END_OF_LIST(), }; #ifndef CONFIG_USER_ONLY @@ -1967,12 +1969,12 @@ static void riscv_cpu_add_kvm_properties(Object *obj) riscv_cpu_add_kvm_unavail_prop(obj, prop->name); } - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { + for (prop = riscv_cpu_options; prop && prop->name; prop++) { /* Check if KVM created the property already */ - if (object_property_find(obj, riscv_cpu_options[i].name)) { + if (object_property_find(obj, prop->name)) { continue; } - qdev_property_add_static(dev, &riscv_cpu_options[i]); + qdev_property_add_static(dev, prop); } } #endif @@ -2003,8 +2005,8 @@ 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 (prop = riscv_cpu_options; prop && prop->name; prop++) { + qdev_property_add_static(dev, prop); } }
Add DEFINE_PROP_END_OF_LIST() and eliminate the ARRAY_SIZE() usage when iterating in the riscv_cpu_options[] array, making it similar to what we already do when working with riscv_cpu_extensions[]. We also have a more sophisticated motivation behind this change. In the future we might need to export riscv_cpu_options[] to other files, and ARRAY_LIST() doesn't work properly in that case because the array size isn't exposed to the header file. Here's a future sight of what we would deal with: ./target/riscv/kvm.c:1057:5: error: nested extern declaration of 'riscv_cpu_add_misa_properties' [-Werror=nested-externs] n file included from ../target/riscv/kvm.c:19: home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid application of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ | ^ ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' 1047 | for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ | ^~~~~~~~~~ ./target/riscv/kvm.c:1059:5: note: in expansion of macro 'ADD_UNAVAIL_KVM_PROP_ARRAY' 1059 | ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ home/danielhb/work/qemu/include/qemu/osdep.h:473:31: error: invalid application of 'sizeof' to incomplete type 'const RISCVCPUMultiExtConfig[]' 473 | #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])) + \ | ^ ./target/riscv/kvm.c:1047:29: note: in expansion of macro 'ARRAY_SIZE' 1047 | for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ Homogenize the present and change the future by using DEFINE_PROP_END_OF_LIST() in riscv_cpu_options[]. Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- target/riscv/cpu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)