target/riscv: Implement virtual time adjusting with vm state changing

We hope that virtual time adjusts with vm state changing. When a vm
is stopped, guest virtual time should stop counting and kvm_timer
should be stopped. When the vm is resumed, guest virtual time should
continue to count and kvm_timer should be restored.

Signed-off-by: Yifei Jiang <jiangyifei@huawei.com>
Signed-off-by: Mingwang Li <limingwang@huawei.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20220112081329.1835-12-jiangyifei@huawei.com
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Yifei Jiang 2022-01-12 16:13:27 +08:00 committed by Alistair Francis
parent 27abe66f31
commit 9ad3e016ae

View File

@ -41,6 +41,7 @@
#include "sbi_ecall_interface.h" #include "sbi_ecall_interface.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "sysemu/runstate.h"
static uint64_t kvm_riscv_reg_id(CPURISCVState *env, uint64_t type, static uint64_t kvm_riscv_reg_id(CPURISCVState *env, uint64_t type,
uint64_t idx) uint64_t idx)
@ -378,6 +379,18 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu)
return cpu->cpu_index; return cpu->cpu_index;
} }
static void kvm_riscv_vm_state_change(void *opaque, bool running,
RunState state)
{
CPUState *cs = opaque;
if (running) {
kvm_riscv_put_regs_timer(cs);
} else {
kvm_riscv_get_regs_timer(cs);
}
}
void kvm_arch_init_irq_routing(KVMState *s) void kvm_arch_init_irq_routing(KVMState *s)
{ {
} }
@ -390,6 +403,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
CPURISCVState *env = &cpu->env; CPURISCVState *env = &cpu->env;
uint64_t id; uint64_t id;
qemu_add_vm_change_state_handler(kvm_riscv_vm_state_change, cs);
id = kvm_riscv_reg_id(env, KVM_REG_RISCV_CONFIG, id = kvm_riscv_reg_id(env, KVM_REG_RISCV_CONFIG,
KVM_REG_RISCV_CONFIG_REG(isa)); KVM_REG_RISCV_CONFIG_REG(isa));
ret = kvm_get_one_reg(cs, id, &isa); ret = kvm_get_one_reg(cs, id, &isa);