From patchwork Wed Dec 2 10:49:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 39984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AAA09B7BDF for ; Wed, 2 Dec 2009 22:02:35 +1100 (EST) Received: from localhost ([127.0.0.1]:47863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFmyd-0002qF-Vo for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 06:02:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFmn6-000511-Rx for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFmn1-0004vk-Bl for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:36 -0500 Received: from [199.232.76.173] (port=33728 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFmn0-0004us-3S for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47222) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFmmz-0005zQ-PV for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:50:30 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2AoSgb016196 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 05:50:28 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2AoMJH016700; Wed, 2 Dec 2009 05:50:27 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 11:49:34 +0100 Message-Id: <706d413d79050bf16337c14f95d84cb168eaf730.1259750689.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 02/10] audio: port to vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- audio/audio.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 80a717b..a5305c4 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1784,23 +1784,15 @@ static void audio_atexit (void) } } -static void audio_save (QEMUFile *f, void *opaque) -{ - (void) f; - (void) opaque; -} - -static int audio_load (QEMUFile *f, void *opaque, int version_id) -{ - (void) f; - (void) opaque; - - if (version_id != 1) { - return -EINVAL; +static const VMStateDescription vmstate_audio = { + .name = "audio", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_END_OF_LIST() } - - return 0; -} +}; static void audio_init (void) { @@ -1900,7 +1892,7 @@ static void audio_init (void) } QLIST_INIT (&s->card_head); - register_savevm ("audio", 0, 1, audio_save, audio_load, s); + vmstate_register (0, &vmstate_audio, s); } void AUD_register_card (const char *name, QEMUSoundCard *card)