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

net: allow NICs to be connected to netdevs 

Introduce a 'peer' member to VLANClientState as an alternative
to a vlan. The idea being that packets are transfered directly
from peer clients rather than going through a vlan.

Patchworks-ID: 35516
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-10-08 19:58:30 +01:00 committed by Anthony Liguori
parent 5869c4d515
commit 283c7c63f5
10 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/dp8393x.c
View File

@ -889,7 +889,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 = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev,
nd->model, nd->name,
nic_can_receive, nic_receive, NULL, nic_can_receive, nic_receive, NULL,
nic_cleanup, s); nic_cleanup, s);

3
hw/etraxfs_eth.c
View File

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

3
hw/mcf_fec.c
View File

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

5
hw/mipsnet.c
View File

@ -262,8 +262,9 @@ 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 && nd->vlan) { if (nd) {
s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev,
nd->model, nd->name,
mipsnet_can_receive, mipsnet_receive, mipsnet_can_receive, mipsnet_receive,
NULL, mipsnet_cleanup, s); NULL, mipsnet_cleanup, s);
} else { } else {

6
hw/qdev.c
View File

@ -370,8 +370,10 @@ VLANClientState *qdev_get_vlan_client(DeviceState *dev,
{ {
NICInfo *nd = dev->nd; NICInfo *nd = dev->nd;
assert(nd); assert(nd);
nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, can_receive, nd->vc = qemu_new_vlan_client(nd->vlan, nd->netdev,
receive, receive_iov, cleanup, opaque); nd->model, nd->name,
can_receive, receive, receive_iov,
cleanup, opaque);
return nd->vc; return nd->vc;
} }

3
hw/usb-net.c
View File

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

2
hw/xen_nic.c
View File

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

35
net.c
View File

@ -302,6 +302,7 @@ static char *assign_name(VLANClientState *vc1, const char *model)
} }
VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *qemu_new_vlan_client(VLANState *vlan,
VLANClientState *peer,
const char *model, const char *model,
const char *name, const char *name,
NetCanReceive *can_receive, NetCanReceive *can_receive,
@ -326,9 +327,14 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
vc->opaque = opaque; vc->opaque = opaque;
if (vlan) { if (vlan) {
assert(!peer);
vc->vlan = vlan; vc->vlan = vlan;
QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next); QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
} else { } else {
if (peer) {
vc->peer = peer;
peer->peer = vc;
}
QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next);
} }
@ -341,6 +347,9 @@ void qemu_del_vlan_client(VLANClientState *vc)
QTAILQ_REMOVE(&vc->vlan->clients, vc, next); QTAILQ_REMOVE(&vc->vlan->clients, vc, next);
} else { } else {
QTAILQ_REMOVE(&non_vlan_clients, vc, next); QTAILQ_REMOVE(&non_vlan_clients, vc, next);
if (vc->peer) {
vc->peer->peer = NULL;
}
} }
if (vc->cleanup) { if (vc->cleanup) {
@ -866,7 +875,8 @@ static int net_slirp_init(VLANState *vlan, const char *model,
} }
#endif #endif
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, slirp_receive, NULL, s->vc = qemu_new_vlan_client(vlan, NULL, model, name, NULL,
slirp_receive, 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');
@ -1426,8 +1436,9 @@ 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, NULL, tap_receive, s->vc = qemu_new_vlan_client(vlan, NULL, model, name, NULL,
tap_receive_iov, tap_cleanup, s); tap_receive, tap_receive_iov,
tap_cleanup, s);
tap_read_poll(s, 1); tap_read_poll(s, 1);
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;
@ -1760,8 +1771,9 @@ 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, NULL, vde_receive, s->vc = qemu_new_vlan_client(vlan, NULL, model, name, NULL,
NULL, vde_cleanup, s); vde_receive, 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",
sock, vde_datafd(s->vde)); sock, vde_datafd(s->vde));
@ -1999,8 +2011,9 @@ 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, NULL, net_socket_receive_dgram, s->vc = qemu_new_vlan_client(vlan, NULL, model, name, NULL,
NULL, net_socket_cleanup, s); net_socket_receive_dgram, 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);
/* mcast: save bound address as dst */ /* mcast: save bound address as dst */
@ -2027,8 +2040,9 @@ 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, NULL, net_socket_receive, s->vc = qemu_new_vlan_client(vlan, NULL, model, name, NULL,
NULL, net_socket_cleanup, s); net_socket_receive, 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);
if (is_connected) { if (is_connected) {
@ -2308,7 +2322,8 @@ static int net_dump_init(VLANState *vlan, const char *device,
return -1; return -1;
} }
s->pcap_vc = qemu_new_vlan_client(vlan, device, name, NULL, dump_receive, NULL, s->pcap_vc = qemu_new_vlan_client(vlan, NULL, 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);

2
net.h
View File

@ -28,6 +28,7 @@ struct VLANClientState {
void *opaque; void *opaque;
QTAILQ_ENTRY(VLANClientState) next; QTAILQ_ENTRY(VLANClientState) next;
struct VLANState *vlan; struct VLANState *vlan;
VLANClientState *peer;
char *model; char *model;
char *name; char *name;
char info_str[256]; char info_str[256];
@ -56,6 +57,7 @@ struct VLANState {
VLANState *qemu_find_vlan(int id, int allocate); VLANState *qemu_find_vlan(int id, int allocate);
VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *qemu_new_vlan_client(VLANState *vlan,
VLANClientState *peer,
const char *model, const char *model,
const char *name, const char *name,
NetCanReceive *can_receive, NetCanReceive *can_receive,

3
tap-win32.c
View File

@ -677,7 +677,8 @@ int tap_win32_init(VLANState *vlan, const char *model,
return -1; return -1;
} }
s->vc = qemu_new_vlan_client(vlan, model, name, NULL, tap_receive, s->vc = qemu_new_vlan_client(vlan, NULL, 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),