From patchwork Tue Aug 26 07:15:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 382989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DD81C140078 for ; Tue, 26 Aug 2014 17:18:10 +1000 (EST) Received: from localhost ([::1]:52203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMB16-0007Sq-U9 for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 03:18:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyK-0002qF-7y for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAyE-0005Kn-6T for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:16 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyD-0005J8-Mi for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:10 -0400 Received: from [10.10.150.50] (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id 0F263540151; Tue, 26 Aug 2014 11:15:09 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Tue, 26 Aug 2014 11:15:08 +0400 Message-ID: <20140826071508.1672.12055.stgit@PASHA-ISP> In-Reply-To: <20140826071427.1672.48119.stgit@PASHA-ISP> References: <20140826071427.1672.48119.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: pbonzini@redhat.com, zealot351@gmail.com, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru Subject: [Qemu-devel] [PATCH 07/12] hpet: fixing saving and loading process X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index e160e8f..4cdda64 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; @@ -306,15 +295,15 @@ static const VMStateDescription vmstate_hpet_timer = { static const VMStateDescription vmstate_hpet = { .name = "hpet", - .version_id = 2, + .version_id = 3, .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_V(hpet_offset, HPETState, 3), 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,