Message ID | 20230824221440.484675-8-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:27PM -0300, Daniel Henrique Barboza wrote: > The code inside riscv_cpu_add_user_properties() became quite repetitive > after recent changes. Add a helper to hide the repetition away. > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > 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 668522db01..4608fa2378 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -1946,6 +1946,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v, > } > #endif > > +static void riscv_cpu_add_qdev_prop_array(DeviceState *dev, Property *array) > +{ > + for (Property *prop = array; prop && prop->name; prop++) { Here checking prop first is a good idea, as a caller could pass NULL for 'array'. But, if we don't want callers to ever pass NULL for array, then dropping the prop check will ensure we get a segfault to spot the bug (or, a bit cleaner, we could add an explicit assert(array)). > + qdev_property_add_static(dev, prop); > + } > +} > + > #ifndef CONFIG_USER_ONLY > static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) > { > @@ -2002,7 +2009,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 > @@ -2016,21 +2022,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); > - } > + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_extensions); > + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_options); > + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_vendor_exts); > + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_experimental_exts); > } > > static Property riscv_cpu_properties[] = { > -- > 2.41.0 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 668522db01..4608fa2378 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1946,6 +1946,13 @@ static void cpu_set_cfg_unavailable(Object *obj, Visitor *v, } #endif +static void riscv_cpu_add_qdev_prop_array(DeviceState *dev, Property *array) +{ + for (Property *prop = array; prop && prop->name; prop++) { + qdev_property_add_static(dev, prop); + } +} + #ifndef CONFIG_USER_ONLY static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) { @@ -2002,7 +2009,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 @@ -2016,21 +2022,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); - } + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_extensions); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_options); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_vendor_exts); + riscv_cpu_add_qdev_prop_array(dev, riscv_cpu_experimental_exts); } static Property riscv_cpu_properties[] = {
The code inside riscv_cpu_add_user_properties() became quite repetitive after recent changes. Add a helper to hide the repetition away. Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- target/riscv/cpu.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)