vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: add receive_raw parameter to qemu_new_vlan_client() 

Trivial patch to allow supplying a receive_raw function.

A future cleanup should combine this function pointer parameters into a
table.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
master
Mark McLoughlin 2009-10-22 17:43:42 +01:00 committed by Anthony Liguori
parent ca77d17591
commit 70783b9c9b
9 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dp8393x.c
View File

@ -892,7 +892,7 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->vc = nd->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
nd->vlan, nd->netdev, nd->vlan, nd->netdev,
nd->model, nd->name, nd->model, nd->name,
nic_can_receive, nic_receive, NULL, nic_can_receive, nic_receive, NULL, NULL,
nic_cleanup, s); nic_cleanup, s);
qemu_format_nic_info_str(s->vc, nd->macaddr); qemu_format_nic_info_str(s->vc, nd->macaddr);

2
hw/etraxfs_eth.c
View File

@ -594,7 +594,7 @@ void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
nd->vlan, nd->netdev, nd->vlan, nd->netdev,
nd->model, nd->name, nd->model, nd->name,
eth_can_receive, eth_receive, eth_can_receive, eth_receive,
NULL, eth_cleanup, eth); NULL, NULL, 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;

2
hw/mcf_fec.c
View File

@ -466,7 +466,7 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq)
nd->vlan, nd->netdev, nd->vlan, nd->netdev,
nd->model, nd->name, nd->model, nd->name,
mcf_fec_can_receive, mcf_fec_receive, mcf_fec_can_receive, mcf_fec_receive,
NULL, mcf_fec_cleanup, s); NULL, NULL, 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);
} }

2
hw/mipsnet.c
View File

@ -267,7 +267,7 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
nd->vlan, nd->netdev, nd->vlan, nd->netdev,
nd->model, nd->name, nd->model, nd->name,
mipsnet_can_receive, mipsnet_receive, mipsnet_can_receive, mipsnet_receive,
NULL, mipsnet_cleanup, s); NULL, NULL, mipsnet_cleanup, s);
} else { } else {
s->vc = NULL; s->vc = NULL;
} }

2
hw/usb-net.c
View File

@ -1465,7 +1465,7 @@ USBDevice *usb_net_init(NICInfo *nd)
nd->model, nd->name, nd->model, nd->name,
usbnet_can_receive, usbnet_can_receive,
usbnet_receive, usbnet_receive,
NULL, NULL, 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);

2
hw/xen_nic.c
View File

@ -303,7 +303,7 @@ static int net_init(struct XenDevice *xendev)
vlan = qemu_find_vlan(netdev->xendev.dev, 1); vlan = qemu_find_vlan(netdev->xendev.dev, 1);
netdev->vs = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, netdev->vs = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC,
vlan, NULL, "xen", NULL, vlan, NULL, "xen", NULL,
net_rx_ok, net_rx_packet, NULL, net_rx_ok, net_rx_packet, NULL, NULL,
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);

14
net.c
View File

@ -334,6 +334,7 @@ VLANClientState *qemu_new_vlan_client(net_client_type type,
const char *name, const char *name,
NetCanReceive *can_receive, NetCanReceive *can_receive,
NetReceive *receive, NetReceive *receive,
NetReceive *receive_raw,
NetReceiveIOV *receive_iov, NetReceiveIOV *receive_iov,
NetCleanup *cleanup, NetCleanup *cleanup,
void *opaque) void *opaque)
@ -350,6 +351,7 @@ VLANClientState *qemu_new_vlan_client(net_client_type type,
vc->name = assign_name(vc, model); vc->name = assign_name(vc, model);
vc->can_receive = can_receive; vc->can_receive = can_receive;
vc->receive = receive; vc->receive = receive;
vc->receive_raw = receive_raw;
vc->receive_iov = receive_iov; vc->receive_iov = receive_iov;
vc->cleanup = cleanup; vc->cleanup = cleanup;
vc->opaque = opaque; vc->opaque = opaque;
@ -915,7 +917,7 @@ static int net_slirp_init(VLANState *vlan, const char *model,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SLIRP, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SLIRP,
vlan, NULL, model, name, NULL, vlan, NULL, model, name, NULL,
slirp_receive, NULL, slirp_receive, NULL, NULL,
net_slirp_cleanup, s); net_slirp_cleanup, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
"net=%s, restricted=%c", inet_ntoa(net), restricted ? 'y' : 'n'); "net=%s, restricted=%c", inet_ntoa(net), restricted ? 'y' : 'n');
@ -1553,7 +1555,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
s->using_vnet_hdr = 0; s->using_vnet_hdr = 0;
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_TAP, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_TAP,
vlan, NULL, model, name, NULL, vlan, NULL, model, name, NULL,
tap_receive, tap_receive_iov, tap_receive, NULL, tap_receive_iov,
tap_cleanup, s); tap_cleanup, s);
tap_read_poll(s, 1); tap_read_poll(s, 1);
return s; return s;
@ -1913,7 +1915,7 @@ static int net_vde_init(VLANState *vlan, const char *model,
} }
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE,
vlan, NULL, model, name, NULL, vlan, NULL, model, name, NULL,
vde_receive, NULL, vde_receive, NULL, NULL,
vde_cleanup, s); 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",
@ -2154,7 +2156,7 @@ static NetSocketState *net_socket_fd_init_dgram(VLANState *vlan,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SOCKET, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SOCKET,
vlan, NULL, model, name, NULL, vlan, NULL, model, name, NULL,
net_socket_receive_dgram, NULL, net_socket_receive_dgram, NULL, NULL,
net_socket_cleanup, s); 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);
@ -2184,7 +2186,7 @@ static NetSocketState *net_socket_fd_init_stream(VLANState *vlan,
s->fd = fd; s->fd = fd;
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SOCKET, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_SOCKET,
vlan, NULL, model, name, NULL, vlan, NULL, model, name, NULL,
net_socket_receive, NULL, net_socket_receive, NULL, NULL,
net_socket_cleanup, s); 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);
@ -2467,7 +2469,7 @@ static int net_dump_init(VLANState *vlan, const char *device,
s->pcap_vc = qemu_new_vlan_client(NET_CLIENT_TYPE_DUMP, s->pcap_vc = qemu_new_vlan_client(NET_CLIENT_TYPE_DUMP,
vlan, NULL, device, name, NULL, vlan, NULL, device, name, NULL,
dump_receive, NULL, dump_receive, NULL, 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);

1
net.h
View File

@ -79,6 +79,7 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
const char *name, const char *name,
NetCanReceive *can_receive, NetCanReceive *can_receive,
NetReceive *receive, NetReceive *receive,
NetReceive *receive_raw,
NetReceiveIOV *receive_iov, NetReceiveIOV *receive_iov,
NetCleanup *cleanup, NetCleanup *cleanup,
void *opaque); void *opaque);

2
tap-win32.c
View File

@ -680,7 +680,7 @@ int tap_win32_init(VLANState *vlan, const char *model,
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_TAP, s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_TAP,
vlan, NULL, model, name, vlan, NULL, model, name,
NULL, tap_receive, NULL, tap_receive,
NULL, tap_cleanup, s); NULL, NULL, tap_cleanup, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
"tap: ifname=%s", ifname); "tap: ifname=%s", ifname);