[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/49] vmstate: port ac97 device
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 28/49] vmstate: port ac97 device |
Date: |
Tue, 29 Sep 2009 22:48:47 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ac97.c | 98 ++++++++++++++++++++++++++----------------------------------
1 files changed, 43 insertions(+), 55 deletions(-)
diff --git a/hw/ac97.c b/hw/ac97.c
index da6cb2d..585db9c 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1167,71 +1167,39 @@ static void po_callback (void *opaque, int free)
transfer_audio (opaque, PO_INDEX, free);
}
-static void ac97_save (QEMUFile *f, void *opaque)
+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()
+ }
+};
+
+static void ac97_pre_save (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);
- }
- qemu_put_buffer (f, s->mixer_data, sizeof (s->mixer_data));
-
s->active[PI_INDEX] = AUD_is_active_in (s->voice_pi) ? 1 : 0;
s->active[PO_INDEX] = AUD_is_active_out (s->voice_po) ? 1 : 0;
s->active[MC_INDEX] = AUD_is_active_in (s->voice_mc) ? 1 : 0;
- qemu_put_buffer (f, s->active, sizeof (s->active));
}
-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;
AC97LinkState *s = opaque;
- if (version_id != 2)
- 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));
- qemu_get_buffer (f, s->active, sizeof (s->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 +1215,26 @@ static int ac97_load (QEMUFile *f, void *opaque, int
version_id)
return 0;
}
+static const VMStateDescription vmstate_ac97 = {
+ .name = "ac97",
+ .version_id = 2,
+ .minimum_version_id = 2,
+ .minimum_version_id_old = 2,
+ .pre_save = ac97_pre_save,
+ .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_BUFFER(active, AC97LinkState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void ac97_map (PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
@@ -1331,7 +1319,7 @@ static int ac97_initfn (PCIDevice *dev)
pci_register_bar (&s->dev, 0, 256 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
pci_register_bar (&s->dev, 1, 64 * 4, PCI_ADDRESS_SPACE_IO, ac97_map);
- register_savevm ("ac97", 0, 2, 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);
--
1.6.2.5
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, (continued)
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Anthony Liguori, 2009/09/30
- [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Juan Quintela, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, Anthony Liguori, 2009/09/30
- Re: [Qemu-devel] Re: [PATCH 27/49] ac97: add active to the state, malc, 2009/09/30
[Qemu-devel] [PATCH 28/49] vmstate: port ac97 device,
Juan Quintela <=
[Qemu-devel] [PATCH 29/49] x86: hflags is not modified at all, just save it directly, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 30/49] x86: make a20_mask int32_t, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 31/49] x86: fpuc is uint16_t not unsigned int, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 32/49] x86: fpus is uint16_t not unsigned int, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 33/49] x86: add fptag_vmstate to the state, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 34/49] x86: add pending_irq_vmstate to the state, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 35/49] x86: add fpregs_format_vmstate, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 36/49] x86: mce_banks always have the same size, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 37/49] x86: send mce_banks as an array, Juan Quintela, 2009/09/29
[Qemu-devel] [PATCH 39/49] x86: split FPReg union, Juan Quintela, 2009/09/29