| Message ID | 20140717110244.8352.42701.stgit@PASHA-ISP |
|---|---|
| State | New |
| Headers | show |
Il 17/07/2014 13:02, Pavel Dovgalyuk ha scritto: > VM clock does not run while saving, so there is no need for saving the ticks > in HPET. Also added saving of hpet_offset field. > > Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> > --- > hw/timer/hpet.c | 13 +------------ > 1 files changed, 1 insertions(+), 12 deletions(-) > > diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c > index e160e8f..73401b9 100644 > --- a/hw/timer/hpet.c > +++ b/hw/timer/hpet.c > @@ -222,14 +222,6 @@ static void update_irq(struct HPETTimer *timer, int set) > } > } > > -static void hpet_pre_save(void *opaque) > -{ > - HPETState *s = opaque; > - > - /* save current counter value */ > - s->hpet_counter = hpet_get_ticks(s); > -} > - > static int hpet_pre_load(void *opaque) > { > HPETState *s = opaque; > @@ -255,9 +247,6 @@ static int hpet_post_load(void *opaque, int version_id) > { > HPETState *s = opaque; > > - /* Recalculate the offset between the main counter and guest time */ > - s->hpet_offset = ticks_to_ns(s->hpet_counter) - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > - > /* Push number of timers into capability returned via HPET_ID */ > s->capability &= ~HPET_ID_NUM_TIM_MASK; > s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT; > @@ -308,13 +297,13 @@ static const VMStateDescription vmstate_hpet = { > .name = "hpet", > .version_id = 2, > .minimum_version_id = 1, > - .pre_save = hpet_pre_save, > .pre_load = hpet_pre_load, > .post_load = hpet_post_load, > .fields = (VMStateField[]) { > VMSTATE_UINT64(config, HPETState), > VMSTATE_UINT64(isr, HPETState), > VMSTATE_UINT64(hpet_counter, HPETState), > + VMSTATE_UINT64(hpet_offset, HPETState), This needs a version bump. Paolo > VMSTATE_UINT8_V(num_timers, HPETState, 2), > VMSTATE_VALIDATE("num_timers in range", hpet_validate_num_timers), > VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0, > > >
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index e160e8f..73401b9 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -222,14 +222,6 @@ static void update_irq(struct HPETTimer *timer, int set) } } -static void hpet_pre_save(void *opaque) -{ - HPETState *s = opaque; - - /* save current counter value */ - s->hpet_counter = hpet_get_ticks(s); -} - static int hpet_pre_load(void *opaque) { HPETState *s = opaque; @@ -255,9 +247,6 @@ static int hpet_post_load(void *opaque, int version_id) { HPETState *s = opaque; - /* Recalculate the offset between the main counter and guest time */ - s->hpet_offset = ticks_to_ns(s->hpet_counter) - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - /* Push number of timers into capability returned via HPET_ID */ s->capability &= ~HPET_ID_NUM_TIM_MASK; s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT; @@ -308,13 +297,13 @@ static const VMStateDescription vmstate_hpet = { .name = "hpet", .version_id = 2, .minimum_version_id = 1, - .pre_save = hpet_pre_save, .pre_load = hpet_pre_load, .post_load = hpet_post_load, .fields = (VMStateField[]) { VMSTATE_UINT64(config, HPETState), VMSTATE_UINT64(isr, HPETState), VMSTATE_UINT64(hpet_counter, HPETState), + VMSTATE_UINT64(hpet_offset, HPETState), VMSTATE_UINT8_V(num_timers, HPETState, 2), VMSTATE_VALIDATE("num_timers in range", hpet_validate_num_timers), VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0,
VM clock does not run while saving, so there is no need for saving the ticks in HPET. Also added saving of hpet_offset field. Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> --- hw/timer/hpet.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)