[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/44] net: convert eepro100 to NICState
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 23/44] net: convert eepro100 to NICState |
Date: |
Wed, 25 Nov 2009 18:49:16 +0000 |
Signed-off-by: Mark McLoughlin <address@hidden>
---
hw/eepro100.c | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 8734907..eb16a51 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -195,7 +195,7 @@ typedef struct {
PCIDevice dev;
uint8_t mult[8]; /* multicast mask array */
int mmio_index;
- VLANClientState *vc;
+ NICState *nic;
NICConf conf;
uint8_t scb_stat; /* SCB stat/ack byte */
uint8_t int_stat; /* PCI interrupt status */
@@ -868,7 +868,7 @@ static void action_command(EEPRO100State *s)
}
}
TRACE(RXTX, logout("%p sending frame, len=%d,%s\n", s, size,
nic_dump(buf, size)));
- qemu_send_packet(s->vc, buf, size);
+ qemu_send_packet(&s->nic->nc, buf, size);
s->statistics.tx_good_frames++;
/* Transmit with bad status would raise an CX/TNO interrupt.
* (82557 only). Emulation never has bad status. */
@@ -1599,21 +1599,21 @@ static void pci_mmio_map(PCIDevice * pci_dev, int
region_num,
}
}
-static int nic_can_receive(VLANClientState *vc)
+static int nic_can_receive(VLANClientState *nc)
{
- EEPRO100State *s = vc->opaque;
+ EEPRO100State *s = DO_UPCAST(NICState, nc, nc)->opaque;
TRACE(RXTX, logout("%p\n", s));
return get_ru_state(s) == ru_ready;
//~ return !eepro100_buffer_full(s);
}
-static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t
size)
+static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t
size)
{
/* TODO:
* - Magic packets should set bit 30 in power management driver register.
* - Interesting packets should set bit 29 in power management driver
register.
*/
- EEPRO100State *s = vc->opaque;
+ EEPRO100State *s = DO_UPCAST(NICState, nc, nc)->opaque;
uint16_t rfd_status = 0xa000;
static const uint8_t broadcast_macaddr[6] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -1779,11 +1779,11 @@ static const VMStateDescription vmstate_eepro100 = {
}
};
-static void nic_cleanup(VLANClientState *vc)
+static void nic_cleanup(VLANClientState *nc)
{
- EEPRO100State *s = vc->opaque;
+ EEPRO100State *s = DO_UPCAST(NICState, nc, nc)->opaque;
- s->vc = NULL;
+ s->nic = NULL;
}
static int pci_nic_uninit(PCIDevice *pci_dev)
@@ -1793,10 +1793,18 @@ static int pci_nic_uninit(PCIDevice *pci_dev)
cpu_unregister_io_memory(s->mmio_index);
vmstate_unregister(s->vmstate, s);
eeprom93xx_free(s->eeprom);
- qemu_del_vlan_client(s->vc);
+ qemu_del_vlan_client(&s->nic->nc);
return 0;
}
+static NetClientInfo net_eepro100_info = {
+ .type = NET_CLIENT_TYPE_NIC,
+ .size = sizeof(NICState),
+ .can_receive = nic_can_receive,
+ .receive = nic_receive,
+ .cleanup = nic_cleanup,
+};
+
static int nic_init(PCIDevice *pci_dev, uint32_t device)
{
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
@@ -1829,27 +1837,24 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device)
nic_reset(s);
- s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
- s->conf.vlan, s->conf.peer,
- pci_dev->qdev.info->name, pci_dev->qdev.id,
- nic_can_receive, nic_receive, NULL, NULL,
- nic_cleanup, s);
+ s->nic = qemu_new_nic(&net_eepro100_info, &s->conf,
+ pci_dev->qdev.info->name, pci_dev->qdev.id, s);
- qemu_format_nic_info_str(s->vc, s->conf.macaddr.a);
- TRACE(OTHER, logout("%s\n", s->vc->info_str));
+ qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
+ TRACE(OTHER, logout("%s\n", s->nic->nc.info_str));
qemu_register_reset(nic_reset, s);
s->vmstate = qemu_malloc(sizeof(vmstate_eepro100));
memcpy(s->vmstate, &vmstate_eepro100, sizeof(vmstate_eepro100));
- s->vmstate->name = s->vc->model;
+ s->vmstate->name = s->nic->nc.model;
vmstate_register(-1, s->vmstate, s);
if (!pci_dev->qdev.hotplugged) {
static int loaded = 0;
if (!loaded) {
char fname[32];
- snprintf(fname, sizeof(fname), "pxe-%s.bin", s->vc->model);
+ snprintf(fname, sizeof(fname), "pxe-%s.bin", s->nic->nc.model);
rom_add_option(fname);
loaded = 1;
}
--
1.6.5.2
- [Qemu-devel] [PATCH 33/44] net: convert xilinx_ethlite to NICState, (continued)
- [Qemu-devel] [PATCH 33/44] net: convert xilinx_ethlite to NICState, Mark McLoughlin, 2009/11/25
- [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 <=
- [Qemu-devel] [PATCH 30/44] net: convert smc91c111 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 19/44] net: convert e1000 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 20/44] net: convert rtl8139 to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 15/44] net: convert socket to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 18/44] net: convert virtio to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 08/44] net: introduce NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 24/44] net: convert dp8393x to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 16/44] net: convert dump to NetClientInfo, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 29/44] net: convert musicpal to NICState, Mark McLoughlin, 2009/11/25
- [Qemu-devel] [PATCH 44/44] net: fix vnet_hdr handling in solaris tap code, Mark McLoughlin, 2009/11/25