> -----Original Message----- > From: Richard Henderson [mailto:richard.henderson@xxxxxxxxxx] > Sent: Monday, December 13, 2021 11:22 PM > To: Jiangyifei <jiangyifei@xxxxxxxxxx>; qemu-devel@xxxxxxxxxx; > qemu-riscv@xxxxxxxxxx > Cc: kvm-riscv@xxxxxxxxxxxxxxxxxxx; kvm@xxxxxxxxxxxxxxx; > libvir-list@xxxxxxxxxx; anup.patel@xxxxxxx; palmer@xxxxxxxxxxx; > Alistair.Francis@xxxxxxx; bin.meng@xxxxxxxxxxxxx; Fanliang (EulerOS) > <fanliang@xxxxxxxxxx>; Wubin (H) <wu.wubin@xxxxxxxxxx>; Wanghaibin (D) > <wanghaibin.wang@xxxxxxxxxx>; wanbo (G) <wanbo13@xxxxxxxxxx>; > limingwang (A) <limingwang@xxxxxxxxxx> > Subject: Re: [PATCH v2 12/12] target/riscv: Support virtual time context > synchronization > > On 12/10/21 2:07 AM, Yifei Jiang via wrote: > > +static bool kvmtimer_needed(void *opaque) { > > + return kvm_enabled(); > > +} > > + > > + > > +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; > > +} > > This post-load belongs on the vmstate_kvmtimer struct, so that you need not > re-check kvm_enabled(). > > > 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, > > No need for version change. > > > r~ Ok, it will be modified in the next series. Yifei
