Patchwork [36/44] net: remove qemu_new_vlan_client()

login
register
mail settings
Submitter Mark McLoughlin
Date Nov. 25, 2009, 6:49 p.m.
Message ID <1259174977-26212-37-git-send-email-markmc@redhat.com>
Download mbox | patch
Permalink /patch/39438/
State New
Headers show

Comments

Mark McLoughlin - Nov. 25, 2009, 6:49 p.m.
... and VLANClientState::opaque and qemu_find_vlan_client().

All of these are now unused

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 net.c |   44 --------------------------------------------
 net.h |   13 -------------
 2 files changed, 0 insertions(+), 57 deletions(-)

Patch

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);