From mboxrd@z Thu Jan 1 00:00:00 1970 From: zwu.kernel@gmail.com Subject: [PATCH v3 05/16] net: Drop vlan argument to qemu_new_net_client() Date: Fri, 25 May 2012 01:59:11 +0800 Message-ID: <1337882362-20100-6-git-send-email-zwu.kernel@gmail.com> References: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com To: qemu-devel@nongnu.org Return-path: In-Reply-To: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org From: Stefan Hajnoczi Since hubs are now used to implement the 'vlan' feature and the vlan argument is always NULL, remove the argument entirely and update all net clients that use qemu_new_net_client(). Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- net.c | 27 ++++++++++----------------- net.h | 1 - net/dump.c | 2 +- net/hub.c | 2 +- net/slirp.c | 2 +- net/socket.c | 4 ++-- net/tap-win32.c | 2 +- net/tap.c | 2 +- net/vde.c | 2 +- 9 files changed, 18 insertions(+), 26 deletions(-) diff --git a/net.c b/net.c index 88b9e1f..96252f9 100644 --- a/net.c +++ b/net.c @@ -194,7 +194,6 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, void *opaque); VLANClientState *qemu_new_net_client(NetClientInfo *info, - VLANState *vlan, VLANClientState *peer, const char *model, const char *name) @@ -213,22 +212,16 @@ VLANClientState *qemu_new_net_client(NetClientInfo *info, vc->name = assign_name(vc, model); } - if (vlan) { - assert(!peer); - vc->vlan = vlan; - QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next); - } else { - if (peer) { - assert(!peer->peer); - vc->peer = peer; - peer->peer = vc; - } - QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); - - vc->send_queue = qemu_new_net_queue(qemu_deliver_packet, - qemu_deliver_packet_iov, - vc); + if (peer) { + assert(!peer->peer); + vc->peer = peer; + peer->peer = vc; } + QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); + + vc->send_queue = qemu_new_net_queue(qemu_deliver_packet, + qemu_deliver_packet_iov, + vc); return vc; } @@ -245,7 +238,7 @@ NICState *qemu_new_nic(NetClientInfo *info, assert(info->type == NET_CLIENT_TYPE_NIC); assert(info->size >= sizeof(NICState)); - nc = qemu_new_net_client(info, conf->vlan, conf->peer, model, name); + nc = qemu_new_net_client(info, conf->peer, model, name); nic = DO_UPCAST(NICState, nc, nc); nic->conf = conf; diff --git a/net.h b/net.h index 50c55ad..d3d6e4c 100644 --- a/net.h +++ b/net.h @@ -92,7 +92,6 @@ struct VLANState { VLANState *qemu_find_vlan(int id, int allocate); VLANClientState *qemu_find_netdev(const char *id); VLANClientState *qemu_new_net_client(NetClientInfo *info, - VLANState *vlan, VLANClientState *peer, const char *model, const char *name); diff --git a/net/dump.c b/net/dump.c index 37cec3c..621f4e7 100644 --- a/net/dump.c +++ b/net/dump.c @@ -129,7 +129,7 @@ static int net_dump_init(VLANClientState *peer, const char *device, return -1; } - nc = qemu_new_net_client(&net_dump_info, NULL, peer, device, name); + nc = qemu_new_net_client(&net_dump_info, peer, device, name); snprintf(nc->info_str, sizeof(nc->info_str), "dump to %s (len=%d)", filename, len); diff --git a/net/hub.c b/net/hub.c index 19c1169..af3de9c 100644 --- a/net/hub.c +++ b/net/hub.c @@ -124,7 +124,7 @@ static NetHubPort *net_hub_port_new(NetHub *hub) snprintf(name, sizeof name, "hub%uport%u", hub->id, id); - nc = qemu_new_net_client(&net_hub_port_info, NULL, NULL, "hub", name); + nc = qemu_new_net_client(&net_hub_port_info, NULL, "hub", name); port = DO_UPCAST(NetHubPort, nc, nc); port->id = id; port->hub = hub; diff --git a/net/slirp.c b/net/slirp.c index edb4621..5ed7036 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -238,7 +238,7 @@ static int net_slirp_init(VLANClientState *peer, const char *model, } #endif - nc = qemu_new_net_client(&net_slirp_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_slirp_info, peer, model, name); snprintf(nc->info_str, sizeof(nc->info_str), "net=%s,restrict=%s", inet_ntoa(net), diff --git a/net/socket.c b/net/socket.c index ed28cbd..bf7a793 100644 --- a/net/socket.c +++ b/net/socket.c @@ -286,7 +286,7 @@ static NetSocketState *net_socket_fd_init_dgram(VLANClientState *peer, } } - nc = qemu_new_net_client(&net_dgram_socket_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name); snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d (%s mcast=%s:%d)", @@ -330,7 +330,7 @@ static NetSocketState *net_socket_fd_init_stream(VLANClientState *peer, VLANClientState *nc; NetSocketState *s; - nc = qemu_new_net_client(&net_socket_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_socket_info, peer, model, name); snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd); diff --git a/net/tap-win32.c b/net/tap-win32.c index 2436c26..c1f90c7 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -685,7 +685,7 @@ static int tap_win32_init(VLANClientState *peer, const char *model, return -1; } - nc = qemu_new_net_client(&net_tap_win32_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_tap_win32_info, peer, model, name); s = DO_UPCAST(TAPState, nc, nc); diff --git a/net/tap.c b/net/tap.c index 8855c57..3a68d7e 100644 --- a/net/tap.c +++ b/net/tap.c @@ -330,7 +330,7 @@ static TAPState *net_tap_fd_init(VLANClientState *peer, VLANClientState *nc; TAPState *s; - nc = qemu_new_net_client(&net_tap_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_tap_info, peer, model, name); s = DO_UPCAST(TAPState, nc, nc); diff --git a/net/vde.c b/net/vde.c index d998daf..24d12d4 100644 --- a/net/vde.c +++ b/net/vde.c @@ -96,7 +96,7 @@ static int net_vde_init(VLANClientState *peer, const char *model, return -1; } - nc = qemu_new_net_client(&net_vde_info, NULL, peer, model, name); + nc = qemu_new_net_client(&net_vde_info, peer, model, name); snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d", sock, vde_datafd(vde)); -- 1.7.6