From patchwork Wed Aug 1 16:41:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 174530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A26352C0094 for ; Thu, 2 Aug 2012 02:43:39 +1000 (EST) Received: from localhost ([::1]:34417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc1J-0007RF-Ov for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 12:43:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc0R-0005w8-GC for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Swc0Q-0004wl-BV for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:43 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:53521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swc0Q-0004rt-6z for qemu-devel@nongnu.org; Wed, 01 Aug 2012 12:42:42 -0400 Received: by mail-gh0-f173.google.com with SMTP id r14so7252103ghr.4 for ; Wed, 01 Aug 2012 09:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=N0bULOCBH90WayIDOI0PX+R1l0M4rAMM1Y9g+w83llY=; b=I2ZJxiu3FooPbKjzU/+zxwfGMNjuqa5hqmZIUMv9ZULeyr042yfkvYHQQCLZKfbTcd y2/l0aM5F5H25eJpsd1ac/rcv3PFKPg4hVzSqEH1bzUdaVpLJ6dqQbgU7wXtr1BL2u/v 2nPNOe1lh7P66gJOqCrv3qAjcRMNapy0R2KaSj6IjHZ8WsAP2npd7BBqYNCnnrourOl1 3qh/a3s/vRpxSh3Wn+QrVVF08RQDdYC4277yj8xIkvOEFWxsDMrh9ERbuDzgqPZtVtrh wJ69rHQjZhBqy8kTo+ONN6rbIxxLPJ3P0NO1BjpU7m3vqTpScZlwJmwXQ/qL3xA2u1JH zDJg== Received: by 10.66.74.97 with SMTP id s1mr41155156pav.11.1343839361593; Wed, 01 Aug 2012 09:42:41 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id ru10sm2892956pbc.50.2012.08.01.09.42.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 09:42:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 1 Aug 2012 18:41:52 +0200 Message-Id: <1343839312-24030-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343839312-24030-1-git-send-email-pbonzini@redhat.com> References: <1343839312-24030-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.173 Cc: yang.z.zhang@intel.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 10/10] RTC: Allow to migrate from old QEMU 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 From: Yang Zhang 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 | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 57a481a..0d7c6f4 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); + + /* We used to store a struct tm, but 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 = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, + .minimum_version_id_old = 1, + .load_state_old = rtc_load_old, .post_load = rtc_post_load, .fields = (VMStateField []) { VMSTATE_BUFFER(cmos_data, RTCState), @@ -825,7 +861,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",