From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtFMG-0008Lx-Aw for qemu-devel@nongnu.org; Sun, 30 Jun 2013 06:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtFME-0006k1-VD for qemu-devel@nongnu.org; Sun, 30 Jun 2013 06:59:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47340 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtFME-0006jr-JL for qemu-devel@nongnu.org; Sun, 30 Jun 2013 06:59:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 30 Jun 2013 12:59:43 +0200 Message-Id: <1372589983-13063-1-git-send-email-afaerber@suse.de> In-Reply-To: <4f8a1bb113a1deef05619c27067730c28778fd5b.1372055322.git.peter.crosthwaite@xilinx.com> References: <4f8a1bb113a1deef05619c27067730c28778fd5b.1372055322.git.peter.crosthwaite@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next] net/e1000: QOM parent field cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , mst@redhat.com Rename to parent_obj and fix any remaining fallout. Signed-off-by: Andreas F=C3=A4rber --- hw/net/e1000.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 27c4221..f3838ed 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -85,7 +85,10 @@ enum { }; =20 typedef struct E1000State_st { - PCIDevice dev; + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ + NICState *nic; NICConf conf; MemoryRegion mmio; @@ -245,6 +248,8 @@ static const uint32_t mac_reg_init[] =3D { static void set_interrupt_cause(E1000State *s, int index, uint32_t val) { + PCIDevice *d =3D PCI_DEVICE(s); + if (val && (E1000_DEVID >=3D E1000_DEV_ID_82547EI_MOBILE)) { /* Only for 8257x */ val |=3D E1000_ICR_INT_ASSERTED; @@ -261,7 +266,7 @@ set_interrupt_cause(E1000State *s, int index, uint32_= t val) */ s->mac_reg[ICS] =3D val; =20 - qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) !=3D= 0); + qemu_set_irq(d->irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) !=3D 0); } =20 static void @@ -558,6 +563,7 @@ xmit_seg(E1000State *s) static void process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) { + PCIDevice *d =3D PCI_DEVICE(s); uint32_t txd_lower =3D le32_to_cpu(dp->lower.data); uint32_t dtype =3D txd_lower & (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_= D); unsigned int split_size =3D txd_lower & 0xffff, bytes, sz, op; @@ -616,7 +622,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *= dp) bytes =3D msh - tp->size; =20 bytes =3D MIN(sizeof(tp->data) - tp->size, bytes); - pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes); + pci_dma_read(d, addr, tp->data + tp->size, bytes); if ((sz =3D tp->size + bytes) >=3D hdr && tp->size < hdr) memmove(tp->header, tp->data, hdr); tp->size =3D sz; @@ -632,7 +638,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *= dp) DBGOUT(TXERR, "TCP segmentation error\n"); } else { split_size =3D MIN(sizeof(tp->data) - tp->size, split_size); - pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); + pci_dma_read(d, addr, tp->data + tp->size, split_size); tp->size +=3D split_size; } =20 @@ -650,6 +656,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *= dp) static uint32_t txdesc_writeback(E1000State *s, dma_addr_t base, struct e1000_tx_desc *d= p) { + PCIDevice *d =3D PCI_DEVICE(s); uint32_t txd_upper, txd_lower =3D le32_to_cpu(dp->lower.data); =20 if (!(txd_lower & (E1000_TXD_CMD_RS|E1000_TXD_CMD_RPS))) @@ -657,7 +664,7 @@ txdesc_writeback(E1000State *s, dma_addr_t base, stru= ct e1000_tx_desc *dp) txd_upper =3D (le32_to_cpu(dp->upper.data) | E1000_TXD_STAT_DD) & ~(E1000_TXD_STAT_EC | E1000_TXD_STAT_LC | E1000_TXD_STAT= _TU); dp->upper.data =3D cpu_to_le32(txd_upper); - pci_dma_write(&s->dev, base + ((char *)&dp->upper - (char *)dp), + pci_dma_write(d, base + ((char *)&dp->upper - (char *)dp), &dp->upper, sizeof(dp->upper)); return E1000_ICR_TXDW; } @@ -673,6 +680,7 @@ static uint64_t tx_desc_base(E1000State *s) static void start_xmit(E1000State *s) { + PCIDevice *d =3D PCI_DEVICE(s); dma_addr_t base; struct e1000_tx_desc desc; uint32_t tdh_start =3D s->mac_reg[TDH], cause =3D E1000_ICS_TXQE; @@ -685,7 +693,7 @@ start_xmit(E1000State *s) while (s->mac_reg[TDH] !=3D s->mac_reg[TDT]) { base =3D tx_desc_base(s) + sizeof(struct e1000_tx_desc) * s->mac_reg[TDH]; - pci_dma_read(&s->dev, base, &desc, sizeof(desc)); + pci_dma_read(d, base, &desc, sizeof(desc)); =20 DBGOUT(TX, "index %d: %p : %x %x\n", s->mac_reg[TDH], (void *)(intptr_t)desc.buffer_addr, desc.lower.data, @@ -818,6 +826,7 @@ static ssize_t e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size) { E1000State *s =3D qemu_get_nic_opaque(nc); + PCIDevice *d =3D PCI_DEVICE(s); struct e1000_rx_desc desc; dma_addr_t base; unsigned int n, rdt; @@ -877,7 +886,7 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,= size_t size) desc_size =3D s->rxbuf_size; } base =3D rx_desc_base(s) + sizeof(desc) * s->mac_reg[RDH]; - pci_dma_read(&s->dev, base, &desc, sizeof(desc)); + pci_dma_read(d, base, &desc, sizeof(desc)); desc.special =3D vlan_special; desc.status |=3D (vlan_status | E1000_RXD_STAT_DD); if (desc.buffer_addr) { @@ -886,7 +895,7 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,= size_t size) if (copy_size > s->rxbuf_size) { copy_size =3D s->rxbuf_size; } - pci_dma_write(&s->dev, le64_to_cpu(desc.buffer_addr), + pci_dma_write(d, le64_to_cpu(desc.buffer_addr), buf + desc_offset + vlan_offset, copy_size= ); } desc_offset +=3D desc_size; @@ -901,7 +910,7 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,= size_t size) } else { // as per intel docs; skip descriptors with null buf ad= dr DBGOUT(RX, "Null RX descriptor!!\n"); } - pci_dma_write(&s->dev, base, &desc, sizeof(desc)); + pci_dma_write(d, base, &desc, sizeof(desc)); =20 if (++s->mac_reg[RDH] * sizeof(desc) >=3D s->mac_reg[RDLEN]) s->mac_reg[RDH] =3D 0; @@ -1187,7 +1196,7 @@ static const VMStateDescription vmstate_e1000 =3D { .pre_save =3D e1000_pre_save, .post_load =3D e1000_post_load, .fields =3D (VMStateField []) { - VMSTATE_PCI_DEVICE(dev, E1000State), + VMSTATE_PCI_DEVICE(parent_obj, E1000State), VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */ VMSTATE_UNUSED(4), /* Was mmio_base. */ VMSTATE_UINT32(rxbuf_size, E1000State), @@ -1328,7 +1337,7 @@ static int pci_e1000_init(PCIDevice *pci_dev) int i; uint8_t *macaddr; =20 - pci_conf =3D d->dev.config; + pci_conf =3D pci_dev->config; =20 /* TODO: RST# value should be 0, PCI spec 6.2.4 */ pci_conf[PCI_CACHE_LINE_SIZE] =3D 0x10; @@ -1337,9 +1346,9 @@ static int pci_e1000_init(PCIDevice *pci_dev) =20 e1000_mmio_setup(d); =20 - pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio= ); + pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio= ); =20 - pci_register_bar(&d->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->io); + pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->io); =20 memmove(d->eeprom_data, e1000_eeprom_template, sizeof e1000_eeprom_template); --=20 1.8.1.4