From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jSa-000477-8V for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7jSU-00046V-4T for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:02:48 -0400 Received: from mail.ispras.ru ([83.149.199.45]:47352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jST-00046R-TH for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:02:42 -0400 From: Pavel Dovgalyuk Date: Thu, 17 Jul 2014 15:02:44 +0400 Message-ID: <20140717110244.8352.42701.stgit@PASHA-ISP> In-Reply-To: <20140717110153.8352.80175.stgit@PASHA-ISP> References: <20140717110153.8352.80175.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v2 08/49] hpet: fixing saving and loading process List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, fred.konrad@greensocs.com 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 --- 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), 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,