Commit 4603ea01 authored by Pavel Dovgalyuk's avatar Pavel Dovgalyuk Committed by Paolo Bonzini
Browse files

cpu: init vmstate for ticks and clock offset 



Ticks and clock offset used by CPU timers have to be saved in vmstate.
But vmstate for these fields registered only in icount mode.
Missing registration leads to breaking the continuity when vmstate is loaded.
This patch introduces new initialization function which fixes this.

Signed-off-by: default avatarPavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a6dead43

cpus.c

+6 −2
Original line number Diff line number Diff line
@@ -493,13 +493,17 @@ static const VMStateDescription vmstate_timers = { 
    }

};



void cpu_ticks_init(void)

{

    seqlock_init(&timers_state.vm_clock_seqlock, NULL);

    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);

}



void configure_icount(QemuOpts *opts, Error **errp)

{

    const char *option;

    char *rem_str = NULL;



    seqlock_init(&timers_state.vm_clock_seqlock, NULL);

    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);

    option = qemu_opt_get(opts, "shift");

    if (!option) {

        if (qemu_opt_get(opts, "align") != NULL) {

include/qemu-common.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static inline char *realpath(const char *path, char *resolved_path) 
}

#endif



void cpu_ticks_init(void);



/* icount */

void configure_icount(QemuOpts *opts, Error **errp);

extern int use_icount;

vl.c

+1 −0
Original line number Diff line number Diff line
@@ -4334,6 +4334,7 @@ int main(int argc, char **argv, char **envp) 
    qemu_spice_init();

#endif



    cpu_ticks_init();

    if (icount_opts) {

        if (kvm_enabled() || xen_enabled()) {

            fprintf(stderr, "-icount is not allowed with kvm or xen\n");