From patchwork Thu Sep 10 01:04:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id DBD61B7067 for ; Thu, 10 Sep 2009 11:38:42 +1000 (EST) Received: from localhost ([127.0.0.1]:36374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYcR-0006Xc-SJ for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:38:39 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY6C-0004ac-FB for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY67-0004WT-81 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:19 -0400 Received: from [199.232.76.173] (port=48266 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY66-0004WK-Mz for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29441) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY66-0002nX-4A for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:14 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A15DPr021818 for ; Wed, 9 Sep 2009 21:05:13 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14ool020882; Wed, 9 Sep 2009 21:05:12 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:39 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 18/26] vmstate: port dma device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/dma.c | 85 ++++++++++++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 51 deletions(-) diff --git a/hw/dma.c b/hw/dma.c index b95407b..f418e42 100644 --- a/hw/dma.c +++ b/hw/dma.c @@ -500,71 +500,54 @@ static void dma_init2(struct dma_cont *d, int base, int dshift, } } -static void dma_save (QEMUFile *f, void *opaque) -{ - struct dma_cont *d = opaque; - int i; - - /* qemu_put_8s (f, &d->status); */ - qemu_put_8s (f, &d->command); - qemu_put_8s (f, &d->mask); - qemu_put_8s (f, &d->flip_flop); - qemu_put_be32 (f, d->dshift); - - for (i = 0; i < 4; ++i) { - struct dma_regs *r = &d->regs[i]; - qemu_put_be32 (f, r->now[0]); - qemu_put_be32 (f, r->now[1]); - qemu_put_be16s (f, &r->base[0]); - qemu_put_be16s (f, &r->base[1]); - qemu_put_8s (f, &r->mode); - qemu_put_8s (f, &r->page); - qemu_put_8s (f, &r->pageh); - qemu_put_8s (f, &r->dack); - qemu_put_8s (f, &r->eop); +static const VMStateDescription vmstate_dma_regs = { + .name = "dma_regs", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_INT32_ARRAY(now, struct dma_regs, 2), + VMSTATE_UINT16_ARRAY(base, struct dma_regs, 2), + VMSTATE_UINT8(mode, struct dma_regs), + VMSTATE_UINT8(page, struct dma_regs), + VMSTATE_UINT8(pageh, struct dma_regs), + VMSTATE_UINT8(dack, struct dma_regs), + VMSTATE_UINT8(eop, struct dma_regs), + VMSTATE_END_OF_LIST() } -} +}; -static int dma_load (QEMUFile *f, void *opaque, int version_id) +static int dma_post_load(void *opaque) { - struct dma_cont *d = opaque; - int i; - - if (version_id != 1) - return -EINVAL; - - /* qemu_get_8s (f, &d->status); */ - qemu_get_8s (f, &d->command); - qemu_get_8s (f, &d->mask); - qemu_get_8s (f, &d->flip_flop); - d->dshift=qemu_get_be32 (f); - - for (i = 0; i < 4; ++i) { - struct dma_regs *r = &d->regs[i]; - r->now[0]=qemu_get_be32 (f); - r->now[1]=qemu_get_be32 (f); - qemu_get_be16s (f, &r->base[0]); - qemu_get_be16s (f, &r->base[1]); - qemu_get_8s (f, &r->mode); - qemu_get_8s (f, &r->page); - qemu_get_8s (f, &r->pageh); - qemu_get_8s (f, &r->dack); - qemu_get_8s (f, &r->eop); - } - DMA_run(); return 0; } +static const VMStateDescription vmstate_dma = { + .name = "dma", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .post_load = dma_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT8(command, struct dma_cont), + VMSTATE_UINT8(mask, struct dma_cont), + VMSTATE_UINT8(flip_flop, struct dma_cont), + VMSTATE_INT32(dshift, struct dma_cont), + VMSTATE_STRUCT_ARRAY(regs, struct dma_cont, 4, 1, vmstate_dma_regs, struct dma_regs), + VMSTATE_END_OF_LIST() + } +}; + void DMA_init (int high_page_enable) { dma_init2(&dma_controllers[0], 0x00, 0, 0x80, high_page_enable ? 0x480 : -1); dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x488 : -1); - register_savevm ("dma", 0, 1, dma_save, dma_load, &dma_controllers[0]); - register_savevm ("dma", 1, 1, dma_save, dma_load, &dma_controllers[1]); + vmstate_register (0, &vmstate_dma, &dma_controllers[0]); + vmstate_register (1, &vmstate_dma, &dma_controllers[1]); dma_bh = qemu_bh_new(DMA_run_bh, NULL); }