From patchwork Mon Aug 24 16:42:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31992 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 2D810B7B5C for ; Tue, 25 Aug 2009 03:51:55 +1000 (EST) Received: from localhost ([127.0.0.1]:52215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfdhu-0005EX-NL for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:51:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MfcgB-0001Qn-Sr for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcg6-0001IM-HO for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:58 -0400 Received: from [199.232.76.173] (port=33831 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcg6-0001Hq-4S for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60598) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcg5-00038T-H8 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:53 -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 n7OGjqqx018924 for ; Mon, 24 Aug 2009 12:45:52 -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 n7OGjKUH024317; Mon, 24 Aug 2009 12:45:51 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:59 +0200 Message-Id: <2d9a6f74f8875982cd5367b560f9086535b78987.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 25/26] pcnet: Add pci_pcnet_{save/load} functions, then remove PCNetState pci_dev 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/pcnet.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index d5be673..6cba99b 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -60,7 +60,6 @@ typedef struct PCNetState_st PCNetState; struct PCNetState_st { - PCIDevice *pci_dev; VLANClientState *vc; uint8_t macaddr[6]; QEMUTimer *poll_timer; @@ -1885,9 +1884,6 @@ static void pcnet_save(QEMUFile *f, void *opaque) PCNetState *s = opaque; unsigned int i; - if (s->pci_dev) - pci_device_save(s->pci_dev, f); - qemu_put_sbe32(f, s->rap); qemu_put_sbe32(f, s->isr); qemu_put_sbe32(f, s->lnkst); @@ -1909,17 +1905,11 @@ static void pcnet_save(QEMUFile *f, void *opaque) static int pcnet_load(QEMUFile *f, void *opaque, int version_id) { PCNetState *s = opaque; - int i, ret; + int i; if (version_id != 2) return -EINVAL; - if (s->pci_dev) { - ret = pci_device_load(s->pci_dev, f); - if (ret < 0) - return ret; - } - qemu_get_sbe32s(f, &s->rap); qemu_get_sbe32s(f, &s->isr); qemu_get_sbe32s(f, &s->lnkst); @@ -1940,6 +1930,29 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id) return 0; } +static void pci_pcnet_save(QEMUFile *f, void *opaque) +{ + PCIPCNetState *s = opaque; + + pci_device_save(&s->pci_dev, f); + pcnet_save(f, &s->state); +} + +static int pci_pcnet_load(QEMUFile *f, void *opaque, int version_id) +{ + PCIPCNetState *s = opaque; + int ret; + + if (version_id != 2) + return -EINVAL; + + ret = pci_device_load(&s->pci_dev, f); + if (ret < 0) + return ret; + + return pcnet_load(f, &s->state, version_id); +} + static void pcnet_common_cleanup(PCNetState *d) { unregister_savevm("pcnet", d); @@ -1958,7 +1971,6 @@ static void pcnet_common_init(DeviceState *dev, PCNetState *s, pcnet_can_receive, pcnet_receive, NULL, cleanup, s); pcnet_h_reset(s); - register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, s); } /* PCI interface */ @@ -2059,9 +2071,9 @@ static void pci_pcnet_init(PCIDevice *pci_dev) s->irq = pci_dev->irq[0]; s->phys_mem_read = pci_physical_memory_read; s->phys_mem_write = pci_physical_memory_write; - s->pci_dev = pci_dev; pcnet_common_init(&pci_dev->qdev, s, pci_pcnet_cleanup); + register_savevm("pcnet", -1, 2, pci_pcnet_save, pci_pcnet_load, d); } /* SPARC32 interface */ @@ -2138,6 +2150,7 @@ static void lance_init(SysBusDevice *dev) s->phys_mem_write = ledma_memory_write; pcnet_common_init(&dev->qdev, s, lance_cleanup); + register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, s); } static SysBusDeviceInfo lance_info = {