From patchwork Mon Aug 24 16:42:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31963 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 6191BB7B63 for ; Tue, 25 Aug 2009 03:07:31 +1000 (EST) Received: from localhost ([127.0.0.1]:42557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfd0x-0000E2-4H for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2009 13:07:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfcfm-0000p2-8e for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfcff-0000fY-U5 for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:32 -0400 Received: from [199.232.76.173] (port=33804 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfcff-0000fG-9L for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35135) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfcfe-00032g-MU for qemu-devel@nongnu.org; Mon, 24 Aug 2009 12:45:27 -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 n7OGjP3j018304 for ; Mon, 24 Aug 2009 12:45:25 -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 n7OGjKTt024317; Mon, 24 Aug 2009 12:45:24 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2009 18:42:37 +0200 Message-Id: <06aa59ddf55102747ecd892cba83847b4adfcc69.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 03/26] eepro100: Remove unused indirection of PCIDevice 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 Once there, there is no way that we don't have a PCI Device at save/load time. Remove the check Signed-off-by: Juan Quintela --- hw/eepro100.c | 57 +++++++++++++++++++++++---------------------------------- 1 files changed, 23 insertions(+), 34 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 1776975..bdc8353 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -181,6 +181,7 @@ typedef enum { } ru_state_t; typedef struct { + PCIDevice dev; #if 1 uint8_t cmd; uint32_t start; @@ -200,7 +201,6 @@ typedef struct { uint8_t curpag; uint8_t mult[8]; /* multicast mask array */ int mmio_index; - PCIDevice *pci_dev; VLANClientState *vc; #endif uint8_t scb_stat; /* SCB stat/ack byte */ @@ -304,7 +304,7 @@ static void disable_interrupt(EEPRO100State * s) { if (s->int_stat) { logout("interrupt disabled\n"); - qemu_irq_lower(s->pci_dev->irq[0]); + qemu_irq_lower(s->dev.irq[0]); s->int_stat = 0; } } @@ -313,7 +313,7 @@ static void enable_interrupt(EEPRO100State * s) { if (!s->int_stat) { logout("interrupt enabled\n"); - qemu_irq_raise(s->pci_dev->irq[0]); + qemu_irq_raise(s->dev.irq[0]); s->int_stat = 1; } } @@ -392,7 +392,7 @@ static void eepro100_fcp_interrupt(EEPRO100State * s) static void pci_reset(EEPRO100State * s) { uint32_t device = s->device; - uint8_t *pci_conf = s->pci_dev->config; + uint8_t *pci_conf = s->dev.config; logout("%p\n", s); @@ -1338,16 +1338,10 @@ static void ioport_write4(void *opaque, uint32_t addr, uint32_t val) /***********************************************************/ /* PCI EEPRO100 definitions */ -typedef struct PCIEEPRO100State { - PCIDevice dev; - EEPRO100State eepro100; -} PCIEEPRO100State; - static void pci_map(PCIDevice * pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - PCIEEPRO100State *d = DO_UPCAST(PCIEEPRO100State, dev, pci_dev); - EEPRO100State *s = &d->eepro100; + EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", region_num, addr, size, type); @@ -1420,15 +1414,15 @@ static CPUReadMemoryFunc *pci_mmio_read[] = { static void pci_mmio_map(PCIDevice * pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - PCIEEPRO100State *d = DO_UPCAST(PCIEEPRO100State, dev, pci_dev); + EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); logout("region %d, addr=0x%08x, size=0x%08x, type=%d\n", region_num, addr, size, type); if (region_num == 0) { /* Map control / status registers. */ - cpu_register_physical_memory(addr, size, d->eepro100.mmio_index); - d->eepro100.region[region_num] = addr; + cpu_register_physical_memory(addr, size, s->mmio_index); + s->region[region_num] = addr; } } @@ -1551,8 +1545,8 @@ static int nic_load(QEMUFile * f, void *opaque, int version_id) if (version_id > 3) return -EINVAL; - if (s->pci_dev && version_id >= 3) { - ret = pci_device_load(s->pci_dev, f); + if (version_id >= 3) { + ret = pci_device_load(&s->dev, f); if (ret < 0) return ret; } @@ -1637,8 +1631,7 @@ static void nic_save(QEMUFile * f, void *opaque) EEPRO100State *s = opaque; int i; - if (s->pci_dev) - pci_device_save(s->pci_dev, f); + pci_device_save(&s->dev, f); qemu_put_8s(f, &s->rxcr); @@ -1720,8 +1713,7 @@ static void nic_cleanup(VLANClientState *vc) static int pci_nic_uninit(PCIDevice *dev) { - PCIEEPRO100State *d = DO_UPCAST(PCIEEPRO100State, dev, dev); - EEPRO100State *s = &d->eepro100; + EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, dev); cpu_unregister_io_memory(s->mmio_index); @@ -1730,16 +1722,13 @@ static int pci_nic_uninit(PCIDevice *dev) static void nic_init(PCIDevice *pci_dev, uint32_t device) { - PCIEEPRO100State *d = DO_UPCAST(PCIEEPRO100State, dev, pci_dev); - EEPRO100State *s; + EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); logout("\n"); - d->dev.unregister = pci_nic_uninit; + s->dev.unregister = pci_nic_uninit; - s = &d->eepro100; s->device = device; - s->pci_dev = &d->dev; pci_reset(s); @@ -1748,24 +1737,24 @@ static void nic_init(PCIDevice *pci_dev, uint32_t device) s->eeprom = eeprom93xx_new(EEPROM_SIZE); /* Handler for memory-mapped I/O */ - d->eepro100.mmio_index = + s->mmio_index = cpu_register_io_memory(pci_mmio_read, pci_mmio_write, s); - pci_register_bar(&d->dev, 0, PCI_MEM_SIZE, + pci_register_bar(&s->dev, 0, PCI_MEM_SIZE, PCI_ADDRESS_SPACE_MEM | PCI_ADDRESS_SPACE_MEM_PREFETCH, pci_mmio_map); - pci_register_bar(&d->dev, 1, PCI_IO_SIZE, PCI_ADDRESS_SPACE_IO, + pci_register_bar(&s->dev, 1, PCI_IO_SIZE, PCI_ADDRESS_SPACE_IO, pci_map); - pci_register_bar(&d->dev, 2, PCI_FLASH_SIZE, PCI_ADDRESS_SPACE_MEM, + pci_register_bar(&s->dev, 2, PCI_FLASH_SIZE, PCI_ADDRESS_SPACE_MEM, pci_mmio_map); - qdev_get_macaddr(&d->dev.qdev, s->macaddr); + qdev_get_macaddr(&s->dev.qdev, s->macaddr); logout("macaddr: %s\n", nic_dump(&s->macaddr[0], 6)); assert(s->region[1] == 0); nic_reset(s); - s->vc = qdev_get_vlan_client(&d->dev.qdev, + s->vc = qdev_get_vlan_client(&s->dev.qdev, nic_can_receive, nic_receive, NULL, nic_cleanup, s); @@ -1794,15 +1783,15 @@ static void pci_i82559er_init(PCIDevice *dev) static PCIDeviceInfo eepro100_info[] = { { .qdev.name = "i82551", - .qdev.size = sizeof(PCIEEPRO100State), + .qdev.size = sizeof(EEPRO100State), .init = pci_i82551_init, },{ .qdev.name = "i82557b", - .qdev.size = sizeof(PCIEEPRO100State), + .qdev.size = sizeof(EEPRO100State), .init = pci_i82557b_init, },{ .qdev.name = "i82559er", - .qdev.size = sizeof(PCIEEPRO100State), + .qdev.size = sizeof(EEPRO100State), .init = pci_i82559er_init, },{ /* end of list */