build fixes to merge the Palacios configuration parameters with Linux parameters.

[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 86af1a2..0f8c793 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -19,40 +19,38 @@
  * 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
-#define VMM_DRIVERN 1
-#define GUEST_DRIVERN 0
+#define VNET_HASH_SIZE         17
 
-#define HOST_LNX_BRIDGE 1
-#define CTL_VM_BRIDGE 2
+extern int v3_vnet_debug;
 
-//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;
+    int dst_id;
     uint8_t dst_type;
  
-    uint32_t src_id;
+    int src_id;
     uint8_t src_type;
 } __attribute__((packed));
 
@@ -79,16 +77,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,
@@ -97,21 +93,30 @@ struct v3_vnet_bridge_ops {
                void * private_data);
 };
 
-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);
+#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,
                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 synchronize);
+int v3_vnet_find_dev(uint8_t  * mac);
+int v3_vnet_stat(struct vnet_stat * stats);
 
+#ifdef __V3VEE__
 
-int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t mac[6], 
+struct v3_vnet_dev_ops {
+    int (*input)(struct v3_vm_info * vm, 
+               struct v3_vnet_pkt * pkt, 
+               void * dev_data);
+};
+
+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,
                    void * priv_data);
 int v3_vnet_del_dev(int dev_id);
@@ -119,4 +124,6 @@ int v3_vnet_del_dev(int dev_id);
 
 #endif
 
+#endif
+