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 c30c769..0f8c793 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -7,9 +7,9 @@
  * and the University of New Mexico.  You can find out more at 
  * http://www.v3vee.org
  *
- * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu> 
- * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
+ * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
@@ -19,35 +19,39 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VNET_H__
-#define __VNET_H__
-
-#ifdef __V3VEE__
+#ifndef __VNET_CORE_H__
+#define __VNET_CORE_H__
 
 #include <palacios/vmm.h>
+#include <palacios/vmm_ethernet.h>
+
+#define MAC_NOSET      0
+#define MAC_ANY        11
+#define MAC_NOT        12
+#define MAC_NONE       13 
+#define MAC_ADDR       14
 
-typedef enum {MAC_ANY, MAC_NOT, MAC_NONE} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
-typedef enum {LINK_INTERFACE, LINK_EDGE, LINK_ANY} link_type_t; //for 'type' and 'src_type' in struct routing
+#define LINK_NOSET     0
+#define LINK_INTERFACE         11
+#define LINK_EDGE      12 
+#define LINK_ANY       13
 
+#define VNET_HASH_SIZE         17
 
-#define VNET_HASH_SIZE 17
-#define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MAX   1500
-#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
+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; //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));
 
 
@@ -66,31 +70,56 @@ struct v3_vnet_pkt {
        struct {
            uint8_t src_type;
            uint32_t src_id;
-           uint8_t data[ETHERNET_PACKET_LEN];
+           uint8_t header[ETHERNET_HEADER_LEN];
+           uint8_t * data;
        } __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
 
 
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt);
-
-int v3_vnet_add_route(struct v3_vnet_route route);
+struct vnet_stat{
+    uint64_t tx_bytes;
+    uint32_t tx_pkts;
+    uint64_t rx_bytes;
+    uint32_t rx_pkts;
+};
 
-//int v3_vnet_del_route();
 
+struct v3_vnet_bridge_ops {
+    int (*input)(struct v3_vm_info * vm, 
+               struct v3_vnet_pkt * pkt,
+               void * private_data);
+    void (*poll)(struct v3_vm_info * vm,  
+               void * private_data);
+};
 
+#define HOST_LNX_BRIDGE 1
+#define CTL_VM_BRIDGE  2
 
-int V3_init_vnet();
+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);
 
-//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+#ifdef __V3VEE__
 
-int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], 
-                   int (*dev_input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data), 
-                   void * priv_data);
+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);
 
-// temporary hack
-int v3_vnet_pkt_process();
+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