[email protected] wrote:
> From: KONRAD Frederic <[email protected]>
>
> This fixes a bug where qemu_icount and qemu_icount_bias are not migrated.
> It adds a subsection "timer/icount" to vmstate_timers so icount is migrated
> only
> when needed.
>
> Signed-off-by: KONRAD Frederic <[email protected]>
> Reviewed-by: Amit Shah <[email protected]>
> ---
> cpus.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/cpus.c b/cpus.c
> index 127de1c..8d2ddf0 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -429,6 +429,26 @@ void qemu_clock_warp(QEMUClockType type)
> }
> }
>
> +static bool icount_state_needed(void *opaque)
> +{
> + return use_icount;
> +}
> +
> +/*
> + * This is a subsection for icount migration.
> + */
> +static const VMStateDescription icount_vmstate_timers = {
> + .name = "timer/icount",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
Drop this line, not needed anymore.
> + .fields = (VMStateField[]) {
Remove spaces
> + VMSTATE_INT64(qemu_icount_bias, TimersState),
> + VMSTATE_INT64(qemu_icount, TimersState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> static const VMStateDescription vmstate_timers = {
> .name = "timer",
> .version_id = 2,
> @@ -438,6 +458,14 @@ static const VMStateDescription vmstate_timers = {
> VMSTATE_INT64(dummy, TimersState),
> VMSTATE_INT64_V(cpu_clock_offset, TimersState, 2),
> VMSTATE_END_OF_LIST()
> + },
> + .subsections = (VMStateSubsection[]) {
> + {
> + .vmsd = &icount_vmstate_timers,
> + .needed = icount_state_needed,
> + }, {
> + /* empty */
> + }
> }
> };
Rest is ok.
Thanks, Juan.
