From patchwork Fri Jul 20 12:01:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172216 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 916A92C0394 for ; Fri, 20 Jul 2012 22:21:20 +1000 (EST) Received: from localhost ([::1]:57895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBvY-0006Qh-3B for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 08:03:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBuZ-0004Gp-Ck for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsBuX-0003Xr-Qb for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:23 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:57648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsBuX-0003Xa-1d for qemu-devel@nongnu.org; Fri, 20 Jul 2012 08:02:21 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Jul 2012 13:02:19 +0100 Received: from d06nrmr1407.portsmouth.uk.ibm.com (9.149.38.185) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Jul 2012 13:02:04 +0100 Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6KC23cv2437276 for ; Fri, 20 Jul 2012 13:02:03 +0100 Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6KC22sM002523 for ; Fri, 20 Jul 2012 06:02:03 -0600 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.145]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6KC22Nb002510; Fri, 20 Jul 2012 06:02:02 -0600 From: Stefan Hajnoczi To: Date: Fri, 20 Jul 2012 13:01:38 +0100 Message-Id: <1342785709-3152-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342785709-3152-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072012-3548-0000-0000-0000029AB830 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.112 Cc: Paolo Bonzini , Zhi Yong Wu , lersek@redhat.com, Stefan Hajnoczi , Zhi Yong Wu Subject: [Qemu-devel] [PATCH 05/16] net: Drop vlan argument to qemu_new_net_client() 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 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 Reviewed-by: Laszlo Ersek --- 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 379d701..7615819 100644 --- a/net.c +++ b/net.c @@ -198,7 +198,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) @@ -217,22 +216,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; } @@ -249,7 +242,7 @@ NICState *qemu_new_nic(NetClientInfo *info, assert(info->type == NET_CLIENT_OPTIONS_KIND_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 b0b8c7a..e9c92b2 100644 --- a/net.h +++ b/net.h @@ -79,7 +79,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 4aae25a..370ac8d 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 5f537a9..5d6bbf6 100644 --- a/net/hub.c +++ b/net/hub.c @@ -129,7 +129,7 @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name) name = default_name; } - 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 c753b02..2e2e178 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -239,7 +239,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 cac3922..dc6951b 100644 --- a/net/socket.c +++ b/net/socket.c @@ -287,7 +287,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)", @@ -331,7 +331,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 0e3b883..c4c98aa 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 43c3fcd..10ae98d 100644 --- a/net/tap.c +++ b/net/tap.c @@ -331,7 +331,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 302a022..a1480d7 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));