From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsAqr-0005jU-AQ for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsAqq-0001cL-45 for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:29 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:35758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsAqq-0001cF-04 for qemu-devel@nongnu.org; Fri, 20 Jul 2012 06:54:28 -0400 Received: by ggnp1 with SMTP id p1so3901791ggn.4 for ; Fri, 20 Jul 2012 03:54:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 20 Jul 2012 12:53:53 +0200 Message-Id: <1342781633-7288-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1342781633-7288-1-git-send-email-pbonzini@redhat.com> References: <1342781633-7288-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 7/7] RTC: Allow to migrate from old QEMU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Zhang, Yang Z" , Juan Quintela From: "Zhang, Yang Z" The new logic is compatible with old, and it should not block migration from old QEMU. However, the new version cannot migrate to the old one. Cc: Juan Quintela Signed-off-by: Yang Zhang Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index f0b75cb..d3871d8 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -697,11 +697,47 @@ static int rtc_post_load(void *opaque, int version_id) return 0; } +static int rtc_load_old(QEMUFile *f, void *opaque, int version_id) +{ + RTCState *s = opaque; + uint8_t buf[77]; + + if (version_id > 2) { + return -EINVAL; + } + + qemu_get_buffer(f, s->cmos_data, sizeof(s->cmos_data)); + qemu_get_8s(f, &s->cmos_index); + + /* Skip loading of s->current_tm, we already have the + * information in cmos_data. + */ + qemu_get_buffer(f, buf, 7*4); + + qemu_get_timer(f, s->periodic_timer); + s->next_periodic_time = qemu_get_be64(f); + + /* Skip loading of next_second_time, second_timer, second_timer2. */ + qemu_get_buffer(f, buf, 3*8); + + rtc_set_time(s); + s->offset = 0; + check_update_timer(s); + + if (version_id >= 2) { + s->irq_coalesced = qemu_get_be32(f); + s->period = qemu_get_be32(f); + } + + return rtc_post_load(opaque, version_id); +} + static const VMStateDescription vmstate_rtc = { .name = "mc146818rtc", - .version_id = 2, - .minimum_version_id = 1, + .version_id = 3, + .minimum_version_id = 3, .minimum_version_id_old = 1, + .load_state_old = rtc_load_old, .post_load = rtc_post_load, .fields = (VMStateField []) { VMSTATE_BUFFER(cmos_data, RTCState), @@ -837,7 +873,7 @@ static int rtc_initfn(ISADevice *dev) memory_region_init_io(&s->io, &cmos_ops, s, "rtc", 2); isa_register_ioport(dev, &s->io, base); - qdev_set_legacy_instance_id(&dev->qdev, base, 2); + qdev_set_legacy_instance_id(&dev->qdev, base, 3); qemu_register_reset(rtc_reset, s); object_property_add(OBJECT(s), "date", "struct tm", -- 1.7.10.2