From patchwork Fri Jul 20 10:53:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172202 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 D6E132C033D for ; Fri, 20 Jul 2012 21:02:07 +1000 (EST) Received: from localhost ([::1]:32814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsArO-0007AU-6m for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 06:55:02 -0400 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) 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=QF6asQTimRIHqNt1UgP3hGaYfEQPzpm875VfiESZJ2k=; b=SktIxrvloIkupq4zMVUnsLLVPVoLzubEu1KcgfTYEGippRTu50MkXspzHkybGnTZP8 syAwPAWKU9omcr2Mu6Tbv4mWhY4KgJy+cJyPGpkFAkz2HHRP7TODEJ12Yk/96rTv1gtx qMOOteLtLEOMrJ5p4Jjq8AnWt4OWELv/YZH2FGZ7Y+xnURGU3mmcq0KoI8I6jUM4VoI4 rmmMAEskTqzlhu6AnJKmKC48bKkkDq9qSrfiPGFeympbhkxTFI4G0IaFKYnwEqLxDhiy iyya7+oH1+7ab/iOU267QIKYLJuwfTnm/DRPzkIgGenICZZ1qi1d0Pe24rP93d/Kfk5k EclQ== Received: by 10.66.79.40 with SMTP id g8mr10585754pax.27.1342781667175; Fri, 20 Jul 2012 03:54:27 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id oi5sm3758710pbb.39.2012.07.20.03.54.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 03:54:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 20 Jul 2012 12:53:53 +0200 Message-Id: <1342781633-7288-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342781633-7288-1-git-send-email-pbonzini@redhat.com> References: <1342781633-7288-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.161.173 Cc: "Zhang, Yang Z" , Juan Quintela Subject: [Qemu-devel] [PATCH 7/7] 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: "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",