| Message ID | 20230720171933.404398-9-dbarboza@ventanamicro.com |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: add 'max' CPU, deprecate 'any' | expand |
On 2023/7/21 01:19, Daniel Henrique Barboza wrote: > Use a macro in riscv_cpu_add_kvm_properties() to eliminate some of its > code repetition, similar to what we're already doing with > ADD_CPU_QDEV_PROPERTIES_ARRAY(). > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn> Weiwei Li > target/riscv/cpu.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 23169a606f..8675839cb4 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -1900,6 +1900,13 @@ static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) > NULL, (void *)prop_name); > } > > +#define ADD_UNAVAIL_KVM_PROP_ARRAY(_obj, _array) \ > + do { \ > + for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ > + riscv_cpu_add_kvm_unavail_prop(_obj, _array[i].name); \ > + } \ > + } while (0) > + > static void riscv_cpu_add_kvm_properties(Object *obj) > { > DeviceState *dev = DEVICE(obj); > @@ -1907,18 +1914,9 @@ static void riscv_cpu_add_kvm_properties(Object *obj) > kvm_riscv_init_user_properties(obj); > riscv_cpu_add_misa_properties(obj); > > - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_extensions); i++) { > - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_extensions[i].name); > - } > - > - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_vendor_exts); i++) { > - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_vendor_exts[i].name); > - } > - > - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_experimental_exts); i++) { > - riscv_cpu_add_kvm_unavail_prop(obj, > - riscv_cpu_experimental_exts[i].name); > - } > + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); > + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_vendor_exts); > + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_experimental_exts); > > for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { > /* Check if KVM created the property already */
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 23169a606f..8675839cb4 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1900,6 +1900,13 @@ static void riscv_cpu_add_kvm_unavail_prop(Object *obj, const char *prop_name) NULL, (void *)prop_name); } +#define ADD_UNAVAIL_KVM_PROP_ARRAY(_obj, _array) \ + do { \ + for (int i = 0; i < ARRAY_SIZE(_array); i++) { \ + riscv_cpu_add_kvm_unavail_prop(_obj, _array[i].name); \ + } \ + } while (0) + static void riscv_cpu_add_kvm_properties(Object *obj) { DeviceState *dev = DEVICE(obj); @@ -1907,18 +1914,9 @@ static void riscv_cpu_add_kvm_properties(Object *obj) kvm_riscv_init_user_properties(obj); riscv_cpu_add_misa_properties(obj); - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_extensions); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_extensions[i].name); - } - - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_vendor_exts); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, riscv_cpu_vendor_exts[i].name); - } - - for (int i = 0; i < ARRAY_SIZE(riscv_cpu_experimental_exts); i++) { - riscv_cpu_add_kvm_unavail_prop(obj, - riscv_cpu_experimental_exts[i].name); - } + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_extensions); + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_vendor_exts); + ADD_UNAVAIL_KVM_PROP_ARRAY(obj, riscv_cpu_experimental_exts); for (int i = 0; i < ARRAY_SIZE(riscv_cpu_options); i++) { /* Check if KVM created the property already */
Use a macro in riscv_cpu_add_kvm_properties() to eliminate some of its code repetition, similar to what we're already doing with ADD_CPU_QDEV_PROPERTIES_ARRAY(). Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- target/riscv/cpu.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)