Re: [PATCH v3 13/16] target/riscv: remove riscv_cpu_options[]

[Alistair Francis]

On Thu, Jan 4, 2024 at 3:45 AM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> The array is empty and can be removed.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/riscv/cpu.c         | 5 -----
>  target/riscv/cpu.h         | 1 -
>  target/riscv/kvm/kvm-cpu.c | 9 ---------
>  target/riscv/tcg/tcg-cpu.c | 4 ----
>  4 files changed, 19 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 1e35b73e40..0d0197a8ef 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1894,11 +1894,6 @@ static const PropertyInfo prop_cboz_blksize = {
>      .set = prop_cboz_blksize_set,
>  };
>
> -Property riscv_cpu_options[] = {
> -
> -    DEFINE_PROP_END_OF_LIST(),
> -};
> -
>  static Property riscv_cpu_properties[] = {
>      DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true),
>
> diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
> index 484c32e607..59e23708d1 100644
> --- a/target/riscv/cpu.h
> +++ b/target/riscv/cpu.h
> @@ -773,7 +773,6 @@ extern const RISCVCPUMultiExtConfig 
> riscv_cpu_extensions[];
>  extern const RISCVCPUMultiExtConfig riscv_cpu_vendor_exts[];
>  extern const RISCVCPUMultiExtConfig riscv_cpu_experimental_exts[];
>  extern const RISCVCPUMultiExtConfig riscv_cpu_deprecated_exts[];
> -extern Property riscv_cpu_options[];
>
>  typedef struct isa_ext_data {
>      const char *name;
> diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
> index 137a8ab2bb..5800abc9c6 100644
> --- a/target/riscv/kvm/kvm-cpu.c
> +++ b/target/riscv/kvm/kvm-cpu.c
> @@ -1443,19 +1443,10 @@ void kvm_riscv_aia_create(MachineState *machine, 
> uint64_t group_shift,
>  static void kvm_cpu_instance_init(CPUState *cs)
>  {
>      Object *obj = OBJECT(RISCV_CPU(cs));
> -    DeviceState *dev = DEVICE(obj);
>
>      riscv_init_kvm_registers(obj);
>
>      kvm_riscv_add_cpu_user_properties(obj);
> -
> -    for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) {
> -        /* Check if we have a specific KVM handler for the option */
> -        if (object_property_find(obj, prop->name)) {
> -            continue;
> -        }
> -        qdev_property_add_static(dev, prop);
> -    }
>  }
>
>  void riscv_kvm_cpu_finalize_features(RISCVCPU *cpu, Error **errp)
> diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
> index 84064ef7e0..d3eeedc758 100644
> --- a/target/riscv/tcg/tcg-cpu.c
> +++ b/target/riscv/tcg/tcg-cpu.c
> @@ -889,10 +889,6 @@ static void riscv_cpu_add_user_properties(Object *obj)
>      riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_experimental_exts);
>
>      riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_deprecated_exts);
> -
> -    for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) {
> -        qdev_property_add_static(DEVICE(obj), prop);
> -    }
>  }
>
>  /*
> --
> 2.43.0
>
>