From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeub-0002FV-Fm for qemu-devel@nongnu.org; Tue, 25 Oct 2011 07:11:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIeuY-0003Yz-SB for qemu-devel@nongnu.org; Tue, 25 Oct 2011 07:11:16 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:61972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeuY-0003Vg-N2 for qemu-devel@nongnu.org; Tue, 25 Oct 2011 07:11:14 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so407688wyh.4 for ; Tue, 25 Oct 2011 04:11:14 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 25 Oct 2011 13:09:39 +0200 Message-Id: <1319540983-4248-2-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1319540983-4248-1-git-send-email-benoit.canet@gmail.com> References: <1319540983-4248-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH 1/5] pl181: add vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , quintela@redhat.com Signed-off-by: Benoit Canet --- hw/pl181.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/hw/pl181.c b/hw/pl181.c index 0943c09..06c8bd2 100644 --- a/hw/pl181.c +++ b/hw/pl181.c @@ -37,20 +37,45 @@ typedef struct { uint32_t datacnt; uint32_t status; uint32_t mask[2]; - int fifo_pos; - int fifo_len; + int32_t fifo_pos; + int32_t fifo_len; /* The linux 2.6.21 driver is buggy, and misbehaves if new data arrives while it is reading the FIFO. We hack around this be defering subsequent transfers until after the driver polls the status word. http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=4446/1 */ - int linux_hack; + int32_t linux_hack; uint32_t fifo[PL181_FIFO_LEN]; qemu_irq irq[2]; /* GPIO outputs for 'card is readonly' and 'card inserted' */ qemu_irq cardstatus[2]; } pl181_state; +static const VMStateDescription vmstate_pl181 = { + .name = "pl181", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(clock, pl181_state), + VMSTATE_UINT32(power, pl181_state), + VMSTATE_UINT32(cmdarg, pl181_state), + VMSTATE_UINT32(cmd, pl181_state), + VMSTATE_UINT32(datatimer, pl181_state), + VMSTATE_UINT32(datalength, pl181_state), + VMSTATE_UINT32(respcmd, pl181_state), + VMSTATE_UINT32_ARRAY(response, pl181_state, 4), + VMSTATE_UINT32(datactrl, pl181_state), + VMSTATE_UINT32(datacnt, pl181_state), + VMSTATE_UINT32(status, pl181_state), + VMSTATE_UINT32_ARRAY(mask, pl181_state, 2), + VMSTATE_INT32(fifo_pos, pl181_state), + VMSTATE_INT32(fifo_len, pl181_state), + VMSTATE_INT32(linux_hack, pl181_state), + VMSTATE_UINT32_ARRAY(fifo, pl181_state, PL181_FIFO_LEN), + VMSTATE_END_OF_LIST() + } +}; + #define PL181_CMD_INDEX 0x3f #define PL181_CMD_RESPONSE (1 << 6) #define PL181_CMD_LONGRESP (1 << 7) @@ -471,9 +496,16 @@ static int pl181_init(SysBusDevice *dev) return 0; } +static SysBusDeviceInfo pl181_info = { + .init = pl181_init, + .qdev.name = "pl181", + .qdev.size = sizeof(pl181_state), + .qdev.vmsd = &vmstate_pl181, +}; + static void pl181_register_devices(void) { - sysbus_register_dev("pl181", sizeof(pl181_state), pl181_init); + sysbus_register_withprop(&pl181_info); } device_init(pl181_register_devices) -- 1.7.5.4