From patchwork Wed Jun 20 09:42:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 165988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F3EE2B6FD4 for ; Wed, 20 Jun 2012 20:32:26 +1000 (EST) Received: from localhost ([::1]:45928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShID2-00063k-T2 for incoming@patchwork.ozlabs.org; Wed, 20 Jun 2012 06:32:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHRY-0002A3-UN for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:43:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ShHRS-0002MZ-4F for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:43:20 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:47958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHRR-0002MF-P6 for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:43:14 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Jun 2012 05:43:12 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 20 Jun 2012 05:43:10 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id D8D2A6E804A for ; Wed, 20 Jun 2012 05:43:09 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5K9h9Re36175948 for ; Wed, 20 Jun 2012 05:43:09 -0400 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 q5K9h9oj010479 for ; Wed, 20 Jun 2012 06:43:09 -0300 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.27]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q5K9h5Tm010048; Wed, 20 Jun 2012 06:43:06 -0300 Received: by us.ibm.com (sSMTP sendmail emulation); Wed, 20 Jun 2012 17:43:04 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Wed, 20 Jun 2012 17:42:13 +0800 Message-Id: <1340185341-30803-10-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> References: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12062009-1976-0000-0000-00000E599EA0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.146 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v6 09/17] net: Rename non_vlan_clients to net_clients X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 73325b0..d3a685e 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)) { @@ -1099,7 +1099,7 @@ void do_info_network(Monitor *mon) net_client_type type; monitor_printf(mon, "Devices not on any VLAN:\n"); - 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) { @@ -1152,7 +1152,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); } } @@ -1176,7 +1176,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", @@ -1240,7 +1240,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;