X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=1750fffbfdbd67879430166d5616079760f76e5f;hb=0a7690f54cb5bda83780dac26ce433ad24b1d766;hp=b8a2d0008a91c640c0e43240076c6afdff6203f2;hpb=b6844af8df260e609bee254bbe58128d0e8fc010;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index b8a2d00..1750fff 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -22,37 +22,35 @@
 #ifndef __VNET_H__
 #define __VNET_H__
 
-#ifdef __V3VEE__
-
 #include <palacios/vmm.h>
+#include <palacios/vmm_ethernet.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_NOSET 	0
+#define MAC_ANY 	11
+#define MAC_NOT 	12
+#define MAC_NONE 	13 
+#define MAC_ADDR 	14
 
-#define VNET_HASH_SIZE 17
-#define ETHERNET_HEADER_LEN 14
-#define ETHERNET_MTU   1500
-#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU)
+#define LINK_NOSET	0
+#define LINK_INTERFACE 	11
+#define LINK_EDGE 	12 
+#define LINK_ANY 	13
 
-#define VMM_DRIVERN 1
-#define GUEST_DRIVERN 0
-
-#define HOST_LNX_BRIDGE 1
-#define CTL_VM_BRIDGE 2
+#define VNET_HASH_SIZE 	17
 
 //routing table entry
 struct v3_vnet_route {
-    uint8_t src_mac[6];
-    uint8_t dst_mac[6];
+    uint8_t src_mac[ETH_ALEN];
+    uint8_t dst_mac[ETH_ALEN];
 
     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
+    int dst_id;
+    uint8_t dst_type;
  
-    uint32_t src_id;
-    uint8_t src_type; //EDGE|INTERFACE|ANY
+    int src_id;
+    uint8_t src_type;
 } __attribute__((packed));
 
 
@@ -78,16 +76,14 @@ struct v3_vnet_pkt {
 } __attribute__((packed));
 
 
-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);
+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,
@@ -96,18 +92,36 @@ 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);
+#define HOST_LNX_BRIDGE 1
+#define CTL_VM_BRIDGE 	2
 
-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_route(struct v3_vnet_route route);
+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);
+
+#ifdef __V3VEE__
+
+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, int budget, void * dev_data);
+};
+
+int v3_init_vnet(void);	
+void v3_deinit_vnet(void);
+
+void v3_vnet_do_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