From patchwork Thu Feb 24 17:57:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84418 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 770E8B70FB for ; Fri, 25 Feb 2011 05:04:40 +1100 (EST) Received: from localhost ([127.0.0.1]:42406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsfTv-00078w-Sa for incoming@patchwork.ozlabs.org; Thu, 24 Feb 2011 13:00:03 -0500 Received: from [140.186.70.92] (port=43559 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsfT9-00078d-Q6 for qemu-devel@nongnu.org; Thu, 24 Feb 2011 12:59:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PsfT8-0005Xa-P7 for qemu-devel@nongnu.org; Thu, 24 Feb 2011 12:59:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PsfT8-0005XV-FN for qemu-devel@nongnu.org; Thu, 24 Feb 2011 12:59:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1OHxDaJ002598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Feb 2011 12:59:13 -0500 Received: from trasno.mitica (ovpn-113-97.phx2.redhat.com [10.3.113.97]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1OHw0k6014622; Thu, 24 Feb 2011 12:59:12 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 24 Feb 2011 18:57:53 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 56/58] vmstate: port piix4 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/piix4.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/piix4.c b/hw/piix4.c index 40cd91a..71f1f84 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -72,19 +72,16 @@ static void piix4_reset(void *opaque) pci_conf[0xae] = 0x00; } -static void piix_save(QEMUFile* f, void *opaque) -{ - PIIX4State *d = opaque; - pci_device_save(&d->dev, f); -} - -static int piix_load(QEMUFile* f, void *opaque, int version_id) -{ - PIIX4State *d = opaque; - if (version_id != 2) - return -EINVAL; - return pci_device_load(&d->dev, f); -} +static const VMStateDescription vmstate_piix4 = { + .name = "PIIX4", + .version_id = 2, + .minimum_version_id = 2, + .minimum_version_id_old = 2, + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(dev, PIIX4State), + VMSTATE_END_OF_LIST() + } +}; static int piix4_initfn(PCIDevice *dev) { @@ -92,7 +89,6 @@ static int piix4_initfn(PCIDevice *dev) uint8_t *pci_conf; isa_bus_new(&d->dev.qdev); - register_savevm(&d->dev.qdev, "PIIX4", 0, 2, piix_save, piix_load, d); pci_conf = d->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); @@ -117,6 +113,7 @@ static PCIDeviceInfo piix4_info[] = { .qdev.name = "PIIX4", .qdev.desc = "ISA bridge", .qdev.size = sizeof(PIIX4State), + .qdev.vmsd = &vmstate_piix4, .qdev.no_user = 1, .no_hotplug = 1, .init = piix4_initfn,