X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fvnet%2Fvnet.h;h=b123d5926f1f392d7d975452b4254b62edc4e974;hb=33a5c8f83ba79ece7a76cf7c4d53bdeae1e30f07;hp=0f8c79390b64b5b22d24cfe075b0c2d2be39d229;hpb=d12cdf5b213b2b51d525914a852ceacd2c198b5a;p=palacios.git

diff --git a/palacios/include/vnet/vnet.h b/palacios/include/vnet/vnet.h
index 0f8c793..b123d59 100644
--- a/palacios/include/vnet/vnet.h
+++ b/palacios/include/vnet/vnet.h
@@ -1,3 +1,4 @@
+
 /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
@@ -19,11 +20,13 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VNET_CORE_H__
-#define __VNET_CORE_H__
+#ifndef __VNET_H__
+#define __VNET_H__
 
-#include <palacios/vmm.h>
 #include <palacios/vmm_ethernet.h>
+#include <vnet/vnet_base.h>
+#include <vnet/vnet_host.h>
+#include <vnet/vnet_vmm.h>
 
 #define MAC_NOSET 	0
 #define MAC_ANY 	11
@@ -38,8 +41,6 @@
 
 #define VNET_HASH_SIZE 	17
 
-extern int v3_vnet_debug;
-
 struct v3_vnet_route {
     uint8_t src_mac[ETH_ALEN];
     uint8_t dst_mac[ETH_ALEN];
@@ -87,21 +88,26 @@ struct vnet_stat{
 
 struct v3_vnet_bridge_ops {
     int (*input)(struct v3_vm_info * vm, 
-		struct v3_vnet_pkt * pkt,
-		void * private_data);
+		 struct v3_vnet_pkt * pkt,
+		 void * private_data);
     void (*poll)(struct v3_vm_info * vm,  
-		void * private_data);
+		 void * private_data);
 };
 
 #define HOST_LNX_BRIDGE 1
 #define CTL_VM_BRIDGE 	2
 
 int v3_vnet_add_bridge(struct v3_vm_info * vm,
-		struct v3_vnet_bridge_ops * ops,
-		uint8_t type,
-		void * priv_data);
+		       struct v3_vnet_bridge_ops * ops,
+		       uint8_t type,
+		       void * priv_data);
+
+void v3_vnet_del_bridge(uint8_t type);
+
 int v3_vnet_add_route(struct v3_vnet_route route);
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data, int synchronize);
+void v3_vnet_del_route(uint32_t route_idx);
+
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data);
 int v3_vnet_find_dev(uint8_t  * mac);
 int v3_vnet_stat(struct vnet_stat * stats);
 
@@ -109,7 +115,12 @@ int v3_vnet_stat(struct vnet_stat * stats);
 
 struct v3_vnet_dev_ops {
     int (*input)(struct v3_vm_info * vm, 
-		struct v3_vnet_pkt * pkt, 
+		 struct v3_vnet_pkt * pkt, 
+		 void * dev_data);
+
+    /* return >0 means there are more pkts in the queue to be sent */
+    int (*poll)(struct v3_vm_info * vm,
+		int quote,
 		void * dev_data);
 };
 
@@ -117,7 +128,7 @@ int v3_init_vnet(void);
 void v3_deinit_vnet(void);
 
 int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t * mac, 
-		    struct v3_vnet_dev_ops * ops,
+		    struct v3_vnet_dev_ops * ops, int quote, int poll_state,
 		    void * priv_data);
 int v3_vnet_del_dev(int dev_id);