From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRKZJ-0002ST-Ai for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:30:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRKZD-00039D-Es for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:30:45 -0400 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]:44414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRKZD-000391-6I for qemu-devel@nongnu.org; Tue, 09 Sep 2014 08:30:39 -0400 Received: by mail-qa0-f46.google.com with SMTP id w8so15337657qac.19 for ; Tue, 09 Sep 2014 05:30:34 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 9 Sep 2014 14:30:03 +0200 Message-Id: <1410265809-27247-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1410265809-27247-1-git-send-email-pbonzini@redhat.com> References: <1410265809-27247-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 04/10] pcspk: adding vmstate for save/restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com, Pavel.Dovgaluk@ispras.ru, quintela@redhat.com From: Pavel Dovgalyuk 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 Signed-off-by: Paolo Bonzini --- 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