From patchwork Tue Aug 26 07:15:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 382993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CFB3514010B for ; Tue, 26 Aug 2014 17:21:57 +1000 (EST) Received: from localhost ([::1]:52246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMB4l-0005a7-Si for incoming@patchwork.ozlabs.org; Tue, 26 Aug 2014 03:21:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAym-0003M0-59 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAyf-0005dC-Nk for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:44 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyf-0005d0-EG for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:37 -0400 Received: from [10.10.150.50] (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id C403A540151; Tue, 26 Aug 2014 11:15:36 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Tue, 26 Aug 2014 11:15:36 +0400 Message-ID: <20140826071536.1672.68759.stgit@PASHA-ISP> In-Reply-To: <20140826071427.1672.48119.stgit@PASHA-ISP> References: <20140826071427.1672.48119.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: pbonzini@redhat.com, zealot351@gmail.com, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru Subject: [Qemu-devel] [PATCH 12/12] pl031: add missed field to vmstate 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 This patch adds timer which uses virtual clock to the VMState. Such timers are required for saving because virtual clock is the part of the virtual machine state. Signed-off-by: Pavel Dovgalyuk --- hw/timer/pl031.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 34d9b44..f8e5abc 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -230,12 +230,13 @@ static int pl031_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_pl031 = { .name = "pl031", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .pre_save = pl031_pre_save, .post_load = pl031_post_load, .fields = (VMStateField[]) { VMSTATE_UINT32(tick_offset_vmstate, PL031State), + VMSTATE_TIMER_V(timer, PL031State, 2), VMSTATE_UINT32(mr, PL031State), VMSTATE_UINT32(lr, PL031State), VMSTATE_UINT32(cr, PL031State),