From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMyLb-0004E2-KB for qemu-devel@nongnu.org; Thu, 28 Aug 2014 07:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMyLW-0002Wa-Md for qemu-devel@nongnu.org; Thu, 28 Aug 2014 07:58:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMyLW-0002WW-Dy for qemu-devel@nongnu.org; Thu, 28 Aug 2014 07:58:30 -0400 Message-ID: <53FF195A.9000303@redhat.com> Date: Thu, 28 Aug 2014 13:58:18 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20140828111822.1624.24556.stgit@PASHA-ISP> <20140828111908.1624.62637.stgit@PASHA-ISP> In-Reply-To: <20140828111908.1624.62637.stgit@PASHA-ISP> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 08/12] hpet: fixing saving and loading process List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , qemu-devel@nongnu.org Cc: zealot351@gmail.com, maria.klimushenkova@ispras.ru Il 28/08/2014 13:19, 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 > --- > 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, > This also breaks migration to 2.1, unless you use -no-hpet. Paolo