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 254fbf5..d990880 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -70,7 +70,7 @@ struct v3_vnet_pkt {
            uint8_t src_type;
            uint32_t src_id;
            uint8_t header[ETHERNET_HEADER_LEN];
-           uint8_t *data;
+           uint8_t * data;
        } __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
@@ -106,8 +106,10 @@ struct v3_vnet_dev_xcall_args{
 };
 
 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);
+    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);
@@ -115,9 +117,12 @@ struct v3_vnet_dev_ops {
 };
 
 struct v3_vnet_bridge_ops {
-    int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt pkt[], uint16_t pkt_num, void * private_data);
-    int (*xcall_input)(void *data);
-    void (*polling_pkt)(struct v3_vm_info * vm,  void *private_data);
+    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);
 };
        
 
@@ -128,9 +133,6 @@ int v3_vnet_add_route(struct v3_vnet_route route);
 int v3_init_vnet();
 
 int v3_vnet_add_bridge(struct v3_vm_info * vm,
-               /*int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt pkt[], uint16_t pkt_num, void * private_data),
-               void (*xcall_input)(void *data),
-               int (*poll_pkt)(struct v3_vm_info * vm, void * private_data),*/
                struct v3_vnet_bridge_ops *ops,
                void * priv_data);
 
@@ -140,10 +142,8 @@ int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6],
 
 void v3_vnet_poll(struct v3_vm_info *vm);
 
-/* enable a vnet device, tell VNET can send pkts to it */
 int v3_vnet_enable_device(int dev_id);
 
-/* tell VNET stop sending pkts to it */
 int v3_vnet_disable_device(int dev_id);
 
 #endif