From patchwork Wed Nov 25 18:49:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 39438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C14EDB7BD9 for ; Thu, 26 Nov 2009 06:41:07 +1100 (EST) Received: from localhost ([127.0.0.1]:43465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDNjd-0001El-B2 for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 14:41:05 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDMyk-0007Qf-PD for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDMya-0007JD-Cs for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:35 -0500 Received: from [199.232.76.173] (port=49008 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDMyZ-0007IF-G9 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21019) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDMyY-0000F3-Pq for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:27 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqPo5015253 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 13:52:26 -0500 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqN42030219; Wed, 25 Nov 2009 13:52:25 -0500 Received: by blaa.localdomain (Postfix, from userid 500) id 04AC6B0B2; Wed, 25 Nov 2009 18:49:42 +0000 (GMT) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2009 18:49:29 +0000 Message-Id: <1259174977-26212-37-git-send-email-markmc@redhat.com> In-Reply-To: <1259174977-26212-1-git-send-email-markmc@redhat.com> References: <1259174977-26212-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 36/44] net: remove qemu_new_vlan_client() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ... and VLANClientState::opaque and qemu_find_vlan_client(). All of these are now unused Signed-off-by: Mark McLoughlin --- net.c | 44 -------------------------------------------- net.h | 13 ------------- 2 files changed, 0 insertions(+), 57 deletions(-) diff --git a/net.c b/net.c index cca008a..d77320b 100644 --- a/net.c +++ b/net.c @@ -283,37 +283,6 @@ NICState *qemu_new_nic(NetClientInfo *info, return nic; } -VLANClientState *qemu_new_vlan_client(net_client_type type, - VLANState *vlan, - VLANClientState *peer, - const char *model, - const char *name, - NetCanReceive *can_receive, - NetReceive *receive, - NetReceive *receive_raw, - NetReceiveIOV *receive_iov, - NetCleanup *cleanup, - void *opaque) -{ - VLANClientState *ret; - NetClientInfo info; - - info.type = type; - info.size = sizeof(VLANClientState); - info.can_receive = can_receive; - info.receive = receive; - info.receive_raw = receive_raw; - info.receive_iov = receive_iov; - info.cleanup = cleanup; - info.link_status_changed = NULL; - - ret = qemu_new_net_client(&info, vlan, peer, model, name); - - ret->opaque = opaque; - - return ret; -} - void qemu_del_vlan_client(VLANClientState *vc) { if (vc->vlan) { @@ -337,19 +306,6 @@ void qemu_del_vlan_client(VLANClientState *vc) qemu_free(vc); } -VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque) -{ - VLANClientState *vc; - - QTAILQ_FOREACH(vc, &vlan->clients, next) { - if (vc->opaque == opaque) { - return vc; - } - } - - return NULL; -} - VLANClientState * qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, const char *client_str) diff --git a/net.h b/net.h index 4de20de..9185bcf 100644 --- a/net.h +++ b/net.h @@ -64,7 +64,6 @@ struct VLANClientState { NetCleanup *cleanup; LinkStatusChanged *link_status_changed; int link_down; - void *opaque; QTAILQ_ENTRY(VLANClientState) next; struct VLANState *vlan; VLANClientState *peer; @@ -101,19 +100,7 @@ NICState *qemu_new_nic(NetClientInfo *info, const char *model, const char *name, void *opaque); -VLANClientState *qemu_new_vlan_client(net_client_type type, - VLANState *vlan, - VLANClientState *peer, - const char *model, - const char *name, - NetCanReceive *can_receive, - NetReceive *receive, - NetReceive *receive_raw, - NetReceiveIOV *receive_iov, - NetCleanup *cleanup, - void *opaque); void qemu_del_vlan_client(VLANClientState *vc); -VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque); VLANClientState *qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, const char *client_str); int qemu_can_send_packet(VLANClientState *vc);