From patchwork Mon Aug 24 14:16:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31955 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 DA1CAB7B5F for ; Tue, 25 Aug 2009 01:00:26 +1000 (EST) Received: from localhost ([127.0.0.1]:42364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfb1w-0005Ak-Cn for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 11:00:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MfaOe-0007kC-2s for qemu-devel@nongnu.org; Mon, 24 Aug 2009 10:19:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MfaOa-0007cD-Iq for qemu-devel@nongnu.org; Mon, 24 Aug 2009 10:19:43 -0400 Received: from [199.232.76.173] (port=41049 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfaOZ-0007bv-Fi for qemu-devel@nongnu.org; Mon, 24 Aug 2009 10:19:39 -0400 Received: from mx20.gnu.org ([199.232.41.8]:7007) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MfaOY-0000J7-9c for qemu-devel@nongnu.org; Mon, 24 Aug 2009 10:19:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MfaOX-0001KH-LG for qemu-devel@nongnu.org; Mon, 24 Aug 2009 10:19:37 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7OEJajr026974 for ; Mon, 24 Aug 2009 10:19:36 -0400 Received: from localhost.localdomain (vpn1-4-157.ams2.redhat.com [10.36.4.157]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OEJJYI029317; Mon, 24 Aug 2009 10:19:35 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 16:16:58 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-Detected-Operating-System: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH 13/13] Update SaveVM versions 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 Now that we have all fields belonging to a PCIDevice, save each field on the device that it belongs. This means moving pci_irq_levels from PCII440FXState to PIIX3State. Old formats are loaded, but we only save on the new saner format. Signed-off-by: Juan Quintela --- hw/piix_pci.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 580c987..49852e1 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -157,13 +157,9 @@ static void i440fx_write_config(PCIDevice *dev, static void i440fx_save(QEMUFile* f, void *opaque) { PCII440FXState *d = opaque; - int i; pci_device_save(&d->dev, f); qemu_put_8s(f, &d->smm_enabled); - - for (i = 0; i < 4; i++) - qemu_put_be32(f, d->irq_state->piix3->pci_irq_levels[i]); } static int i440fx_load(QEMUFile* f, void *opaque, int version_id) @@ -171,7 +167,7 @@ static int i440fx_load(QEMUFile* f, void *opaque, int version_id) PCII440FXState *d = opaque; int ret, i; - if (version_id > 2) + if (version_id > 3) return -EINVAL; ret = pci_device_load(&d->dev, f); if (ret < 0) @@ -179,7 +175,7 @@ static int i440fx_load(QEMUFile* f, void *opaque, int version_id) i440fx_update_memory_mappings(d); qemu_get_8s(f, &d->smm_enabled); - if (version_id >= 2) + if (version_id == 2) for (i = 0; i < 4; i++) d->irq_state->piix3->pci_irq_levels[i] = qemu_get_be32(f); @@ -213,7 +209,7 @@ static void i440fx_initfn(PCIDevice *dev) d->dev.config[0x72] = 0x02; /* SMRAM */ - register_savevm("I440FX", 0, 2, i440fx_save, i440fx_load, d); + register_savevm("I440FX", 0, 3, i440fx_save, i440fx_load, d); } PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *pic) @@ -307,18 +303,32 @@ static void piix3_reset(void *opaque) memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels)); } -static void piix_save(QEMUFile* f, void *opaque) +static void piix3_save(QEMUFile* f, void *opaque) { - PCIDevice *d = opaque; - pci_device_save(d, f); + 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 piix_load(QEMUFile* f, void *opaque, int version_id) +static int piix3_load(QEMUFile* f, void *opaque, int version_id) { - PCIDevice *d = opaque; - if (version_id != 2) + PIIX3State *d = opaque; + int i, ret; + + if (version_id > 3 || version_id < 2) return -EINVAL; - return pci_device_load(d, f); + 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); + } + return 0; } static void piix3_initfn(PCIDevice *dev) @@ -327,7 +337,7 @@ static void piix3_initfn(PCIDevice *dev) uint8_t *pci_conf; isa_bus_new(&d->dev.qdev); - register_savevm("PIIX3", 0, 2, piix_save, piix_load, d); + register_savevm("PIIX3", 0, 3, piix3_save, piix3_load, d); pci_conf = d->dev.config; pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);