From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4TuM-00044y-OT for qemu-devel@nongnu.org; Mon, 05 Mar 2012 04:08:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4TuL-0002cK-09 for qemu-devel@nongnu.org; Mon, 05 Mar 2012 04:08:42 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:55886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4TuK-0002b5-Ns for qemu-devel@nongnu.org; Mon, 05 Mar 2012 04:08:40 -0500 Received: by mail-pz0-f46.google.com with SMTP id r28so6111890daj.33 for ; Mon, 05 Mar 2012 01:08:40 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 5 Mar 2012 10:08:14 +0100 Message-Id: <1330938495-30573-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1330938495-30573-1-git-send-email-pbonzini@redhat.com> References: <1330938495-30573-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/5] pl031: rearm alarm timer upon load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Signed-off-by: Paolo Bonzini --- hw/pl031.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/hw/pl031.c b/hw/pl031.c index 69abc4f..713f85d 100644 --- a/hw/pl031.c +++ b/hw/pl031.c @@ -47,21 +47,6 @@ typedef struct { uint32_t is; } pl031_state; -static const VMStateDescription vmstate_pl031 = { - .name = "pl031", - .version_id = 1, - .minimum_version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_UINT32(tick_offset, pl031_state), - VMSTATE_UINT32(mr, pl031_state), - VMSTATE_UINT32(lr, pl031_state), - VMSTATE_UINT32(cr, pl031_state), - VMSTATE_UINT32(im, pl031_state), - VMSTATE_UINT32(is, pl031_state), - VMSTATE_END_OF_LIST() - } -}; - static const unsigned char pl031_id[] = { 0x31, 0x10, 0x14, 0x00, /* Device ID */ 0x0d, 0xf0, 0x05, 0xb1 /* Cell ID */ @@ -213,6 +198,30 @@ static int pl031_init(SysBusDevice *dev) return 0; } +static int pl031_post_load(void *opaque, int version_id) +{ + pl031_state *s = opaque; + + pl031_set_alarm(s); + return 0; +} + +static const VMStateDescription vmstate_pl031 = { + .name = "pl031", + .version_id = 1, + .minimum_version_id = 1, + .post_load = pl031_post_load, + .fields = (VMStateField[]) { + VMSTATE_UINT32(tick_offset, pl031_state), + VMSTATE_UINT32(mr, pl031_state), + VMSTATE_UINT32(lr, pl031_state), + VMSTATE_UINT32(cr, pl031_state), + VMSTATE_UINT32(im, pl031_state), + VMSTATE_UINT32(is, pl031_state), + VMSTATE_END_OF_LIST() + } +}; + static void pl031_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); -- 1.7.7.6