X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=0f8c79390b64b5b22d24cfe075b0c2d2be39d229;hb=94f67717b6461df514dc225ed84f03b44c44061b;hp=03d2298af3d8da990c35e5b041dd0047455ca5df;hpb=22dbf90548cb2ea56a9057a706e3da411dc1b57b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 03d2298..0f8c793 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -19,24 +19,27 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VNET_H__
-#define __VNET_H__
+#ifndef __VNET_CORE_H__
+#define __VNET_CORE_H__
 
 #include <palacios/vmm.h>
 #include <palacios/vmm_ethernet.h>
 
-#define MAC_ANY 	0
-#define MAC_NOT 	1
-#define MAC_NONE 	2 
-#define MAC_ADDR 	3
+#define MAC_NOSET 	0
+#define MAC_ANY 	11
+#define MAC_NOT 	12
+#define MAC_NONE 	13 
+#define MAC_ADDR 	14
 
-#define LINK_INTERFACE 	0
-#define LINK_EDGE 	1 
-#define LINK_ANY 	2
+#define LINK_NOSET	0
+#define LINK_INTERFACE 	11
+#define LINK_EDGE 	12 
+#define LINK_ANY 	13
 
 #define VNET_HASH_SIZE 	17
 
-//routing table entry
+extern int v3_vnet_debug;
+
 struct v3_vnet_route {
     uint8_t src_mac[ETH_ALEN];
     uint8_t dst_mac[ETH_ALEN];
@@ -44,10 +47,10 @@ struct v3_vnet_route {
     uint8_t src_mac_qual;
     uint8_t dst_mac_qual;
 
-    uint32_t dst_id;
+    int dst_id;
     uint8_t dst_type;
  
-    uint32_t src_id;
+    int src_id;
     uint8_t src_type;
 } __attribute__((packed));
 
@@ -73,6 +76,15 @@ struct v3_vnet_pkt {
     } __attribute__((packed));
 } __attribute__((packed));
 
+
+struct vnet_stat{
+    uint64_t tx_bytes;
+    uint32_t tx_pkts;
+    uint64_t rx_bytes;
+    uint32_t rx_pkts;
+};
+
+
 struct v3_vnet_bridge_ops {
     int (*input)(struct v3_vm_info * vm, 
 		struct v3_vnet_pkt * pkt,
@@ -89,33 +101,27 @@ int v3_vnet_add_bridge(struct v3_vm_info * vm,
 		uint8_t type,
 		void * priv_data);
 int v3_vnet_add_route(struct v3_vnet_route route);
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data);
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data, int synchronize);
+int v3_vnet_find_dev(uint8_t  * mac);
+int v3_vnet_stat(struct vnet_stat * stats);
 
 #ifdef __V3VEE__
 
-#define VMM_DRIVERN 	1
-#define GUEST_DRIVERN 	0
-
 struct v3_vnet_dev_ops {
     int (*input)(struct v3_vm_info * vm, 
 		struct v3_vnet_pkt * pkt, 
 		void * dev_data);
-    void (*poll) (struct v3_vm_info * vm, void * dev_data);
-
-    void (*start_tx)(void * dev_data);
-    void (*stop_tx)(void * dev_data);
 };
 
 int v3_init_vnet(void);	
 void v3_deinit_vnet(void);
 
-void v3_vnet_poll(struct v3_vm_info * vm);
-
 int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t * mac, 
 		    struct v3_vnet_dev_ops * ops,
 		    void * priv_data);
 int v3_vnet_del_dev(int dev_id);
 
+
 #endif
 
 #endif