From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAxs-00029N-E9 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAxm-0004qd-7d for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:14:48 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAxl-0004qT-W8 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:14:42 -0400 From: Pavel Dovgalyuk Date: Tue, 26 Aug 2014 11:14:41 +0400 Message-ID: <20140826071441.1672.17434.stgit@PASHA-ISP> In-Reply-To: <20140826071427.1672.48119.stgit@PASHA-ISP> References: <20140826071427.1672.48119.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 02/12] pcspk: adding vmstate for save/restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, zealot351@gmail.com, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru VMState added by this patch preserves correct loading of the PC speaker device state. Signed-off-by: Pavel Dovgalyuk --- 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;