[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore |
Date: |
Tue, 9 Sep 2014 14:30:03 +0200 |
From: Pavel Dovgalyuk <address@hidden>
VMState added by this patch preserves correct
loading of the PC speaker device state.
This breaks migration to 2.1 and earlier.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/audio/pcspk.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 1d81bbe..62dfabe 100644
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -50,8 +50,8 @@ typedef struct {
unsigned int pit_count;
unsigned int samples;
unsigned int play_pos;
- int data_on;
- int dummy_refresh_clock;
+ uint8_t data_on;
+ uint8_t dummy_refresh_clock;
} PCSpkState;
static const char *s_spk = "pcspk";
@@ -163,6 +163,17 @@ static const MemoryRegionOps pcspk_io_ops = {
},
};
+static const VMStateDescription vmstate_spk = {
+ .name = "pcspk",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT8(data_on, PCSpkState),
+ VMSTATE_UINT8(dummy_refresh_clock, PCSpkState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void pcspk_initfn(Object *obj)
{
PCSpkState *s = PC_SPEAKER(obj);
@@ -192,6 +203,7 @@ static void pcspk_class_initfn(ObjectClass *klass, void
*data)
dc->realize = pcspk_realizefn;
set_bit(DEVICE_CATEGORY_SOUND, dc->categories);
+ dc->vmsd = &vmstate_spk;
dc->props = pcspk_properties;
/* Reason: pointer property "pit", realize sets global pcspk_state */
dc->cannot_instantiate_with_device_add_yet = true;
--
2.1.0
- [Qemu-devel] [PATCH 02/10] apic_common: vapic_paddr synchronization fix, (continued)
- [Qemu-devel] [PATCH 02/10] apic_common: vapic_paddr synchronization fix, Paolo Bonzini, 2014/09/09
- [Qemu-devel] [PATCH 03/10] cpu: init vmstate for ticks and clock offset, Paolo Bonzini, 2014/09/09
- [Qemu-devel] [PATCH 01/10] vl: use QLIST_FOREACH_SAFE to visit change state handlers, Paolo Bonzini, 2014/09/09
- [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Juan Quintela, 2014/09/09
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2014/09/09
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Michael S. Tsirkin, 2014/09/10
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2014/09/10
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Michael S. Tsirkin, 2014/09/10
- Re: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2014/09/10
[Qemu-devel] [PATCH 06/10] parallel: adding vmstate for save/restore, Paolo Bonzini, 2014/09/09