[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] ac97: up savevm version and remove active fro
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 09/10] ac97: up savevm version and remove active from state |
Date: |
Wed, 28 Oct 2009 13:29:30 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/ac97.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/hw/ac97.c b/hw/ac97.c
index b1a6395..8064fc3 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1170,7 +1170,6 @@ static void po_callback (void *opaque, int free)
static void ac97_save (QEMUFile *f, void *opaque)
{
size_t i;
- uint8_t active[LAST_INDEX];
AC97LinkState *s = opaque;
pci_device_save (&s->dev, f);
@@ -1193,11 +1192,6 @@ static void ac97_save (QEMUFile *f, void *opaque)
qemu_put_be32s (f, &r->bd.ctl_len);
}
qemu_put_buffer (f, s->mixer_data, sizeof (s->mixer_data));
-
- active[PI_INDEX] = AUD_is_active_in (s->voice_pi) ? 1 : 0;
- active[PO_INDEX] = AUD_is_active_out (s->voice_po) ? 1 : 0;
- active[MC_INDEX] = AUD_is_active_in (s->voice_mc) ? 1 : 0;
- qemu_put_buffer (f, active, sizeof (active));
}
static int ac97_load (QEMUFile *f, void *opaque, int version_id)
@@ -1207,7 +1201,7 @@ static int ac97_load (QEMUFile *f, void *opaque, int
version_id)
uint8_t active[LAST_INDEX];
AC97LinkState *s = opaque;
- if (version_id != 2)
+ if (version_id < 2 || version_id > 3)
return -EINVAL;
ret = pci_device_load (&s->dev, f);
@@ -1232,7 +1226,8 @@ static int ac97_load (QEMUFile *f, void *opaque, int
version_id)
qemu_get_be32s (f, &r->bd.ctl_len);
}
qemu_get_buffer (f, s->mixer_data, sizeof (s->mixer_data));
- qemu_get_buffer (f, active, sizeof (active));
+ if (version_id < 3)
+ qemu_get_buffer (f, active, sizeof (active));
#ifdef USE_MIXER
record_select (s, mixer_load (s, AC97_Record_Select));
@@ -1336,7 +1331,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);
+ register_savevm ("ac97", 0, 3, ac97_save, ac97_load, s);
qemu_register_reset (ac97_on_reset, s);
AUD_register_card ("ac97", &s->card);
ac97_on_reset (s);
--
1.6.2.5
[Qemu-devel] [PATCH 08/10] ac97: recalculate active after loadvm, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 09/10] ac97: up savevm version and remove active from state,
Juan Quintela <=
[Qemu-devel] [PATCH 10/10] ac97: port to vmstate, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 03/10] sb16: port to vmstate, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 05/10] c4231a: port to vmstate, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 02/10] audio: port to vmstate, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 01/10] audio: fix compilation of DEBUG_PLIVE, Juan Quintela, 2009/10/28
[Qemu-devel] [PATCH 04/10] es1370: port to vmstate, Juan Quintela, 2009/10/28