From patchwork Fri Aug 28 13:28:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32372 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 D5D02B6F31 for ; Sat, 29 Aug 2009 00:21:36 +1000 (EST) Received: from localhost ([127.0.0.1]:50350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh2B0-00058h-MM for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 10:11:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh1Xz-0004tf-14 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh1Xt-0004k0-5u for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:17 -0400 Received: from [199.232.76.173] (port=38621 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh1Xr-0004iI-JF for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9211) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh1Xq-0004rY-QT for qemu-devel@nongnu.org; Fri, 28 Aug 2009 09:31:11 -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 n7SDV9p9007465 for ; Fri, 28 Aug 2009 09:31:10 -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 n7SDUpns030148; Fri, 28 Aug 2009 09:31:08 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 15:28:24 +0200 Message-Id: <0fd079038f4138bc31559c45a750cfdaab6597ea.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 13/16] 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 80296ac..a044883 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); @@ -214,7 +210,7 @@ static int 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); return 0; } @@ -309,18 +305,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 int piix3_initfn(PCIDevice *dev) @@ -329,7 +339,7 @@ static int 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);