From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBhS8-0002rq-TC for qemu-devel@nongnu.org; Mon, 28 Jul 2014 05:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XBhS3-0004hV-82 for qemu-devel@nongnu.org; Mon, 28 Jul 2014 05:42:44 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:62686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XBhS3-0004fY-1f for qemu-devel@nongnu.org; Mon, 28 Jul 2014 05:42:39 -0400 Received: by mail-wi0-f170.google.com with SMTP id f8so3982983wiw.3 for ; Mon, 28 Jul 2014 02:42:38 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <53D61B05.6090507@redhat.com> Date: Mon, 28 Jul 2014 11:42:29 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20140717110153.8352.80175.stgit@PASHA-ISP> <20140717110306.8352.29898.stgit@PASHA-ISP> In-Reply-To: <20140717110306.8352.29898.stgit@PASHA-ISP> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH v2 12/49] mc146818rtc: add missed field to vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, fred.konrad@greensocs.com Il 17/07/2014 13:03, Pavel Dovgalyuk ha scritto: > This patch adds irq_reinject_on_ack_count field to VMState to allow correct > saving/loading the state of MC146818 RTC. > > Signed-off-by: Pavel Dovgalyuk > --- > hw/timer/mc146818rtc.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index 9d817ca..c204abb 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -735,7 +735,7 @@ static int rtc_post_load(void *opaque, int version_id) > > static const VMStateDescription vmstate_rtc = { > .name = "mc146818rtc", > - .version_id = 3, > + .version_id = 4, > .minimum_version_id = 1, > .post_load = rtc_post_load, > .fields = (VMStateField[]) { > @@ -752,6 +752,7 @@ static const VMStateDescription vmstate_rtc = { > VMSTATE_INT64_V(offset, RTCState, 3), > VMSTATE_TIMER_V(update_timer, RTCState, 3), > VMSTATE_UINT64_V(next_alarm_time, RTCState, 3), > + VMSTATE_UINT16_V(irq_reinject_on_ack_count, RTCState, 4), Also can be a subsection, migrated only if nonzero. Paolo > VMSTATE_END_OF_LIST() > } > }; > > >