net: add fd_readv() handler to qemu_new_vlan_client() args
This, apparently, is the style we prefer - all VLANClientState should be an argument to qemu_new_vlan_client(). Signed-off-by: Mark McLoughlin <markmc@redhat.com>
This commit is contained in:
parent
3471b757d0
commit
463af5349a
|
@ -888,8 +888,8 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
|
||||||
s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s);
|
s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s);
|
||||||
s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */
|
s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */
|
||||||
|
|
||||||
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, nic_can_receive,
|
||||||
nic_receive, nic_can_receive, nic_cleanup, s);
|
nic_receive, NULL, nic_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, nd->macaddr);
|
qemu_format_nic_info_str(s->vc, nd->macaddr);
|
||||||
qemu_register_reset(nic_reset, 0, s);
|
qemu_register_reset(nic_reset, 0, s);
|
||||||
|
|
|
@ -1106,8 +1106,8 @@ static void pci_e1000_init(PCIDevice *pci_dev)
|
||||||
memset(&d->tx, 0, sizeof d->tx);
|
memset(&d->tx, 0, sizeof d->tx);
|
||||||
|
|
||||||
d->vc = qdev_get_vlan_client(&d->dev.qdev,
|
d->vc = qdev_get_vlan_client(&d->dev.qdev,
|
||||||
e1000_receive, e1000_can_receive,
|
e1000_can_receive, e1000_receive,
|
||||||
e1000_cleanup, d);
|
NULL, e1000_cleanup, d);
|
||||||
d->vc->link_status_changed = e1000_set_link_status;
|
d->vc->link_status_changed = e1000_set_link_status;
|
||||||
|
|
||||||
qemu_format_nic_info_str(d->vc, macaddr);
|
qemu_format_nic_info_str(d->vc, macaddr);
|
||||||
|
|
|
@ -1766,7 +1766,7 @@ static void nic_init(PCIDevice *pci_dev, uint32_t device)
|
||||||
nic_reset(s);
|
nic_reset(s);
|
||||||
|
|
||||||
s->vc = qdev_get_vlan_client(&d->dev.qdev,
|
s->vc = qdev_get_vlan_client(&d->dev.qdev,
|
||||||
nic_receive, nic_can_receive,
|
nic_can_receive, nic_receive, NULL,
|
||||||
nic_cleanup, s);
|
nic_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
|
|
@ -593,7 +593,7 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
|
||||||
cpu_register_physical_memory (base, 0x5c, eth->ethregs);
|
cpu_register_physical_memory (base, 0x5c, eth->ethregs);
|
||||||
|
|
||||||
eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
||||||
eth_receive, eth_can_receive,
|
eth_can_receive, eth_receive, NULL,
|
||||||
eth_cleanup, eth);
|
eth_cleanup, eth);
|
||||||
eth->vc->opaque = eth;
|
eth->vc->opaque = eth;
|
||||||
eth->vc->link_status_changed = eth_set_link;
|
eth->vc->link_status_changed = eth_set_link;
|
||||||
|
|
|
@ -462,7 +462,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq)
|
||||||
cpu_register_physical_memory(base, 0x400, s->mmio_index);
|
cpu_register_physical_memory(base, 0x400, s->mmio_index);
|
||||||
|
|
||||||
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
||||||
mcf_fec_receive, mcf_fec_can_receive,
|
mcf_fec_can_receive, mcf_fec_receive, NULL,
|
||||||
mcf_fec_cleanup, s);
|
mcf_fec_cleanup, s);
|
||||||
memcpy(s->macaddr, nd->macaddr, 6);
|
memcpy(s->macaddr, nd->macaddr, 6);
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
|
|
@ -262,7 +262,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
|
||||||
s->irq = irq;
|
s->irq = irq;
|
||||||
if (nd && nd->vlan) {
|
if (nd && nd->vlan) {
|
||||||
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
||||||
mipsnet_receive, mipsnet_can_receive,
|
mipsnet_can_receive, mipsnet_receive, NULL,
|
||||||
mipsnet_cleanup, s);
|
mipsnet_cleanup, s);
|
||||||
} else {
|
} else {
|
||||||
s->vc = NULL;
|
s->vc = NULL;
|
||||||
|
|
|
@ -753,7 +753,7 @@ static void mv88w8618_eth_init(SysBusDevice *dev)
|
||||||
|
|
||||||
sysbus_init_irq(dev, &s->irq);
|
sysbus_init_irq(dev, &s->irq);
|
||||||
s->vc = qdev_get_vlan_client(&dev->qdev,
|
s->vc = qdev_get_vlan_client(&dev->qdev,
|
||||||
eth_receive, eth_can_receive,
|
eth_can_receive, eth_receive, NULL,
|
||||||
eth_cleanup, s);
|
eth_cleanup, s);
|
||||||
s->mmio_index = cpu_register_io_memory(0, mv88w8618_eth_readfn,
|
s->mmio_index = cpu_register_io_memory(0, mv88w8618_eth_readfn,
|
||||||
mv88w8618_eth_writefn, s);
|
mv88w8618_eth_writefn, s);
|
||||||
|
|
|
@ -757,7 +757,7 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd)
|
||||||
ne2000_reset(s);
|
ne2000_reset(s);
|
||||||
|
|
||||||
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
||||||
ne2000_receive, ne2000_can_receive,
|
ne2000_can_receive, ne2000_receive, NULL,
|
||||||
isa_ne2000_cleanup, s);
|
isa_ne2000_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
@ -821,7 +821,7 @@ static void pci_ne2000_init(PCIDevice *pci_dev)
|
||||||
qdev_get_macaddr(&d->dev.qdev, s->macaddr);
|
qdev_get_macaddr(&d->dev.qdev, s->macaddr);
|
||||||
ne2000_reset(s);
|
ne2000_reset(s);
|
||||||
s->vc = qdev_get_vlan_client(&d->dev.qdev,
|
s->vc = qdev_get_vlan_client(&d->dev.qdev,
|
||||||
ne2000_receive, ne2000_can_receive,
|
ne2000_can_receive, ne2000_receive, NULL,
|
||||||
ne2000_cleanup, s);
|
ne2000_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
|
|
@ -1952,7 +1952,7 @@ static void pcnet_common_init(DeviceState *dev, PCNetState *s,
|
||||||
|
|
||||||
qdev_get_macaddr(dev, s->macaddr);
|
qdev_get_macaddr(dev, s->macaddr);
|
||||||
s->vc = qdev_get_vlan_client(dev,
|
s->vc = qdev_get_vlan_client(dev,
|
||||||
pcnet_receive, pcnet_can_receive,
|
pcnet_can_receive, pcnet_receive, NULL,
|
||||||
cleanup, s);
|
cleanup, s);
|
||||||
pcnet_h_reset(s);
|
pcnet_h_reset(s);
|
||||||
register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, s);
|
register_savevm("pcnet", -1, 2, pcnet_save, pcnet_load, s);
|
||||||
|
|
|
@ -258,15 +258,16 @@ void qdev_connect_gpio_out(DeviceState * dev, int n, qemu_irq pin)
|
||||||
}
|
}
|
||||||
|
|
||||||
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
|
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
|
||||||
IOReadHandler *fd_read,
|
|
||||||
IOCanRWHandler *fd_can_read,
|
IOCanRWHandler *fd_can_read,
|
||||||
|
IOReadHandler *fd_read,
|
||||||
|
IOReadvHandler *fd_readv,
|
||||||
NetCleanup *cleanup,
|
NetCleanup *cleanup,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
{
|
{
|
||||||
NICInfo *nd = dev->nd;
|
NICInfo *nd = dev->nd;
|
||||||
assert(nd);
|
assert(nd);
|
||||||
return qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
return qemu_new_vlan_client(nd->vlan, nd->model, nd->name, fd_can_read,
|
||||||
fd_read, fd_can_read, cleanup, opaque);
|
fd_read, fd_readv, cleanup, opaque);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3475,7 +3475,7 @@ static void pci_rtl8139_init(PCIDevice *dev)
|
||||||
qdev_get_macaddr(&dev->qdev, s->macaddr);
|
qdev_get_macaddr(&dev->qdev, s->macaddr);
|
||||||
rtl8139_reset(s);
|
rtl8139_reset(s);
|
||||||
s->vc = qdev_get_vlan_client(&dev->qdev,
|
s->vc = qdev_get_vlan_client(&dev->qdev,
|
||||||
rtl8139_receive, rtl8139_can_receive,
|
rtl8139_can_receive, rtl8139_receive, NULL,
|
||||||
rtl8139_cleanup, s);
|
rtl8139_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
|
|
@ -711,7 +711,7 @@ static void smc91c111_init1(SysBusDevice *dev)
|
||||||
smc91c111_reset(s);
|
smc91c111_reset(s);
|
||||||
|
|
||||||
s->vc = qdev_get_vlan_client(&dev->qdev,
|
s->vc = qdev_get_vlan_client(&dev->qdev,
|
||||||
smc91c111_receive, smc91c111_can_receive,
|
smc91c111_can_receive, smc91c111_receive, NULL,
|
||||||
smc91c111_cleanup, s);
|
smc91c111_cleanup, s);
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
/* ??? Save/restore. */
|
/* ??? Save/restore. */
|
||||||
|
|
|
@ -405,8 +405,8 @@ static void stellaris_enet_init(SysBusDevice *dev)
|
||||||
qdev_get_macaddr(&dev->qdev, s->macaddr);
|
qdev_get_macaddr(&dev->qdev, s->macaddr);
|
||||||
|
|
||||||
s->vc = qdev_get_vlan_client(&dev->qdev,
|
s->vc = qdev_get_vlan_client(&dev->qdev,
|
||||||
stellaris_enet_receive,
|
|
||||||
stellaris_enet_can_receive,
|
stellaris_enet_can_receive,
|
||||||
|
stellaris_enet_receive, NULL,
|
||||||
stellaris_enet_cleanup, s);
|
stellaris_enet_cleanup, s);
|
||||||
qemu_format_nic_info_str(s->vc, s->macaddr);
|
qemu_format_nic_info_str(s->vc, s->macaddr);
|
||||||
|
|
||||||
|
|
|
@ -1458,8 +1458,9 @@ USBDevice *usb_net_init(NICInfo *nd)
|
||||||
pstrcpy(s->dev.devname, sizeof(s->dev.devname),
|
pstrcpy(s->dev.devname, sizeof(s->dev.devname),
|
||||||
"QEMU USB Network Interface");
|
"QEMU USB Network Interface");
|
||||||
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
|
||||||
usbnet_receive,
|
|
||||||
usbnet_can_receive,
|
usbnet_can_receive,
|
||||||
|
usbnet_receive,
|
||||||
|
NULL,
|
||||||
usbnet_cleanup, s);
|
usbnet_cleanup, s);
|
||||||
|
|
||||||
qemu_format_nic_info_str(s->vc, s->mac);
|
qemu_format_nic_info_str(s->vc, s->mac);
|
||||||
|
|
|
@ -606,8 +606,8 @@ VirtIODevice *virtio_net_init(DeviceState *dev)
|
||||||
qdev_get_macaddr(dev, n->mac);
|
qdev_get_macaddr(dev, n->mac);
|
||||||
n->status = VIRTIO_NET_S_LINK_UP;
|
n->status = VIRTIO_NET_S_LINK_UP;
|
||||||
n->vc = qdev_get_vlan_client(dev,
|
n->vc = qdev_get_vlan_client(dev,
|
||||||
virtio_net_receive,
|
|
||||||
virtio_net_can_receive,
|
virtio_net_can_receive,
|
||||||
|
virtio_net_receive, NULL,
|
||||||
virtio_net_cleanup, n);
|
virtio_net_cleanup, n);
|
||||||
n->vc->link_status_changed = virtio_net_set_link_status;
|
n->vc->link_status_changed = virtio_net_set_link_status;
|
||||||
|
|
||||||
|
|
|
@ -301,8 +301,8 @@ static int net_init(struct XenDevice *xendev)
|
||||||
|
|
||||||
vlan = qemu_find_vlan(netdev->xendev.dev);
|
vlan = qemu_find_vlan(netdev->xendev.dev);
|
||||||
netdev->vs = qemu_new_vlan_client(vlan, "xen", NULL,
|
netdev->vs = qemu_new_vlan_client(vlan, "xen", NULL,
|
||||||
net_rx_packet, net_rx_ok, NULL,
|
net_rx_ok, net_rx_packet, NULL,
|
||||||
netdev);
|
NULL, netdev);
|
||||||
snprintf(netdev->vs->info_str, sizeof(netdev->vs->info_str),
|
snprintf(netdev->vs->info_str, sizeof(netdev->vs->info_str),
|
||||||
"nic: xenbus vif macaddr=%s", netdev->mac);
|
"nic: xenbus vif macaddr=%s", netdev->mac);
|
||||||
|
|
||||||
|
|
21
net.c
21
net.c
|
@ -332,8 +332,9 @@ static char *assign_name(VLANClientState *vc1, const char *model)
|
||||||
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
|
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
|
||||||
const char *model,
|
const char *model,
|
||||||
const char *name,
|
const char *name,
|
||||||
IOReadHandler *fd_read,
|
|
||||||
IOCanRWHandler *fd_can_read,
|
IOCanRWHandler *fd_can_read,
|
||||||
|
IOReadHandler *fd_read,
|
||||||
|
IOReadvHandler *fd_readv,
|
||||||
NetCleanup *cleanup,
|
NetCleanup *cleanup,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
{
|
{
|
||||||
|
@ -344,8 +345,9 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
|
||||||
vc->name = strdup(name);
|
vc->name = strdup(name);
|
||||||
else
|
else
|
||||||
vc->name = assign_name(vc, model);
|
vc->name = assign_name(vc, model);
|
||||||
vc->fd_read = fd_read;
|
|
||||||
vc->fd_can_read = fd_can_read;
|
vc->fd_can_read = fd_can_read;
|
||||||
|
vc->fd_read = fd_read;
|
||||||
|
vc->fd_readv = fd_readv;
|
||||||
vc->cleanup = cleanup;
|
vc->cleanup = cleanup;
|
||||||
vc->opaque = opaque;
|
vc->opaque = opaque;
|
||||||
vc->vlan = vlan;
|
vc->vlan = vlan;
|
||||||
|
@ -632,7 +634,7 @@ static int net_slirp_init(VLANState *vlan, const char *model, const char *name,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
slirp_vc = qemu_new_vlan_client(vlan, model, name, slirp_receive,
|
slirp_vc = qemu_new_vlan_client(vlan, model, name, NULL, slirp_receive,
|
||||||
NULL, net_slirp_cleanup, NULL);
|
NULL, net_slirp_cleanup, NULL);
|
||||||
slirp_vc->info_str[0] = '\0';
|
slirp_vc->info_str[0] = '\0';
|
||||||
slirp_in_use = 1;
|
slirp_in_use = 1;
|
||||||
|
@ -1015,9 +1017,8 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
|
||||||
|
|
||||||
s = qemu_mallocz(sizeof(TAPState));
|
s = qemu_mallocz(sizeof(TAPState));
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive,
|
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, tap_receive,
|
||||||
NULL, tap_cleanup, s);
|
tap_receive_iov, tap_cleanup, s);
|
||||||
s->vc->fd_readv = tap_receive_iov;
|
|
||||||
qemu_set_fd_handler2(s->fd, tap_can_send, tap_send, NULL, s);
|
qemu_set_fd_handler2(s->fd, tap_can_send, tap_send, NULL, s);
|
||||||
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd);
|
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd);
|
||||||
return s;
|
return s;
|
||||||
|
@ -1351,7 +1352,7 @@ static int net_vde_init(VLANState *vlan, const char *model,
|
||||||
free(s);
|
free(s);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
s->vc = qemu_new_vlan_client(vlan, model, name, vde_from_qemu,
|
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, vde_from_qemu,
|
||||||
NULL, vde_cleanup, s);
|
NULL, vde_cleanup, s);
|
||||||
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
|
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
|
||||||
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d",
|
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d",
|
||||||
|
@ -1589,7 +1590,7 @@ static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan,
|
||||||
s = qemu_mallocz(sizeof(NetSocketState));
|
s = qemu_mallocz(sizeof(NetSocketState));
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
|
|
||||||
s->vc = qemu_new_vlan_client(vlan, model, name, net_socket_receive_dgram,
|
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, net_socket_receive_dgram,
|
||||||
NULL, net_socket_cleanup, s);
|
NULL, net_socket_cleanup, s);
|
||||||
qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s);
|
qemu_set_fd_handler(s->fd, net_socket_send_dgram, NULL, s);
|
||||||
|
|
||||||
|
@ -1617,7 +1618,7 @@ static NetSocketState *net_socket_fd_init_stream(VLANState *vlan,
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
s = qemu_mallocz(sizeof(NetSocketState));
|
s = qemu_mallocz(sizeof(NetSocketState));
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
s->vc = qemu_new_vlan_client(vlan, model, name, net_socket_receive,
|
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, net_socket_receive,
|
||||||
NULL, net_socket_cleanup, s);
|
NULL, net_socket_cleanup, s);
|
||||||
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
|
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
|
||||||
"socket: fd=%d", fd);
|
"socket: fd=%d", fd);
|
||||||
|
@ -1896,7 +1897,7 @@ static int net_dump_init(Monitor *mon, VLANState *vlan, const char *device,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->pcap_vc = qemu_new_vlan_client(vlan, device, name, dump_receive, NULL,
|
s->pcap_vc = qemu_new_vlan_client(vlan, device, name, NULL, dump_receive, NULL,
|
||||||
net_dump_cleanup, s);
|
net_dump_cleanup, s);
|
||||||
snprintf(s->pcap_vc->info_str, sizeof(s->pcap_vc->info_str),
|
snprintf(s->pcap_vc->info_str, sizeof(s->pcap_vc->info_str),
|
||||||
"dump to %s (len=%d)", filename, len);
|
"dump to %s (len=%d)", filename, len);
|
||||||
|
|
6
net.h
6
net.h
|
@ -51,8 +51,9 @@ VLANState *qemu_find_vlan(int id);
|
||||||
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
|
VLANClientState *qemu_new_vlan_client(VLANState *vlan,
|
||||||
const char *model,
|
const char *model,
|
||||||
const char *name,
|
const char *name,
|
||||||
IOReadHandler *fd_read,
|
|
||||||
IOCanRWHandler *fd_can_read,
|
IOCanRWHandler *fd_can_read,
|
||||||
|
IOReadHandler *fd_read,
|
||||||
|
IOReadvHandler *fd_readv,
|
||||||
NetCleanup *cleanup,
|
NetCleanup *cleanup,
|
||||||
void *opaque);
|
void *opaque);
|
||||||
void qemu_del_vlan_client(VLANClientState *vc);
|
void qemu_del_vlan_client(VLANClientState *vc);
|
||||||
|
@ -129,8 +130,9 @@ void net_host_device_remove(Monitor *mon, int vlan_id, const char *device);
|
||||||
|
|
||||||
void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr);
|
void qdev_get_macaddr(DeviceState *dev, uint8_t *macaddr);
|
||||||
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
|
VLANClientState *qdev_get_vlan_client(DeviceState *dev,
|
||||||
IOReadHandler *fd_read,
|
|
||||||
IOCanRWHandler *fd_can_read,
|
IOCanRWHandler *fd_can_read,
|
||||||
|
IOReadHandler *fd_read,
|
||||||
|
IOReadvHandler *fd_readv,
|
||||||
NetCleanup *cleanup,
|
NetCleanup *cleanup,
|
||||||
void *opaque);
|
void *opaque);
|
||||||
|
|
||||||
|
|
|
@ -684,7 +684,7 @@ int tap_win32_init(VLANState *vlan, const char *model,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive,
|
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, tap_receive,
|
||||||
NULL, tap_cleanup, s);
|
NULL, tap_cleanup, s);
|
||||||
|
|
||||||
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
|
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
|
||||||
|
|
Loading…
Reference in a new issue