updated serial device

[palacios.git] / palacios / include / palacios / vmm_dev_mgr.h

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 9cc1ff0..d6942c0 100644 (file)
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -29,7 +29,7 @@
 #include <palacios/vmm_config.h>
 
 
-struct guest_info;
+struct v3_vm_info;
 
 struct v3_device_ops;
 
@@ -41,7 +41,7 @@ struct vm_device {
 
     struct v3_device_ops * ops;
 
-    struct guest_info * vm;
+    struct v3_vm_info * vm;
 
     struct list_head dev_link;
 
@@ -62,19 +62,21 @@ struct vmm_dev_mgr {
     struct list_head net_list;
     struct hashtable * net_table;
 
+    struct list_head char_list;
+    struct hashtable * char_table;
+
     struct list_head console_list;
     struct hashtable * console_table;
 
 };
 
+int v3_create_device(struct v3_vm_info * vm, const char * dev_name, v3_cfg_tree_t * cfg);
 
 
-
-int v3_create_device(struct guest_info * info, const char * dev_name, v3_cfg_tree_t * cfg);
 void v3_free_device(struct vm_device * dev);
 
 
-struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name);
+struct vm_device * v3_find_dev(struct v3_vm_info * info, const char * dev_name);
 
 
 // Registration of devices
@@ -86,8 +88,10 @@ struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name);
 
 
 
-int v3_init_dev_mgr(struct guest_info * info);
-int v3_dev_mgr_deinit(struct guest_info * info);
+int v3_init_dev_mgr(struct v3_vm_info * vm);
+int v3_dev_mgr_deinit(struct v3_vm_info * vm);
+
+
 
 
 
@@ -116,14 +120,14 @@ struct v3_device_ops {
 
 int v3_dev_hook_io(struct vm_device   *dev,
                   ushort_t            port,
-                  int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
-                  int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev));
+                  int (*read)(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev),
+                  int (*write)(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev));
 
 int v3_dev_unhook_io(struct vm_device   *dev,
                     ushort_t            port);
 
 
-int v3_attach_device(struct guest_info * vm, struct vm_device * dev);
+int v3_attach_device(struct v3_vm_info * vm, struct vm_device * dev);
 int v3_detach_device(struct vm_device * dev);
 
 struct vm_device * v3_allocate_device(char * name, struct v3_device_ops * ops, void * private_data);
@@ -131,7 +135,7 @@ struct vm_device * v3_allocate_device(char * name, struct v3_device_ops * ops, v
 
 struct v3_device_info {
     char * name;
-    int (*init)(struct guest_info * info, v3_cfg_tree_t * cfg);
+    int (*init)(struct v3_vm_info * info, v3_cfg_tree_t * cfg);
 };
 
 
@@ -146,7 +150,7 @@ struct v3_device_info {
 
 
 
-void v3_print_dev_mgr(struct guest_info * info);
+void v3_print_dev_mgr(struct v3_vm_info * vm);
 
 
 struct v3_dev_blk_ops {
@@ -157,44 +161,84 @@ struct v3_dev_blk_ops {
 };
 
 struct v3_dev_net_ops {
+    /* Backend implemented functions */
     int (*send)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev);
-    int (*receive)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *src_dev);
+    void (*start_rx)(void *back_data);
+    void (*stop_rx)(void *back_data);
 
+    /* Frontend implemented functions */
+    int (*recv)(uint8_t * buf, uint32_t count, void * frnt_data);
+    void (*poll)(struct v3_vm_info * vm, void * frnt_data);
+    void (*start_tx)(void * frnt_data);
+    void (*stop_tx)(void * frnt_data);
+
+    /* This is ugly... */
+    void * frontend_data; 
 };
 
 struct v3_dev_console_ops {
 
 };
 
-int v3_dev_add_blk_frontend(struct guest_info * info, 
+struct v3_dev_char_ops {
+    /* Backend implemented functions */
+    int (*write)(uint8_t * buf, uint64_t len, void * private_data);
+    //  int (*read)(uint8_t * buf, uint64_t len, void * private_data);
+
+    /* Frontend Implemented functions */
+    int (*push)(struct v3_vm_info * vm, uint8_t * buf, uint64_t len, void * private_data);
+};
+
+
+int v3_dev_add_blk_frontend(struct v3_vm_info * vm, 
                            char * name, 
-                           int (*connect)(struct guest_info * info, 
+                           int (*connect)(struct v3_vm_info * vm, 
                                            void * frontend_data, 
                                            struct v3_dev_blk_ops * ops, 
                                            v3_cfg_tree_t * cfg, 
                                            void * private_data), 
                            void * priv_data);
-int v3_dev_connect_blk(struct guest_info * info, 
+
+int v3_dev_connect_blk(struct v3_vm_info * vm, 
                       char * frontend_name, 
                       struct v3_dev_blk_ops * ops, 
                       v3_cfg_tree_t * cfg, 
                       void * private_data);
 
-int v3_dev_add_net_frontend(struct guest_info * info, 
+int v3_dev_add_net_frontend(struct v3_vm_info * vm, 
                            char * name, 
-                           int (*connect)(struct guest_info * info, 
+                           int (*connect)(struct v3_vm_info * vm, 
                                            void * frontend_data, 
                                            struct v3_dev_net_ops * ops, 
                                            v3_cfg_tree_t * cfg, 
                                            void * private_data), 
                            void * priv_data);
-int v3_dev_connect_net(struct guest_info * info, 
+
+int v3_dev_connect_net(struct v3_vm_info * vm, 
                       char * frontend_name, 
                       struct v3_dev_net_ops * ops, 
                       v3_cfg_tree_t * cfg, 
                       void * private_data);
 
 
+int v3_dev_add_char_frontend(struct v3_vm_info * vm, 
+                            char * name, 
+                            int (*connect)(struct v3_vm_info * vm, 
+                                           void * frontend_data, 
+                                           struct v3_dev_char_ops * ops, 
+                                           v3_cfg_tree_t * cfg, 
+                                           void * private_data,
+                                           void ** push_fn_arg), 
+                            void * priv_data);
+
+int v3_dev_connect_char(struct v3_vm_info * vm, 
+                       char * frontend_name, 
+                       struct v3_dev_char_ops * ops, 
+                       v3_cfg_tree_t * cfg, 
+                       void * private_data, 
+                       void ** push_fn_arg);
+
+
 #endif // ! __V3VEE__
 
 #endif