From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vhM-0007OW-Ch for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5vhF-00086m-MR for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:15 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:56537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vhF-00086W-Hs for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:09 -0500 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Mar 2012 04:01:07 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 72F086E804D for ; Fri, 9 Mar 2012 04:01:05 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q29915Fj282116 for ; Fri, 9 Mar 2012 04:01:05 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q29914g0032075 for ; Fri, 9 Mar 2012 06:01:05 -0300 From: zwu.kernel@gmail.com Date: Fri, 9 Mar 2012 17:00:18 +0800 Message-Id: <1331283625-26439-6-git-send-email-zwu.kernel@gmail.com> In-Reply-To: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> References: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> Subject: [Qemu-devel] [PATCH v1 05/12] net: Drop vlan argument to qemu_new_net_client() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, linuxram@us.ibm.com, zwu.kernel@gmail.com, ryanh@us.ibm.com, luowenj@cn.ibm.com, Zhi Yong Wu 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 67b09e4..b287ce8 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 319c3bb..8502a8a 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 88270b0..fc305ac 100644 --- a/net/hub.c +++ b/net/hub.c @@ -128,7 +128,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 eb5f455..31c4d34 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