| Message ID | 20140826071441.1672.17434.stgit@PASHA-ISP |
|---|---|
| State | New |
| Headers | show |
Il 26/08/2014 09:14, 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 | 18 ++++++++++++++++-- > 1 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c > index 1d81bbe..8b22dbf 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); > @@ -175,6 +187,8 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) > ISADevice *isadev = ISA_DEVICE(dev); > PCSpkState *s = PC_SPEAKER(dev); > > + vmstate_register(NULL, 0, &vmstate_spk, s); > + > isa_register_ioport(isadev, &s->ioport, s->iobase); > > pcspk_state = s; > > > I think you should use dc->vmsd. Paolo
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 1d81bbe..8b22dbf 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); @@ -175,6 +187,8 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) ISADevice *isadev = ISA_DEVICE(dev); PCSpkState *s = PC_SPEAKER(dev); + vmstate_register(NULL, 0, &vmstate_spk, s); + isa_register_ioport(isadev, &s->ioport, s->iobase); pcspk_state = s;
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 | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-)