diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xilinx.h | 2 | ||||
| -rw-r--r-- | hw/xilinx_ethlite.c | 20 |
2 files changed, 14 insertions, 8 deletions
diff --git a/hw/xilinx.h b/hw/xilinx.h index 5e6aeeaf69..705ff5b84b 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -40,7 +40,7 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, qemu_check_nic_model(nd, "xilinx-ethlite"); dev = qdev_create(NULL, "xilinx,ethlite"); - dev->nd = nd; + qdev_set_nic_properties(dev, nd); qdev_prop_set_uint32(dev, "txpingpong", txpingpong); qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); qdev_init_nofail(dev); diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 9b0074c788..b7129d5dd7 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -52,13 +52,13 @@ struct xlx_ethlite SysBusDevice busdev; qemu_irq irq; VLANClientState *vc; + NICConf conf; uint32_t c_tx_pingpong; uint32_t c_rx_pingpong; unsigned int txbuf; unsigned int rxbuf; - uint8_t macaddr[6]; uint32_t regs[R_MAX]; }; @@ -125,7 +125,7 @@ eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value) if (s->regs[base + R_TX_CTRL0] & CTRL_I) eth_pulse_irq(s); } else if ((value & (CTRL_P | CTRL_S)) == (CTRL_P | CTRL_S)) { - memcpy(&s->macaddr[0], &s->regs[base], 6); + memcpy(&s->conf.macaddr.a[0], &s->regs[base], 6); if (s->regs[base + R_TX_CTRL0] & CTRL_I) eth_pulse_irq(s); } @@ -175,7 +175,7 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size) int i; /* DA filter. */ - if (!(buf[0] & 0x80) && memcmp(&s->macaddr[0], buf, 6)) + if (!(buf[0] & 0x80) && memcmp(&s->conf.macaddr.a[0], buf, 6)) return size; if (s->regs[rxbase + R_RX_CTRL0] & CTRL_S) { @@ -204,7 +204,8 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size) static void eth_cleanup(VLANClientState *vc) { struct xlx_ethlite *s = vc->opaque; - qemu_free(s); + + s->vc = NULL; } static int xilinx_ethlite_init(SysBusDevice *dev) @@ -218,9 +219,13 @@ static int xilinx_ethlite_init(SysBusDevice *dev) regs = cpu_register_io_memory(eth_read, eth_write, s); sysbus_init_mmio(dev, R_MAX * 4, regs); - qdev_get_macaddr(&dev->qdev, s->macaddr); - s->vc = qdev_get_vlan_client(&dev->qdev, - eth_can_rx, eth_rx, NULL, eth_cleanup, s); + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, + s->conf.vlan, s->conf.peer, + dev->qdev.info->name, dev->qdev.id, + eth_can_rx, eth_rx, NULL, + NULL, eth_cleanup, s); + qemu_format_nic_info_str(s->vc, s->conf.macaddr.a); return 0; } @@ -231,6 +236,7 @@ static SysBusDeviceInfo xilinx_ethlite_info = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("txpingpong", struct xlx_ethlite, c_tx_pingpong, 1), DEFINE_PROP_UINT32("rxpingpong", struct xlx_ethlite, c_rx_pingpong, 1), + DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf), DEFINE_PROP_END_OF_LIST(), } }; |