From patchwork Wed Oct 14 11:18:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1713B7B68 for ; Wed, 14 Oct 2009 22:21:07 +1100 (EST) Received: from localhost ([127.0.0.1]:45490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1ui-0006s3-PR for incoming@patchwork.ozlabs.org; Wed, 14 Oct 2009 07:21:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1My1sY-0006Ob-6I for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1My1sT-0006NN-NE for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:49 -0400 Received: from [199.232.76.173] (port=60193 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1My1sT-0006NI-Dn for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43298) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1My1sS-0003Ds-UP for qemu-devel@nongnu.org; Wed, 14 Oct 2009 07:18:45 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBIiIf013293 for ; Wed, 14 Oct 2009 07:18:44 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9EBIfsg019196; Wed, 14 Oct 2009 07:18:43 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 14 Oct 2009 13:18:13 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/4] mc145818rtc: fix saving of rtc-td hack properly upgrading the version number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/mc146818rtc.c | 47 +++++++++++++---------------------------------- 1 files changed, 13 insertions(+), 34 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index e6e6cbf..f076667 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -76,11 +76,9 @@ struct RTCState { int64_t next_periodic_time; /* second update */ int64_t next_second_time; -#ifdef TARGET_I386 uint32_t irq_coalesced; uint32_t period; QEMUTimer *coalesced_timer; -#endif QEMUTimer *second_timer; QEMUTimer *second_timer2; }; @@ -524,13 +522,15 @@ static void rtc_save(QEMUFile *f, void *opaque) qemu_put_be64(f, s->next_second_time); qemu_put_timer(f, s->second_timer); qemu_put_timer(f, s->second_timer2); + qemu_put_be32(f, s->irq_coalesced); + qemu_put_be32(f, s->period); } static int rtc_load(QEMUFile *f, void *opaque, int version_id) { RTCState *s = opaque; - if (version_id != 1) + if (version_id < 1 || version_id > 2) return -EINVAL; qemu_get_buffer(f, s->cmos_data, 128); @@ -550,31 +550,18 @@ static int rtc_load(QEMUFile *f, void *opaque, int version_id) s->next_second_time=qemu_get_be64(f); qemu_get_timer(f, s->second_timer); qemu_get_timer(f, s->second_timer2); - return 0; -} + if (version_id >= 2) { + s->irq_coalesced = qemu_get_be32(f); + s->period = qemu_get_be32(f); #ifdef TARGET_I386 -static void rtc_save_td(QEMUFile *f, void *opaque) -{ - RTCState *s = opaque; - - qemu_put_be32(f, s->irq_coalesced); - qemu_put_be32(f, s->period); -} - -static int rtc_load_td(QEMUFile *f, void *opaque, int version_id) -{ - RTCState *s = opaque; - - if (version_id != 1) - return -EINVAL; - - s->irq_coalesced = qemu_get_be32(f); - s->period = qemu_get_be32(f); - rtc_coalesced_timer_update(s); + if (rtc_td_hack) { + rtc_coalesced_timer_update(s); + } +#endif + } return 0; } -#endif static void rtc_reset(void *opaque) { @@ -622,11 +609,7 @@ static int rtc_initfn(ISADevice *dev) register_ioport_write(base, 2, 1, cmos_ioport_write, s); register_ioport_read(base, 2, 1, cmos_ioport_read, s); - register_savevm("mc146818rtc", base, 1, rtc_save, rtc_load, s); -#ifdef TARGET_I386 - if (rtc_td_hack) - register_savevm("mc146818rtc-td", base, 1, rtc_save_td, rtc_load_td, s); -#endif + register_savevm("mc146818rtc", base, 2, rtc_save, rtc_load, s); qemu_register_reset(rtc_reset, s); return 0; } @@ -758,11 +741,7 @@ RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, io_memory = cpu_register_io_memory(rtc_mm_read, rtc_mm_write, s); cpu_register_physical_memory(base, 2 << it_shift, io_memory); - register_savevm("mc146818rtc", base, 1, rtc_save, rtc_load, s); -#ifdef TARGET_I386 - if (rtc_td_hack) - register_savevm("mc146818rtc-td", base, 1, rtc_save_td, rtc_load_td, s); -#endif + register_savevm("mc146818rtc", base, 2, rtc_save, rtc_load, s); qemu_register_reset(rtc_reset, s); return s; }