From patchwork Fri Aug 28 13:28:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32376 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 8A129B7BA5 for ; Sat, 29 Aug 2009 00:23:26 +1000 (EST) Received: from localhost ([127.0.0.1]:33382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh2Gd-0003cG-Ff for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 10:17:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh1Y2-00050b-NC for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh1Xv-0004n3-Ch for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:20 -0400 Received: from [199.232.76.173] (port=38624 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh1Xu-0004mo-UE for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39664) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh1Xu-0004se-Ay for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:14 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SDVDjY007478 for ; Fri, 28 Aug 2009 09:31:13 -0400 Received: from localhost.localdomain (vpn2-8-216.ams2.redhat.com [10.36.8.216]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SDUpnv030148; Fri, 28 Aug 2009 09:31:12 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 15:28:27 +0200 Message-Id: <24eb20693e37b07a2d975122393eac98d982e2fe.1251465671.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 16/16] piix3: use new vmstate infrastructure 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 --- hw/piix_pci.c | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 5c33741..ef3463b 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -317,33 +317,17 @@ static void piix3_reset(void *opaque) memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels)); } -static void piix3_save(QEMUFile* f, void *opaque) -{ - PIIX3State *d = opaque; - int i; - - pci_device_save(&d->dev, f); - - for (i = 0; i < 4; i++) - qemu_put_be32(f, d->pci_irq_levels[i]); -} - -static int piix3_load(QEMUFile* f, void *opaque, int version_id) -{ - PIIX3State *d = opaque; - int i, ret; - - if (version_id > 3 || version_id < 2) - return -EINVAL; - ret = pci_device_load(&d->dev, f); - if (ret < 0) - return ret; - if (version_id >= 3) { - for (i = 0; i < 4; i++) - d->pci_irq_levels[i] = qemu_get_be32(f); +static const VMStateDescription vmstate_piix3 = { + .name = "PIIX3", + .version_id = 3, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .fields = (VMStateField []) { + VMSTATE_PCI_DEVICE(dev, PIIX3State), + VMSTATE_INT32_ARRAY_V(pci_irq_levels, PIIX3State, 4, 3), + VMSTATE_END_OF_LIST() } - return 0; -} +}; static int piix3_initfn(PCIDevice *dev) { @@ -351,7 +335,7 @@ static int piix3_initfn(PCIDevice *dev) uint8_t *pci_conf; isa_bus_new(&d->dev.qdev); - register_savevm("PIIX3", 0, 3, piix3_save, piix3_load, d); + vmstate_register(0, &vmstate_piix3, d); pci_conf = d->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);