From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jS8-00044p-Dx for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7jS2-0003xa-BZ for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:02:20 -0400 Received: from mail.ispras.ru ([83.149.199.45]:47309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jS2-0003x8-4P for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:02:14 -0400 From: Pavel Dovgalyuk Date: Thu, 17 Jul 2014 15:02:16 +0400 Message-ID: <20140717110216.8352.67586.stgit@PASHA-ISP> In-Reply-To: <20140717110153.8352.80175.stgit@PASHA-ISP> References: <20140717110153.8352.80175.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v2 03/49] pcspk: adding vmstate for save/restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, fred.konrad@greensocs.com VMState added by this patch preserves correct loading of the PC speaker device state. Signed-off-by: Pavel Dovgalyuk --- hw/audio/pcspk.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 1d81bbe..2afcffb 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,19 @@ 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_UINT32(play_pos, PCSpkState), + 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 +188,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;