On Fri, Dec 10, 2021 at 3:38 PM Yifei Jiang <jiangyifei@xxxxxxxxxx> wrote:
>
> Add virtual time context description to vmstate_kvmtimer. After cpu being
> loaded, virtual time context is updated to KVM.
>
> Signed-off-by: Yifei Jiang <jiangyifei@xxxxxxxxxx>
> Signed-off-by: Mingwang Li <limingwang@xxxxxxxxxx>
> ---
> target/riscv/machine.c | 37 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 35 insertions(+), 2 deletions(-)
>
> diff --git a/target/riscv/machine.c b/target/riscv/machine.c
> index ad8248ebfd..f46443c316 100644
> --- a/target/riscv/machine.c
> +++ b/target/riscv/machine.c
> @@ -164,10 +164,42 @@ static const VMStateDescription vmstate_pointermasking = {
> }
> };
>
> +static bool kvmtimer_needed(void *opaque)
> +{
> + return kvm_enabled();
> +}
> +
> +
Remove extra newline from here.
> +static const VMStateDescription vmstate_kvmtimer = {
> + .name = "cpu/kvmtimer",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = kvmtimer_needed,
> + .fields = (VMStateField[]) {
> + VMSTATE_UINT64(env.kvm_timer_time, RISCVCPU),
> + VMSTATE_UINT64(env.kvm_timer_compare, RISCVCPU),
> + VMSTATE_UINT64(env.kvm_timer_state, RISCVCPU),
> +
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> +static int cpu_post_load(void *opaque, int version_id)
> +{
> + RISCVCPU *cpu = opaque;
> + CPURISCVState *env = &cpu->env;
> +
> + if (kvm_enabled()) {
> + env->kvm_timer_dirty = true;
> + }
> + return 0;
> +}
> +
> const VMStateDescription vmstate_riscv_cpu = {
> .name = "cpu",
> - .version_id = 3,
> - .minimum_version_id = 3,
> + .version_id = 4,
> + .minimum_version_id = 4,
> + .post_load = cpu_post_load,
> .fields = (VMStateField[]) {
> VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32),
> VMSTATE_UINT64_ARRAY(env.fpr, RISCVCPU, 32),
> @@ -218,6 +250,7 @@ const VMStateDescription vmstate_riscv_cpu = {
> &vmstate_hyper,
> &vmstate_vector,
> &vmstate_pointermasking,
> + &vmstate_kvmtimer,
> NULL
> }
> };
> --
> 2.19.1
>
>
> --
> kvm-riscv mailing list
> kvm-riscv@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/kvm-riscv
Otherwise, it looks good to me.
Reviewed-by: Anup Patel <anup.patel@xxxxxxx>
Regards,
Anup
