From patchwork Tue Aug 26 07:15:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 382995 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 B1E781400D7 for ; Tue, 26 Aug 2014 17:23:51 +1000 (EST) Received: from localhost ([::1]:52270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMB6b-0000Rk-OH for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 03:23:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyg-0003Ig-Qe for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAya-0005cS-Fs for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:38 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyZ-0005cN-U8 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:32 -0400 Received: from [10.10.150.50] (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id 4EA6D540151; Tue, 26 Aug 2014 11:15:31 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Tue, 26 Aug 2014 11:15:31 +0400 Message-ID: <20140826071530.1672.16865.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 11/12] mc146818rtc: add missed field to vmstate 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 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 | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 233fc70..6ba360a 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -698,6 +698,13 @@ int rtc_get_memory(ISADevice *dev, int addr) return s->cmos_data[addr]; } +static int rtc_pre_load(void *opaque) +{ + RTCState *s = (RTCState *)opaque; + s->irq_reinject_on_ack_count = 0; + return 0; +} + static void rtc_set_date_from_host(ISADevice *dev) { RTCState *s = MC146818_RTC(dev); @@ -733,10 +740,27 @@ 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, .minimum_version_id = 1, + .pre_load = rtc_pre_load, .post_load = rtc_post_load, .fields = (VMStateField[]) { VMSTATE_BUFFER(cmos_data, RTCState), @@ -753,6 +777,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 */ + } } };