| Message ID | 20230825130853.511782-14-dbarboza@ventanamicro.com |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: split TCG/KVM accelerators from cpu.c | expand |
On Fri, Aug 25, 2023 at 10:08:46AM -0300, Daniel Henrique Barboza wrote: > The function is doing way more than just init user properties. We would > also like to use the 'user_extension_properties' class property, as the > TCG driver is already using, to decide whether KVM should expose user > properties or not. > > Rename kvm_riscv_init_user_properties() to riscv_init_kvm_registers() > and leave only the essential, non-optional KVM init functions there. All > functions that deals with property handling is now gated via > rcc->user_extension_properties. > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > target/riscv/kvm/kvm-cpu.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c > index 3c4fa43cee..85e8b0a927 100644 > --- a/target/riscv/kvm/kvm-cpu.c > +++ b/target/riscv/kvm/kvm-cpu.c > @@ -792,7 +792,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) > } > } > > -static void riscv_init_user_properties(Object *cpu_obj) > +static void riscv_init_kvm_registers(Object *cpu_obj) > { > RISCVCPU *cpu = RISCV_CPU(cpu_obj); > KVMScratchCPU kvmcpu; > @@ -801,7 +801,6 @@ static void riscv_init_user_properties(Object *cpu_obj) > return; > } > > - kvm_riscv_add_cpu_user_properties(cpu_obj); > kvm_riscv_init_machine_ids(cpu, &kvmcpu); > kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu); > kvm_riscv_init_multiext_cfg(cpu, &kvmcpu); > @@ -1295,16 +1294,20 @@ DEFINE_TYPES(riscv_kvm_cpu_type_infos) > static void kvm_cpu_instance_init(CPUState *cs) > { > Object *obj = OBJECT(RISCV_CPU(cs)); > + RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(obj); > DeviceState *dev = DEVICE(obj); > > - riscv_init_user_properties(obj); > + riscv_init_kvm_registers(obj); > > - riscv_add_satp_mode_properties(obj); > - riscv_cpu_add_misa_properties(obj); > + if (rcc->user_extension_properties) { > + kvm_riscv_add_cpu_user_properties(obj); > + riscv_add_satp_mode_properties(obj); > + riscv_cpu_add_misa_properties(obj); > > - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); > - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); > - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); > + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); > + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); > + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); > + } > > for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { > /* Check if we have a specific KVM handler for the option */ > -- > 2.41.0 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 3c4fa43cee..85e8b0a927 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -792,7 +792,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) } } -static void riscv_init_user_properties(Object *cpu_obj) +static void riscv_init_kvm_registers(Object *cpu_obj) { RISCVCPU *cpu = RISCV_CPU(cpu_obj); KVMScratchCPU kvmcpu; @@ -801,7 +801,6 @@ static void riscv_init_user_properties(Object *cpu_obj) return; } - kvm_riscv_add_cpu_user_properties(cpu_obj); kvm_riscv_init_machine_ids(cpu, &kvmcpu); kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu); kvm_riscv_init_multiext_cfg(cpu, &kvmcpu); @@ -1295,16 +1294,20 @@ DEFINE_TYPES(riscv_kvm_cpu_type_infos) static void kvm_cpu_instance_init(CPUState *cs) { Object *obj = OBJECT(RISCV_CPU(cs)); + RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(obj); DeviceState *dev = DEVICE(obj); - riscv_init_user_properties(obj); + riscv_init_kvm_registers(obj); - riscv_add_satp_mode_properties(obj); - riscv_cpu_add_misa_properties(obj); + if (rcc->user_extension_properties) { + kvm_riscv_add_cpu_user_properties(obj); + riscv_add_satp_mode_properties(obj); + riscv_cpu_add_misa_properties(obj); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); + } for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { /* Check if we have a specific KVM handler for the option */
The function is doing way more than just init user properties. We would also like to use the 'user_extension_properties' class property, as the TCG driver is already using, to decide whether KVM should expose user properties or not. Rename kvm_riscv_init_user_properties() to riscv_init_kvm_registers() and leave only the essential, non-optional KVM init functions there. All functions that deals with property handling is now gated via rcc->user_extension_properties. Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- target/riscv/kvm/kvm-cpu.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)