From patchwork Wed Dec 2 10:49:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 39992 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 ozlabs.org (Postfix) with ESMTPS id AEB93B7BDE for ; Wed, 2 Dec 2009 22:22:58 +1100 (EST) Received: from localhost ([127.0.0.1]:36356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnIN-0006Iz-OA for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 06:22:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFmnE-000599-WF for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFmnA-00053j-8L for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:43 -0500 Received: from [199.232.76.173] (port=33736 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFmn9-00053P-0H for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33081) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFmn8-000608-KE for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:38 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2AobuL002957 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 05:50:37 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2AoMJP016700; Wed, 2 Dec 2009 05:50:36 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 11:49:42 +0100 Message-Id: <0f879430d330a2eea4cc70ed4c8add13803d0ebb.1259750689.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 10/10] ac97: port to vmstate 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/ac97.c | 101 ++++++++++++++++++++++++++---------------------------------- 1 files changed, 44 insertions(+), 57 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index cc5ec30..f2d2823 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -1167,68 +1167,31 @@ static void po_callback (void *opaque, int free) transfer_audio (opaque, PO_INDEX, free); } -static void ac97_save (QEMUFile *f, void *opaque) -{ - size_t i; - AC97LinkState *s = opaque; - - pci_device_save (&s->dev, f); - - qemu_put_be32s (f, &s->glob_cnt); - qemu_put_be32s (f, &s->glob_sta); - qemu_put_be32s (f, &s->cas); - - for (i = 0; i < ARRAY_SIZE (s->bm_regs); ++i) { - AC97BusMasterRegs *r = &s->bm_regs[i]; - qemu_put_be32s (f, &r->bdbar); - qemu_put_8s (f, &r->civ); - qemu_put_8s (f, &r->lvi); - qemu_put_be16s (f, &r->sr); - qemu_put_be16s (f, &r->picb); - qemu_put_8s (f, &r->piv); - qemu_put_8s (f, &r->cr); - qemu_put_be32s (f, &r->bd_valid); - qemu_put_be32s (f, &r->bd.addr); - qemu_put_be32s (f, &r->bd.ctl_len); +static const VMStateDescription vmstate_ac97_bm_regs = { + .name = "ac97_bm_regs", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT32(bdbar, AC97BusMasterRegs), + VMSTATE_UINT8(civ, AC97BusMasterRegs), + VMSTATE_UINT8(lvi, AC97BusMasterRegs), + VMSTATE_UINT16(sr, AC97BusMasterRegs), + VMSTATE_UINT16(picb, AC97BusMasterRegs), + VMSTATE_UINT8(piv, AC97BusMasterRegs), + VMSTATE_UINT8(cr, AC97BusMasterRegs), + VMSTATE_UINT32(bd_valid, AC97BusMasterRegs), + VMSTATE_UINT32(bd.addr, AC97BusMasterRegs), + VMSTATE_UINT32(bd.ctl_len, AC97BusMasterRegs), + VMSTATE_END_OF_LIST() } - qemu_put_buffer (f, s->mixer_data, sizeof (s->mixer_data)); -} +}; -static int ac97_load (QEMUFile *f, void *opaque, int version_id) +static int ac97_post_load (void *opaque, int version_id) { - int ret; - size_t i; uint8_t active[LAST_INDEX]; AC97LinkState *s = opaque; - if (version_id < 2 || version_id > 3) - return -EINVAL; - - ret = pci_device_load (&s->dev, f); - if (ret) - return ret; - - qemu_get_be32s (f, &s->glob_cnt); - qemu_get_be32s (f, &s->glob_sta); - qemu_get_be32s (f, &s->cas); - - for (i = 0; i < ARRAY_SIZE (s->bm_regs); ++i) { - AC97BusMasterRegs *r = &s->bm_regs[i]; - qemu_get_be32s (f, &r->bdbar); - qemu_get_8s (f, &r->civ); - qemu_get_8s (f, &r->lvi); - qemu_get_be16s (f, &r->sr); - qemu_get_be16s (f, &r->picb); - qemu_get_8s (f, &r->piv); - qemu_get_8s (f, &r->cr); - qemu_get_be32s (f, &r->bd_valid); - qemu_get_be32s (f, &r->bd.addr); - qemu_get_be32s (f, &r->bd.ctl_len); - } - qemu_get_buffer (f, s->mixer_data, sizeof (s->mixer_data)); - if (version_id < 3) - qemu_get_buffer (f, active, sizeof (active)); - #ifdef USE_MIXER record_select (s, mixer_load (s, AC97_Record_Select)); #define V_(a, b) set_volume (s, a, b, mixer_load (s, a)) @@ -1247,6 +1210,30 @@ static int ac97_load (QEMUFile *f, void *opaque, int version_id) return 0; } +static bool is_version_2 (void *opaque, int version_id) +{ + return version_id == 2; +} + +static const VMStateDescription vmstate_ac97 = { + .name = "ac97", + .version_id = 3, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .post_load = ac97_post_load, + .fields = (VMStateField []) { + VMSTATE_PCI_DEVICE(dev, AC97LinkState), + VMSTATE_UINT32(glob_cnt, AC97LinkState), + VMSTATE_UINT32(glob_sta, AC97LinkState), + VMSTATE_UINT32(cas, AC97LinkState), + VMSTATE_STRUCT_ARRAY(bm_regs, AC97LinkState, 3, 1, + vmstate_ac97_bm_regs, AC97BusMasterRegs), + VMSTATE_BUFFER(mixer_data, AC97LinkState), + VMSTATE_UNUSED_TEST(is_version_2, 3), + VMSTATE_END_OF_LIST() + } +}; + static void ac97_map (PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { @@ -1332,7 +1319,7 @@ static int ac97_initfn (PCIDevice *dev) pci_register_bar (&s->dev, 0, 256 * 4, PCI_BASE_ADDRESS_SPACE_IO, ac97_map); pci_register_bar (&s->dev, 1, 64 * 4, PCI_BASE_ADDRESS_SPACE_IO, ac97_map); - register_savevm ("ac97", 0, 3, ac97_save, ac97_load, s); + vmstate_register (0, &vmstate_ac97, s); qemu_register_reset (ac97_on_reset, s); AUD_register_card ("ac97", &s->card); ac97_on_reset (s);