add the virtual console input as a host event

[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..d990880 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>
@@ -26,14 +26,17 @@
 
 #include <palacios/vmm.h>
 
-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 V3_VNET_POLLING_VECTOR 50
+
+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 VNET_HASH_SIZE 17
 #define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MAX   1500
-#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
+#define ETHERNET_MTU   1500
+#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU)
 
 //routing table entry
 struct v3_vnet_route {
@@ -66,32 +69,82 @@ 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);
+#ifdef CONFIG_VNET_PROFILE
+struct v3_vnet_profile{
+    uint64_t  time_copy_from_guest;
+    uint64_t  time_route_lookup;
+    uint64_t  time_mallocfree;
+    uint64_t  time_copy_to_guest;
+    uint64_t  total_handle_time;
+    uint64_t  memcpy_time;
 
-int v3_vnet_add_route(struct v3_vnet_route route);
+    uint64_t  total_exit_time;
+    bool print;
+
+    uint64_t virtio_handle_start;
+};
+#endif
 
-//int v3_vnet_del_route();
 
+struct v3_vnet_bridge_xcall_args{
+    struct v3_vm_info * vm;
+    struct v3_vnet_pkt *vnet_pkts; 
+    uint16_t pkt_num;
+    void * private_data;
+};
+
+struct v3_vnet_dev_xcall_args{
+    struct v3_vm_info * vm;
+    void * private_data;
+};
+
+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 (*poll_xcall)(void *arg);
+
+    void (*start_tx)(void * dev_data);
+    void (*stop_tx)(void * dev_data);
+};
+
+struct v3_vnet_bridge_ops {
+    int (*input)(struct v3_vm_info * vm, 
+               struct v3_vnet_pkt * pkt,
+               void * private_data);
+    int (*xcall_input)(void * data);
+    void (*polling_pkt)(struct v3_vm_info * vm,  
+               void * private_data);
+};
+       
+
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data);
 
+int v3_vnet_add_route(struct v3_vnet_route route);
 
-int V3_init_vnet();
+int v3_init_vnet();
 
-//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+int v3_vnet_add_bridge(struct v3_vm_info * vm,
+               struct v3_vnet_bridge_ops *ops,
+               void * priv_data);
 
 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), 
+                   struct v3_vnet_dev_ops *ops,
                    void * priv_data);
 
+void v3_vnet_poll(struct v3_vm_info *vm);
 
-// temporary hack
-int v3_vnet_pkt_process();
+int v3_vnet_enable_device(int dev_id);
 
+int v3_vnet_disable_device(int dev_id);
 
 #endif