From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7NxV-0006QB-FZ for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7NxP-0004Ur-Cv for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:23:57 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:45832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7NxO-0004MY-Ri for qemu-devel@nongnu.org; Tue, 13 Mar 2012 05:23:51 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Mar 2012 09:21:08 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2D9NMYk1425598 for ; Tue, 13 Mar 2012 20:23:22 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2D9NMBQ026969 for ; Tue, 13 Mar 2012 20:23:22 +1100 Message-ID: <4F5F1206.8080300@linux.vnet.ibm.com> Date: Tue, 13 Mar 2012 17:23:18 +0800 From: Mark Wu MIME-Version: 1.0 References: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> <1331283625-26439-10-git-send-email-zwu.kernel@gmail.com> In-Reply-To: <1331283625-26439-10-git-send-email-zwu.kernel@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 09/12] net: Rename non_vlan_clients to net_clients List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zwu.kernel@gmail.com Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, linuxram@us.ibm.com, qemu-devel@nongnu.org, ryanh@us.ibm.com, luowenj@cn.ibm.com, Zhi Yong Wu On 03/09/2012 05:00 PM, zwu.kernel@gmail.com wrote: > From: Stefan Hajnoczi > > There is no longer a distinction between vlan clients and non-vlan > clients in the net core. The net core only knows about point-to-point > clients which are connected to a peer. It's time to rename the global > list of net clients since it no longer refers to vlans at all. > > Signed-off-by: Stefan Hajnoczi > Signed-off-by: Zhi Yong Wu > --- > net.c | 20 ++++++++++---------- > 1 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/net.c b/net.c > index e09b7a7..a510e27 100644 > --- a/net.c > +++ b/net.c > @@ -44,7 +44,7 @@ > # define CONFIG_NET_BRIDGE > #endif > > -static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; > +static QTAILQ_HEAD(, VLANClientState) net_clients; > > int default_net = 1; > > @@ -165,7 +165,7 @@ static char *assign_name(VLANClientState *vc1, const char *model) > char buf[256]; > int id = 0; > > - QTAILQ_FOREACH(vc,&non_vlan_clients, next) { > + QTAILQ_FOREACH(vc,&net_clients, next) { > if (vc == vc1) { > continue; > } > @@ -216,7 +216,7 @@ VLANClientState *qemu_new_net_client(NetClientInfo *info, > vc->peer = peer; > peer->peer = vc; > } > - QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); > + QTAILQ_INSERT_TAIL(&net_clients, vc, next); > > vc->send_queue = qemu_new_net_queue(qemu_deliver_packet, > qemu_deliver_packet_iov, > @@ -248,7 +248,7 @@ NICState *qemu_new_nic(NetClientInfo *info, > > static void qemu_cleanup_vlan_client(VLANClientState *vc) > { > - QTAILQ_REMOVE(&non_vlan_clients, vc, next); > + QTAILQ_REMOVE(&net_clients, vc, next); > > if (vc->info->cleanup) { > vc->info->cleanup(vc); > @@ -302,7 +302,7 @@ void qemu_foreach_nic(qemu_nic_foreach func, void *opaque) > { > VLANClientState *nc; > > - QTAILQ_FOREACH(nc,&non_vlan_clients, next) { > + QTAILQ_FOREACH(nc,&net_clients, next) { > if (nc->info->type == NET_CLIENT_TYPE_NIC) { > func(DO_UPCAST(NICState, nc, nc), opaque); > } > @@ -467,7 +467,7 @@ VLANClientState *qemu_find_netdev(const char *id) > { > VLANClientState *vc; > > - QTAILQ_FOREACH(vc,&non_vlan_clients, next) { > + QTAILQ_FOREACH(vc,&net_clients, next) { > if (vc->info->type == NET_CLIENT_TYPE_NIC) > continue; > if (!strcmp(vc->name, id)) { > @@ -1080,7 +1080,7 @@ void do_info_network(Monitor *mon) > net_client_type type; > > monitor_printf(mon, "Devices not on any VLAN:\n"); ^^^^^^^^^^^^ I think we should remove the line above. The output of "info network" (qemu) info network Devices not on any VLAN: e1000.0: type=nic,model=e1000,macaddr=52:54:00:12:34:56 \ hub0port1: type=(null), hub 0 port 1 peer e1000.0 port 0 peer bridge.0 The original output: (qemu) info network VLAN 0 devices: bridge.0: type=tap,helper=./qemu-bridge-helper,br=virbr0 e1000.0: type=nic,model=e1000,macaddr=52:54:00:12:34:56 Devices not on any VLAN: > - QTAILQ_FOREACH(vc,&non_vlan_clients, next) { > + QTAILQ_FOREACH(vc,&net_clients, next) { > peer = vc->peer; > type = vc->info->type; > if (!peer || type == NET_CLIENT_TYPE_NIC) { > @@ -1133,7 +1133,7 @@ void net_cleanup(void) > { > VLANClientState *vc, *next_vc; > > - QTAILQ_FOREACH_SAFE(vc,&non_vlan_clients, next, next_vc) { > + QTAILQ_FOREACH_SAFE(vc,&net_clients, next, next_vc) { > qemu_del_vlan_client(vc); > } > } > @@ -1157,7 +1157,7 @@ void net_check_clients(void) > > net_hub_check_clients(); > > - QTAILQ_FOREACH(vc,&non_vlan_clients, next) { > + QTAILQ_FOREACH(vc,&net_clients, next) { > if (!vc->peer) { > fprintf(stderr, "Warning: %s %s has no peer\n", > vc->info->type == NET_CLIENT_TYPE_NIC ? "nic" : "netdev", > @@ -1204,7 +1204,7 @@ int net_init_clients(void) > #endif > } > > - QTAILQ_INIT(&non_vlan_clients); > + QTAILQ_INIT(&net_clients); > > if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1) > return -1;