[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan |
Date: |
Thu, 8 Oct 2009 19:58:24 +0100 |
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.
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/net.c b/net.c
index 35547a5..6cd63aa 100644
--- a/net.c
+++ b/net.c
@@ -324,15 +324,19 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
vc->cleanup = cleanup;
vc->opaque = opaque;
- vc->vlan = vlan;
- QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
+ if (vlan) {
+ vc->vlan = vlan;
+ QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
+ }
return 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) {
vc->cleanup(vc);
@@ -387,6 +391,10 @@ int qemu_can_send_packet(VLANClientState *sender)
VLANState *vlan = sender->vlan;
VLANClientState *vc;
+ if (!sender->vlan) {
+ return 1;
+ }
+
QTAILQ_FOREACH(vc, &vlan->clients, next) {
if (vc == sender) {
continue;
@@ -434,6 +442,9 @@ void qemu_purge_queued_packets(VLANClientState *vc)
{
VLANPacket *packet, *next;
+ if (!vc->vlan)
+ return;
+
QTAILQ_FOREACH_SAFE(packet, &vc->vlan->send_queue, entry, next) {
if (packet->sender == vc) {
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)
{
+ if (!vc->vlan)
+ return;
+
while (!QTAILQ_EMPTY(&vc->vlan->send_queue)) {
VLANPacket *packet;
int ret;
@@ -485,12 +499,12 @@ ssize_t qemu_send_packet_async(VLANClientState *sender,
{
int ret;
- if (sender->link_down) {
+ if (sender->link_down || !sender->vlan) {
return size;
}
#ifdef DEBUG_NET
- printf("vlan %d send:\n", sender->vlan->id);
+ printf("qemu_send_packet_async:\n");
hex_dump(stdout, buf, size);
#endif
@@ -610,7 +624,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
{
int ret;
- if (sender->link_down) {
+ if (sender->link_down || !sender->vlan) {
return calc_iov_length(iov, iovcnt);
}
@@ -3020,7 +3034,9 @@ int net_client_init(Monitor *mon, QemuOpts *opts)
void net_client_uninit(NICInfo *nd)
{
- nd->vlan->nb_guest_devs--;
+ if (nd->vlan) {
+ nd->vlan->nb_guest_devs--;
+ }
nb_nics--;
qemu_free(nd->model);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/16] Add a -netdev option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 04/16] net: remove unused qemu_handler_true(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 09/16] net: add QemuOptsList arg to net_client_parse(), Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 10/16] net: add -netdev option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 07/16] net: use qtailq for vlan and client lists, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 01/16] slirp: fix !CONFIG_SLIRP compilation, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 03/16] net: pass monitor handle to client init functions, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 15/16] net: refactor packet queueing code, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 06/16] net: remove id field from NICInfo, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 05/16] net: handle id= parameter for -net, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 14/16] net: allow NICs to be connected to netdevs, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 11/16] net: handle -netdevice options, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 12/16] net: maintain a list of vlan-less clients, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 02/16] hotplug: safely iterate bus's sibling list while removing a device, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 16/16] net: add queue for peer-to-peer packet forwarding, Mark McLoughlin, 2009/10/08
- Re: [Qemu-devel] [PATCH 00/16] Add a -netdev option, Stefan Weil, 2009/10/08