On Sat, Sep 2, 2023 at 5:50 AM Daniel Henrique Barboza
<dbarb...@ventanamicro.com> 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 <dbarb...@ventanamicro.com>
> Reviewed-by: Andrew Jones <ajo...@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> 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 8e6d316500..8662414906 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1922,6 +1922,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
> @@ -1973,12 +1975,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
> @@ -2009,8 +2011,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
>
>
