ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: convert mipsnet to NICState 

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-11-25 18:49:21 +00:00 committed by Anthony Liguori
parent 1cc49d95a1
commit 1f30d10a46
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hw/mipsnet.c
View File

@ -35,7 +35,8 @@ typedef struct MIPSnetState {
uint8_t tx_buffer[MAX_ETH_FRAME_SIZE]; uint8_t tx_buffer[MAX_ETH_FRAME_SIZE];
int io_base; int io_base;
qemu_irq irq; qemu_irq irq;
VLANClientState *vc; NICState *nic;
NICConf conf;
} MIPSnetState; } MIPSnetState;
static void mipsnet_reset(MIPSnetState *s) static void mipsnet_reset(MIPSnetState *s)
@ -66,23 +67,23 @@ static int mipsnet_buffer_full(MIPSnetState *s)
return 0; return 0;
} }
static int mipsnet_can_receive(VLANClientState *vc) static int mipsnet_can_receive(VLANClientState *nc)
{ {
MIPSnetState *s = vc->opaque; MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
if (s->busy) if (s->busy)
return 0; return 0;
return !mipsnet_buffer_full(s); return !mipsnet_buffer_full(s);
} }
static ssize_t mipsnet_receive(VLANClientState *vc, const uint8_t *buf, size_t size) static ssize_t mipsnet_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
{ {
MIPSnetState *s = vc->opaque; MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
#ifdef DEBUG_MIPSNET_RECEIVE #ifdef DEBUG_MIPSNET_RECEIVE
printf("mipsnet: receiving len=%d\n", size); printf("mipsnet: receiving len=%d\n", size);
#endif #endif
if (!mipsnet_can_receive(vc)) if (!mipsnet_can_receive(nc))
return -1; return -1;
s->busy = 1; s->busy = 1;
@ -183,7 +184,7 @@ static void mipsnet_ioport_write(void *opaque, uint32_t addr, uint32_t val)
#ifdef DEBUG_MIPSNET_SEND #ifdef DEBUG_MIPSNET_SEND
printf("mipsnet: sending len=%d\n", s->tx_count); printf("mipsnet: sending len=%d\n", s->tx_count);
#endif #endif
qemu_send_packet(s->vc, s->tx_buffer, s->tx_count); qemu_send_packet(&s->nic->nc, s->tx_buffer, s->tx_count);
s->tx_count = s->tx_written = 0; s->tx_count = s->tx_written = 0;
s->intctl |= MIPSNET_INTCTL_TXDONE; s->intctl |= MIPSNET_INTCTL_TXDONE;
s->busy = 1; s->busy = 1;
@ -234,9 +235,9 @@ static int mipsnet_load(QEMUFile *f, void *opaque, int version_id)
return 0; return 0;
} }
static void mipsnet_cleanup(VLANClientState *vc) static void mipsnet_cleanup(VLANClientState *nc)
{ {
MIPSnetState *s = vc->opaque; MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
unregister_savevm("mipsnet", s); unregister_savevm("mipsnet", s);
@ -245,6 +246,14 @@ static void mipsnet_cleanup(VLANClientState *vc)
qemu_free(s); qemu_free(s);
} }
static NetClientInfo net_mipsnet_info = {
.type = NET_CLIENT_TYPE_NIC,
.size = sizeof(NICState),
.can_receive = mipsnet_can_receive,
.receive = mipsnet_receive,
.cleanup = mipsnet_cleanup,
};
void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
{ {
MIPSnetState *s; MIPSnetState *s;
@ -262,17 +271,17 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
s->io_base = base; s->io_base = base;
s->irq = irq; s->irq = irq;
if (nd) {
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
mipsnet_can_receive, mipsnet_receive,
NULL, NULL, mipsnet_cleanup, s);
} else {
s->vc = NULL;
}
qemu_format_nic_info_str(s->vc, nd->macaddr); if (nd) {
memcpy(s->conf.macaddr.a, nd->macaddr, sizeof(nd->macaddr));
s->conf.vlan = nd->vlan;
s->conf.peer = nd->netdev;
s->nic = qemu_new_nic(&net_mipsnet_info, &s->conf,
nd->model, nd->name, s);
qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
}
mipsnet_reset(s); mipsnet_reset(s);
register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s); register_savevm("mipsnet", 0, 0, mipsnet_save, mipsnet_load, s);