On Sat, Apr 26, 2025 at 2:05 AM Daniel Henrique Barboza
<dbarb...@ventanamicro.com> wrote:
>
> Remove an unused 'KVMScratchCPU' pointer argument in
> kvm_riscv_check_sbi_dbcn_support().
>
> Put kvm_riscv_reset_regs_csr() after kvm_riscv_put_regs_csr(). This will
> make a future patch diff easier to read, when changes in
> kvm_riscv_reset_regs_csr() and kvm_riscv_get_regs_csr() will be made.
>
> Fixes: a6b53378f5 ("target/riscv/kvm: implement SBI debug console (DBCN)
> calls")
> 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/kvm/kvm-cpu.c | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
> index 9214ce490c..accad4c28e 100644
> --- a/target/riscv/kvm/kvm-cpu.c
> +++ b/target/riscv/kvm/kvm-cpu.c
> @@ -613,19 +613,6 @@ static int kvm_riscv_put_regs_core(CPUState *cs)
> return ret;
> }
>
> -static void kvm_riscv_reset_regs_csr(CPURISCVState *env)
> -{
> - env->mstatus = 0;
> - env->mie = 0;
> - env->stvec = 0;
> - env->sscratch = 0;
> - env->sepc = 0;
> - env->scause = 0;
> - env->stval = 0;
> - env->mip = 0;
> - env->satp = 0;
> -}
> -
> static int kvm_riscv_get_regs_csr(CPUState *cs)
> {
> CPURISCVState *env = &RISCV_CPU(cs)->env;
> @@ -660,6 +647,19 @@ static int kvm_riscv_put_regs_csr(CPUState *cs)
> return 0;
> }
>
> +static void kvm_riscv_reset_regs_csr(CPURISCVState *env)
> +{
> + env->mstatus = 0;
> + env->mie = 0;
> + env->stvec = 0;
> + env->sscratch = 0;
> + env->sepc = 0;
> + env->scause = 0;
> + env->stval = 0;
> + env->mip = 0;
> + env->satp = 0;
> +}
> +
> static int kvm_riscv_get_regs_fp(CPUState *cs)
> {
> int ret = 0;
> @@ -1078,7 +1078,6 @@ static int uint64_cmp(const void *a, const void *b)
> }
>
> static void kvm_riscv_check_sbi_dbcn_support(RISCVCPU *cpu,
> - KVMScratchCPU *kvmcpu,
> struct kvm_reg_list *reglist)
> {
> struct kvm_reg_list *reg_search;
> @@ -1197,7 +1196,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu,
> KVMScratchCPU *kvmcpu)
> kvm_riscv_read_vlenb(cpu, kvmcpu, reglist);
> }
>
> - kvm_riscv_check_sbi_dbcn_support(cpu, kvmcpu, reglist);
> + kvm_riscv_check_sbi_dbcn_support(cpu, reglist);
> }
>
> static void riscv_init_kvm_registers(Object *cpu_obj)
> --
> 2.49.0
>
>
