david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timers: move them to VMState

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-10 03:04:28 +02:00 committed by Anthony Liguori
parent 6f68e33e77
commit 2faf58cd0b
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vl.c
View File

@ -1074,28 +1074,18 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts)
} }
} }
static void timer_save(QEMUFile *f, void *opaque) static const VMStateDescription vmstate_timers = {
{ .name = "timer",
struct TimersState *s = opaque; .version_id = 2,
.minimum_version_id = 1,
qemu_put_be64(f, s->cpu_ticks_offset); .minimum_version_id_old = 1,
qemu_put_be64(f, s->ticks_per_sec); .fields = (VMStateField []) {
qemu_put_be64(f, s->cpu_clock_offset); VMSTATE_INT64(cpu_ticks_offset, TimersState),
} VMSTATE_INT64(ticks_per_sec, TimersState),
VMSTATE_INT64_V(cpu_clock_offset, TimersState, 2),
static int timer_load(QEMUFile *f, void *opaque, int version_id) VMSTATE_END_OF_LIST()
{
struct TimersState *s = opaque;
if (version_id != 1 && version_id != 2)
return -EINVAL;
s->cpu_ticks_offset = qemu_get_be64(f);
s->ticks_per_sec = qemu_get_be64(f);
if (version_id == 2) {
s->cpu_clock_offset = qemu_get_be64(f);
} }
return 0; };
}
static void qemu_event_increment(void); static void qemu_event_increment(void);
@ -5626,7 +5616,7 @@ int main(int argc, char **argv, char **envp)
if (qemu_opts_foreach(&qemu_drive_opts, drive_init_func, machine, 1) != 0) if (qemu_opts_foreach(&qemu_drive_opts, drive_init_func, machine, 1) != 0)
exit(1); exit(1);
register_savevm("timer", 0, 2, timer_save, timer_load, &timers_state); vmstate_register(0, &vmstate_timers ,&timers_state);
register_savevm_live("ram", 0, 3, ram_save_live, NULL, ram_load, NULL); register_savevm_live("ram", 0, 3, ram_save_live, NULL, ram_load, NULL);
/* Maintain compatibility with multiple stdio monitors */ /* Maintain compatibility with multiple stdio monitors */