| Message ID | 20140828111835.1624.21791.stgit@PASHA-ISP |
|---|---|
| State | New |
| Headers | show |
Il 28/08/2014 13:18, Pavel Dovgalyuk ha scritto: > VMState added by this patch preserves correct > loading of the PC speaker device state. > > Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> > --- > hw/audio/pcspk.c | 17 +++++++++++++++-- > 1 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c > index 1d81bbe..1d58ef0 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,18 @@ static const MemoryRegionOps pcspk_io_ops = { > }, > }; > > +static const VMStateDescription vmstate_spk = { > + .name = "pcspk", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 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 +204,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; > This breaks migration to 2.1 and earlier. Not a big deal, just a heads up for distributions. Paolo
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 1d81bbe..1d58ef0 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,18 @@ static const MemoryRegionOps pcspk_io_ops = { }, }; +static const VMStateDescription vmstate_spk = { + .name = "pcspk", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 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 +204,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;
VMState added by this patch preserves correct loading of the PC speaker device state. Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> --- hw/audio/pcspk.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-)