Deinit code of VNET and VNET-NIC device

[palacios.git] / palacios / include / palacios / vmm_vnet.h

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index b8a2d00..040006d 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -13,7 +13,7 @@
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
- *               Yuan Tang <ytang@northwestern.edu>
+ *        Yuan Tang <ytang@northwestern.edu>
  *
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
@@ -22,12 +22,16 @@
 #ifndef __VNET_H__
 #define __VNET_H__
 
-#ifdef __V3VEE__
-
 #include <palacios/vmm.h>
 
-typedef enum {MAC_ANY=0, MAC_NOT, MAC_NONE, MAC_ADDR} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
-typedef enum {LINK_INTERFACE=0, LINK_EDGE, LINK_ANY} link_type_t; //for 'type' and 'src_type' in struct routing
+#define MAC_ANY 0
+#define MAC_NOT 1
+#define MAC_NONE 2 
+#define MAC_ADDR 3
+
+#define LINK_INTERFACE 0
+#define LINK_EDGE 1 
+#define LINK_ANY 2
 
 #define VNET_HASH_SIZE 17
 #define ETHERNET_HEADER_LEN 14
@@ -48,11 +52,11 @@ struct v3_vnet_route {
     uint8_t src_mac_qual;
     uint8_t dst_mac_qual;
 
-    uint32_t dst_id; //link[dest] is the link to be used to send pkt
-    uint8_t dst_type; //EDGE|INTERFACE|ANY
+    uint32_t dst_id;
+    uint8_t dst_type;
  
     uint32_t src_id;
-    uint8_t src_type; //EDGE|INTERFACE|ANY
+    uint8_t src_type;
 } __attribute__((packed));
 
 
@@ -96,20 +100,25 @@ struct v3_vnet_bridge_ops {
                void * private_data);
 };
 
-int v3_init_vnet();    
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data);
-void v3_vnet_poll(struct v3_vm_info *vm);
+int v3_init_vnet(void);        
+void v3_deinit_vnet(void);
+
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data);
+
+void v3_vnet_poll(struct v3_vm_info * vm);
 
 int v3_vnet_add_route(struct v3_vnet_route route);
 int v3_vnet_add_bridge(struct v3_vm_info * vm,
-               struct v3_vnet_bridge_ops *ops,
+               struct v3_vnet_bridge_ops * ops,
                uint8_t type,
                void * priv_data);
-int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], 
-                   struct v3_vnet_dev_ops *ops,
+
+
+int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t mac[6], 
+                   struct v3_vnet_dev_ops * ops,
                    void * priv_data);
+int v3_vnet_del_dev(int dev_id);
 
-#endif
 
 #endif