[Qemu-devel] [6600] qemu: add net_client_uninit / qemu_find_vlan_client (Marcelo Tosatti )

[Qemu-devel] [6600] qemu: add net_client_uninit / qemu_find_vlan_client (Marcelo Tosatti )

[Anthony Liguori]

Revision: 6600
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6600
Author:   aliguori
Date:     2009-02-11 15:20:51 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
qemu: add net_client_uninit / qemu_find_vlan_client (Marcelo Tosatti)

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/net.c
    trunk/net.h

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2009-02-11 15:20:46 UTC (rev 6599)
+++ trunk/net.c	2009-02-11 15:20:51 UTC (rev 6600)
@@ -366,6 +366,19 @@
             pvc = &(*pvc)->next;
 }
 
+VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque)
+{
+    VLANClientState **pvc = &vlan->first_client;
+
+    while (*pvc != NULL)
+        if ((*pvc)->opaque == opaque)
+            return *pvc;
+        else
+            pvc = &(*pvc)->next;
+
+    return NULL;
+}
+
 int qemu_can_send_packet(VLANClientState *vc1)
 {
     VLANState *vlan = vc1->vlan;
@@ -1713,6 +1726,14 @@
     return ret;
 }
 
+void net_client_uninit(NICInfo *nd)
+{
+    nd->vlan->nb_guest_devs--;
+    nb_nics--;
+    nd->used = 0;
+    free((void *)nd->model);
+}
+
 int net_client_parse(const char *str)
 {
     const char *p;

Modified: trunk/net.h
===================================================================
--- trunk/net.h	2009-02-11 15:20:46 UTC (rev 6599)
+++ trunk/net.h	2009-02-11 15:20:51 UTC (rev 6600)
@@ -42,6 +42,7 @@
                                       IOCanRWHandler *fd_can_read,
                                       void *opaque);
 void qemu_del_vlan_client(VLANClientState *vc);
+VLANClientState *qemu_find_vlan_client(VLANState *vlan, void *opaque);
 int qemu_can_send_packet(VLANClientState *vc);
 ssize_t qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov,
                           int iovcnt);
@@ -94,6 +95,7 @@
 
 /* from net.c */
 int net_client_init(const char *device, const char *p);
+void net_client_uninit(NICInfo *nd);
 int net_client_parse(const char *str);
 void net_slirp_smb(const char *exported_dir);
 void net_slirp_redir(const char *redir_str);