From patchwork Mon Aug 24 16:42:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31985 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 F0635B7B65 for ; Tue, 25 Aug 2009 03:39:57 +1000 (EST) Received: from localhost ([127.0.0.1]:60107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfdWM-0000nn-IY for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:39:54 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcg3-0001Ex-V5 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcfz-00018g-5U for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:51 -0400 Received: from [199.232.76.173] (port=33824 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcfy-000187-S7 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2191) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcfy-00036t-BV for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:46 -0400 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 n7OGjjSF018334 for ; Mon, 24 Aug 2009 12:45:45 -0400 Received: from localhost.localdomain (vpn1-4-157.ams2.redhat.com [10.36.4.157]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7OGjKUB024317; Mon, 24 Aug 2009 12:45:44 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:53 +0200 Message-Id: <3cb5dafa20850ea5da3f32a1ba7c18bd4127fc68.1251131364.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 19/26] Add pci_ne2000_{save/load} functions, then remove pci_dev NE2000State field 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/ne2000.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/hw/ne2000.c b/hw/ne2000.c index 1c47c84..c983bc5 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -141,7 +141,6 @@ typedef struct NE2000State { uint8_t mult[8]; /* multicast mask array */ qemu_irq irq; int isa_io_base; - PCIDevice *pci_dev; VLANClientState *vc; uint8_t macaddr[6]; uint8_t mem[NE2000_MEM_SIZE]; @@ -653,14 +652,11 @@ static uint32_t ne2000_reset_ioport_read(void *opaque, uint32_t addr) return 0; } -static void ne2000_save(QEMUFile* f,void* opaque) +static void ne2000_save(QEMUFile* f, void* opaque) { NE2000State* s = opaque; uint32_t tmp; - if (s->pci_dev) - pci_device_save(s->pci_dev, f); - qemu_put_8s(f, &s->rxcr); qemu_put_8s(f, &s->cmd); @@ -684,21 +680,14 @@ static void ne2000_save(QEMUFile* f,void* opaque) qemu_put_buffer(f, s->mem, NE2000_MEM_SIZE); } -static int ne2000_load(QEMUFile* f,void* opaque,int version_id) +static int ne2000_load(QEMUFile* f, void* opaque, int version_id) { NE2000State* s = opaque; - int ret; uint32_t tmp; if (version_id > 3) return -EINVAL; - if (s->pci_dev && version_id >= 3) { - ret = pci_device_load(s->pci_dev, f); - if (ret < 0) - return ret; - } - if (version_id >= 2) { qemu_get_8s(f, &s->rxcr); } else { @@ -727,6 +716,31 @@ static int ne2000_load(QEMUFile* f,void* opaque,int version_id) return 0; } +static void pci_ne2000_save(QEMUFile* f, void* opaque) +{ + PCINE2000State* s = opaque; + + pci_device_save(&s->dev, f); + ne2000_save(f, &s->ne2000); +} + +static int pci_ne2000_load(QEMUFile* f, void* opaque, int version_id) +{ + PCINE2000State* s = opaque; + int ret; + + if (version_id > 3) + return -EINVAL; + + if (version_id >= 3) { + ret = pci_device_load(&s->dev, f); + if (ret < 0) + return ret; + } + + return ne2000_load(f, &s->ne2000, version_id); +} + static void isa_ne2000_cleanup(VLANClientState *vc) { NE2000State *s = vc->opaque; @@ -820,7 +834,6 @@ static void pci_ne2000_init(PCIDevice *pci_dev) PCI_ADDRESS_SPACE_IO, ne2000_map); s = &d->ne2000; s->irq = d->dev.irq[0]; - s->pci_dev = pci_dev; qdev_get_macaddr(&d->dev.qdev, s->macaddr); ne2000_reset(s); s->vc = qdev_get_vlan_client(&d->dev.qdev, @@ -829,7 +842,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev) qemu_format_nic_info_str(s->vc, s->macaddr); - register_savevm("ne2000", -1, 3, ne2000_save, ne2000_load, s); + register_savevm("ne2000", -1, 3, pci_ne2000_save, pci_ne2000_load, d); } static PCIDeviceInfo ne2000_info = {