From patchwork Fri Mar 22 15:49:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15553 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9600A23DEE for ; Fri, 22 Mar 2013 15:49:13 +0000 (UTC) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by fiordland.canonical.com (Postfix) with ESMTP id 5CD35A182AF for ; Fri, 22 Mar 2013 15:49:13 +0000 (UTC) Received: by mail-la0-f48.google.com with SMTP id fq13so7619433lab.35 for ; Fri, 22 Mar 2013 08:49:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=paZt6PkhpCb6O5OyvscjbGjg2uP9SlvtF3usndB5NGY=; b=bPsWun5cwYOKcygMhLaQ7NfPtU+YCncbZ2l7SHJ0X6qcekmQny50SEOQzf0Jvryg9T heDmKhemTRrrdCbIc2NFbXxCq9WCiImKU2/UWx/P+5vpQRIt6iDOyjexIwcHdrGomnIk MU3YUDS8bLjNKw3p+i1IuXWe036dqLNrMM+78v9PCwYoRx6OfONMdSrl3mfYQ2vmm51I TvitcsSjlLM3ky8rmVGZCp+BkAd6LbFzs13iuexApt5rMQpaAAgrJ9y3DCcn9cEsSCck mkkbhe631Uc631ZF5s1WBNlCgA69VfgLzZdQ8qWg6bf3lAqmIMjzBDMc5GeAdajixK4O sVPQ== X-Received: by 10.152.114.164 with SMTP id jh4mr1262259lab.1.1363967352812; Fri, 22 Mar 2013 08:49:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.112.91.146 with SMTP id ce18csp115053lbb; Fri, 22 Mar 2013 08:49:12 -0700 (PDT) X-Received: by 10.194.176.165 with SMTP id cj5mr4006344wjc.37.1363967351817; Fri, 22 Mar 2013 08:49:11 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id g10si1135657wjn.215.2013.03.22.08.49.11 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 Mar 2013 08:49:11 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UJ4DN-0000nX-09; Fri, 22 Mar 2013 15:49:09 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Peter Crosthwaite Subject: [PATCH] hw/arm_mptimer: Save the timer state Date: Fri, 22 Mar 2013 15:49:08 +0000 Message-Id: <1363967348-3044-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkFSuTpzOrvVBkDC2DBNxlpO5zJmwtO5MKNjkc0tdVtrw0RYTk7Q/eJuYo3hJVb81dOd5q7 Add a missing VMSTATE_TIMER() entry to the arm_mptimer vmstate description; this omission meant that we would probably hang on reload when the timer failed to fire. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- hw/arm_mptimer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index f59a9f1..317f5e4 100644 --- a/hw/arm_mptimer.c +++ b/hw/arm_mptimer.c @@ -253,14 +253,15 @@ static int arm_mptimer_init(SysBusDevice *dev) static const VMStateDescription vmstate_timerblock = { .name = "arm_mptimer_timerblock", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_UINT32(count, TimerBlock), VMSTATE_UINT32(load, TimerBlock), VMSTATE_UINT32(control, TimerBlock), VMSTATE_UINT32(status, TimerBlock), VMSTATE_INT64(tick, TimerBlock), + VMSTATE_TIMER(timer, TimerBlock), VMSTATE_END_OF_LIST() } };