[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 33/44] net: convert xilinx_ethlite to NICState
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 33/44] net: convert xilinx_ethlite to NICState |
Date: |
Wed, 25 Nov 2009 18:49:26 +0000 |
Signed-off-by: Mark McLoughlin <address@hidden>
---
hw/xilinx_ethlite.c | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
index b7129d5..37e33ec 100644
--- a/hw/xilinx_ethlite.c
+++ b/hw/xilinx_ethlite.c
@@ -51,7 +51,7 @@ struct xlx_ethlite
{
SysBusDevice busdev;
qemu_irq irq;
- VLANClientState *vc;
+ NICState *nic;
NICConf conf;
uint32_t c_tx_pingpong;
@@ -118,7 +118,7 @@ eth_writel (void *opaque, target_phys_addr_t addr, uint32_t
value)
D(qemu_log("%s addr=%x val=%x\n", __func__, addr * 4, value));
if ((value & (CTRL_P | CTRL_S)) == CTRL_S) {
- qemu_send_packet(s->vc,
+ qemu_send_packet(&s->nic->nc,
(void *) &s->regs[base],
s->regs[base + R_TX_LEN0]);
D(qemu_log("eth_tx %d\n", s->regs[base + R_TX_LEN0]));
@@ -160,17 +160,17 @@ static CPUWriteMemoryFunc * const eth_write[] = {
NULL, NULL, ð_writel,
};
-static int eth_can_rx(VLANClientState *vc)
+static int eth_can_rx(VLANClientState *nc)
{
- struct xlx_ethlite *s = vc->opaque;
+ struct xlx_ethlite *s = DO_UPCAST(NICState, nc, nc)->opaque;
int r;
r = !(s->regs[R_RX_CTRL0] & CTRL_S);
return r;
}
-static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size)
+static ssize_t eth_rx(VLANClientState *nc, const uint8_t *buf, size_t size)
{
- struct xlx_ethlite *s = vc->opaque;
+ struct xlx_ethlite *s = DO_UPCAST(NICState, nc, nc)->opaque;
unsigned int rxbase = s->rxbuf * (0x800 / 4);
int i;
@@ -201,13 +201,21 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t
*buf, size_t size)
return size;
}
-static void eth_cleanup(VLANClientState *vc)
+static void eth_cleanup(VLANClientState *nc)
{
- struct xlx_ethlite *s = vc->opaque;
+ struct xlx_ethlite *s = DO_UPCAST(NICState, nc, nc)->opaque;
- s->vc = NULL;
+ s->nic = NULL;
}
+static NetClientInfo net_xilinx_ethlite_info = {
+ .type = NET_CLIENT_TYPE_NIC,
+ .size = sizeof(NICState),
+ .can_receive = eth_can_rx,
+ .receive = eth_rx,
+ .cleanup = eth_cleanup,
+};
+
static int xilinx_ethlite_init(SysBusDevice *dev)
{
struct xlx_ethlite *s = FROM_SYSBUS(typeof (*s), dev);
@@ -220,12 +228,9 @@ static int xilinx_ethlite_init(SysBusDevice *dev)
sysbus_init_mmio(dev, R_MAX * 4, regs);
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);
+ s->nic = qemu_new_nic(&net_xilinx_ethlite_info, &s->conf,
+ dev->qdev.info->name, dev->qdev.id, s);
+ qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
return 0;
}
--
1.6.5.2
- [Qemu-devel] [PATCH 22/44] net: convert pcnet to NICState, (continued)
- [Qemu-devel] [PATCH 22/44] net: convert pcnet to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 12/44] net: convert tap-win32 to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 21/44] net: convert ne2000 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 07/44] net: remove NICInfo::private, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 05/44] net: clean up includes in net.c, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 13/44] net: convert slirp to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 26/44] net: convert LAN9118 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 39/44] net: fix qemu_announce_self(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 41/44] net: fix TAP networking on host kernels without IFF_VNET_HDR support, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 14/44] net: convert vde to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 33/44] net: convert xilinx_ethlite to NICState,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 36/44] net: remove qemu_new_vlan_client(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 38/44] net: add qemu_foreach_nic(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 40/44] net: print correct error for '-netdev ""', Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 32/44] net: convert usb-net to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 43/44] net: initialize vnet_hdr in net_init_tap(), Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 42/44] net: check for TUNSETOFFLOAD support before trying to enable offload features, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 25/44] net: convert etrax to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 27/44] net: convert mcf_fec to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 37/44] net: remove VLANClientState members now in NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 23/44] net: convert eepro100 to NICState, Mark McLoughlin, 2009/11/25