mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: remove NICInfo::vc

Browse Source 
Since 1cc33683, this field is not set for most devices, so just
remove it and its remaining few uses.

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:48:59 +00:00 committed by Anthony Liguori
parent 1df49e0472
commit e13b10be5c
6 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dp8393x.c
View File

@ -889,7 +889,7 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s);
s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */
s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
nic_can_receive, nic_receive, NULL, NULL,

2
hw/etraxfs_eth.c
View File

@ -590,7 +590,7 @@ void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth);
cpu_register_physical_memory (base, 0x5c, eth->ethregs);
eth->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
eth->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
eth_can_receive, eth_receive,

2
hw/mcf_fec.c
View File

@ -462,7 +462,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq)
mcf_fec_writefn, s);
cpu_register_physical_memory(base, 0x400, s->mmio_index);
s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
mcf_fec_can_receive, mcf_fec_receive,

2
hw/mipsnet.c
View File

@ -263,7 +263,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
s->io_base = base;
s->irq = irq;
if (nd) {
s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
mipsnet_can_receive, mipsnet_receive,

2
hw/usb-net.c
View File

@ -1460,7 +1460,7 @@ USBDevice *usb_net_init(NICInfo *nd)
memcpy(s->mac, nd->macaddr, 6);
s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev,
nd->model, nd->name,
usbnet_can_receive,

1
net.h
View File

@ -124,7 +124,6 @@ struct NICInfo {
char *devaddr;
VLANState *vlan;
VLANClientState *netdev;
VLANClientState *vc;
void *private;
int used;
int bootable;