From patchwork Mon Oct 24 21:03:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 121418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 350921007D7 for ; Tue, 25 Oct 2011 08:26:20 +1100 (EST) Received: from localhost ([::1]:55573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRfp-0004XD-Hd for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2011 17:03:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRf2-0003O4-Aw for qemu-devel@nongnu.org; Mon, 24 Oct 2011 17:02:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIRf0-0001L3-Sk for qemu-devel@nongnu.org; Mon, 24 Oct 2011 17:02:20 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:50477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIRf0-0001FN-M6 for qemu-devel@nongnu.org; Mon, 24 Oct 2011 17:02:18 -0400 Received: by mail-ww0-f53.google.com with SMTP id 36so8739277wwi.10 for ; Mon, 24 Oct 2011 14:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=mRqeapSFAVPKYb5jHPDhU8Tz8hLRweNJXPiy+35LRpA=; b=K2Q1I9BiLge+/8AAKjMRI2FJu//V1up9AcCx1zEool5VgiEb3O1PaQinvv3/wylKHO AlnqxSCbvWSYLa89FXTP5HPE4vIPipMOdLnzcoOjB4cSBkdjyXpJEnRG2ZX8yDRR7Q0N LfwZ3xgEqQWdxDA79YtWFYT2FLj13+tJsay2M= Received: by 10.216.136.33 with SMTP id v33mr3642018wei.96.1319490138234; Mon, 24 Oct 2011 14:02:18 -0700 (PDT) Received: from localhost.localdomain ([78.250.84.36]) by mx.google.com with ESMTPS id x40sm34963853wbn.19.2011.10.24.14.02.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Oct 2011 14:02:17 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2011 23:03:41 +0200 Message-Id: <1319490221-5854-17-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319490221-5854-1-git-send-email-benoit.canet@gmail.com> References: <1319490221-5854-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [PATCH 15/15] integratorcp: convert icp_pic 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 Signed-off-by: Benoit Canet --- hw/integratorcp.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 39322cb..0212ed6 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -310,6 +310,19 @@ typedef struct icp_pic_state qemu_irq parent_fiq; } icp_pic_state; +static const VMStateDescription vmstate_icp_pic = { + .name = "pic", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(level, icp_pic_state), + VMSTATE_UINT32(irq_enabled, icp_pic_state), + VMSTATE_UINT32(fiq_enabled, icp_pic_state), + VMSTATE_END_OF_LIST() + } +}; + static void icp_pic_update(icp_pic_state *s) { uint32_t flags; @@ -411,6 +424,7 @@ static int icp_pic_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->parent_fiq); memory_region_init_io(&s->iomem, &icp_pic_ops, s, "icp-pic", 0x00800000); sysbus_init_mmio_region(dev, &s->iomem); + vmstate_register(&dev->qdev, -1, &vmstate_icp_pic, s); return 0; }