Commit 8210169a78ac3afa779abe763b7ab70517e4e161
1 parent
77599a1f
Do not save dynamic field
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4770 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
4 deletions
hw/gus.c
| @@ -225,7 +225,6 @@ static void GUS_save (QEMUFile *f, void *opaque) | @@ -225,7 +225,6 @@ static void GUS_save (QEMUFile *f, void *opaque) | ||
| 225 | int32_t val; | 225 | int32_t val; |
| 226 | GUSState *s = opaque; | 226 | GUSState *s = opaque; |
| 227 | 227 | ||
| 228 | - val = s->freq; qemu_put_be32s (f, &val); | ||
| 229 | val = s->pos; qemu_put_be32s (f, &val); | 228 | val = s->pos; qemu_put_be32s (f, &val); |
| 230 | val = s->left; qemu_put_be32s (f, &val); | 229 | val = s->left; qemu_put_be32s (f, &val); |
| 231 | val = s->shift; qemu_put_be32s (f, &val); | 230 | val = s->shift; qemu_put_be32s (f, &val); |
| @@ -240,10 +239,9 @@ static int GUS_load (QEMUFile *f, void *opaque, int version_id) | @@ -240,10 +239,9 @@ static int GUS_load (QEMUFile *f, void *opaque, int version_id) | ||
| 240 | int32_t val; | 239 | int32_t val; |
| 241 | GUSState *s = opaque; | 240 | GUSState *s = opaque; |
| 242 | 241 | ||
| 243 | - if (version_id != 1) | 242 | + if (version_id != 2) |
| 244 | return -EINVAL; | 243 | return -EINVAL; |
| 245 | 244 | ||
| 246 | - qemu_get_be32s (f, &val); s->freq = val; | ||
| 247 | qemu_get_be32s (f, &val); s->pos = val; | 245 | qemu_get_be32s (f, &val); s->pos = val; |
| 248 | qemu_get_be32s (f, &val); s->left = val; | 246 | qemu_get_be32s (f, &val); s->left = val; |
| 249 | qemu_get_be32s (f, &val); s->shift = val; | 247 | qemu_get_be32s (f, &val); s->shift = val; |
| @@ -331,6 +329,6 @@ int GUS_init (AudioState *audio, qemu_irq *pic) | @@ -331,6 +329,6 @@ int GUS_init (AudioState *audio, qemu_irq *pic) | ||
| 331 | 329 | ||
| 332 | AUD_set_active_out (s->voice, 1); | 330 | AUD_set_active_out (s->voice, 1); |
| 333 | 331 | ||
| 334 | - register_savevm ("gus", 0, 1, GUS_save, GUS_load, s); | 332 | + register_savevm ("gus", 0, 2, GUS_save, GUS_load, s); |
| 335 | return 0; | 333 | return 0; |
| 336 | } | 334 | } |