From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRKZS-0002X0-AT for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:31:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRKZM-0003BC-Ej for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:30:54 -0400 Received: from mail-qg0-x22c.google.com ([2607:f8b0:400d:c04::22c]:45239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRKZM-0003B8-9D for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:30:48 -0400 Received: by mail-qg0-f44.google.com with SMTP id f51so5061977qge.17 for ; Tue, 09 Sep 2014 05:30:47 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 9 Sep 2014 14:30:09 +0200 Message-Id: <1410265809-27247-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1410265809-27247-1-git-send-email-pbonzini@redhat.com> References: <1410265809-27247-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] mc146818rtc: add missed field to vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com, Pavel.Dovgaluk@ispras.ru, quintela@redhat.com From: Pavel Dovgalyuk 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 Signed-off-by: Paolo Bonzini --- hw/timer/mc146818rtc.c | 24 +++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 17912b8..2c4b650 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -733,6 +733,22 @@ static int rtc_post_load(void *opaque, int version_id) return 0; } +static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { + .name = "irq_reinject_on_ack_count", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT16(irq_reinject_on_ack_count, RTCState), + VMSTATE_END_OF_LIST() + } +}; + +static bool rtc_irq_reinject_on_ack_count_needed(void *opaque) +{ + RTCState *s = (RTCState *)opaque; + return s->irq_reinject_on_ack_count != 0; +} + static const VMStateDescription vmstate_rtc = { .name = "mc146818rtc", .version_id = 3, @@ -753,6 +769,14 @@ static const VMStateDescription vmstate_rtc = { VMSTATE_TIMER_V(update_timer, RTCState, 3), VMSTATE_UINT64_V(next_alarm_time, RTCState, 3), VMSTATE_END_OF_LIST() + }, + .subsections = (VMStateSubsection[]) { + { + .vmsd = &vmstate_rtc_irq_reinject_on_ack_count, + .needed = rtc_irq_reinject_on_ack_count_needed, + }, { + /* empty */ + } } }; -- 2.1.0