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

net: allow clients not associated with a vlan 

Allow net clients to be created which are not connected to any vlan.

This is needed by Gerd in order to allow adding -device nic, where
the absence of a vlan parameter will not imply vlan=0. Also needed
to allow adding a -netdevice option which doesn't connect the backend
to a vlan.

Patchworks-ID: 35513
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
master
Mark McLoughlin 2009-10-08 19:58:24 +01:00 committed by Anthony Liguori
parent 5610c3aaf4
commit d80b9fc628
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net.c
View File

@ -324,15 +324,19 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
vc->cleanup = cleanup; vc->cleanup = cleanup;
vc->opaque = opaque; vc->opaque = opaque;
vc->vlan = vlan; if (vlan) {
QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next); vc->vlan = vlan;
QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
}
return vc; return vc;
} }
void qemu_del_vlan_client(VLANClientState *vc) void qemu_del_vlan_client(VLANClientState *vc)
{ {
QTAILQ_REMOVE(&vc->vlan->clients, vc, next); if (vc->vlan) {
QTAILQ_REMOVE(&vc->vlan->clients, vc, next);
}
if (vc->cleanup) { if (vc->cleanup) {
vc->cleanup(vc); vc->cleanup(vc);
@ -387,6 +391,10 @@ int qemu_can_send_packet(VLANClientState *sender)
VLANState *vlan = sender->vlan; VLANState *vlan = sender->vlan;
VLANClientState *vc; VLANClientState *vc;
if (!sender->vlan) {
return 1;
}
QTAILQ_FOREACH(vc, &vlan->clients, next) { QTAILQ_FOREACH(vc, &vlan->clients, next) {
if (vc == sender) { if (vc == sender) {
continue; continue;
@ -434,6 +442,9 @@ void qemu_purge_queued_packets(VLANClientState *vc)
{ {
VLANPacket *packet, *next; VLANPacket *packet, *next;
if (!vc->vlan)
return;
QTAILQ_FOREACH_SAFE(packet, &vc->vlan->send_queue, entry, next) { QTAILQ_FOREACH_SAFE(packet, &vc->vlan->send_queue, entry, next) {
if (packet->sender == vc) { if (packet->sender == vc) {
QTAILQ_REMOVE(&vc->vlan->send_queue, packet, entry); QTAILQ_REMOVE(&vc->vlan->send_queue, packet, entry);
@ -444,6 +455,9 @@ void qemu_purge_queued_packets(VLANClientState *vc)
void qemu_flush_queued_packets(VLANClientState *vc) void qemu_flush_queued_packets(VLANClientState *vc)
{ {
if (!vc->vlan)
return;
while (!QTAILQ_EMPTY(&vc->vlan->send_queue)) { while (!QTAILQ_EMPTY(&vc->vlan->send_queue)) {
VLANPacket *packet; VLANPacket *packet;
int ret; int ret;
@ -485,12 +499,12 @@ ssize_t qemu_send_packet_async(VLANClientState *sender,
{ {
int ret; int ret;
if (sender->link_down) { if (sender->link_down || !sender->vlan) {
return size; return size;
} }
#ifdef DEBUG_NET #ifdef DEBUG_NET
printf("vlan %d send:\n", sender->vlan->id); printf("qemu_send_packet_async:\n");
hex_dump(stdout, buf, size); hex_dump(stdout, buf, size);
#endif #endif
@ -610,7 +624,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
{ {
int ret; int ret;
if (sender->link_down) { if (sender->link_down || !sender->vlan) {
return calc_iov_length(iov, iovcnt); return calc_iov_length(iov, iovcnt);
} }
@ -3020,7 +3034,9 @@ int net_client_init(Monitor *mon, QemuOpts *opts)
void net_client_uninit(NICInfo *nd) void net_client_uninit(NICInfo *nd)
{ {
nd->vlan->nb_guest_devs--; if (nd->vlan) {
nd->vlan->nb_guest_devs--;
}
nb_nics--; nb_nics--;
qemu_free(nd->model); qemu_free(nd->model);