X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=1e3f68b5dc70b3d64a6b7ec2899f0baa74e7bec3;hb=95290c36e27daf208b8e61e6c6f26325db8b6b4d;hp=dd620930085b401c9c25c539d0ae83e93507bc95;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index dd62093..1e3f68b 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,13 +26,18 @@
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm_hashtable.h>
+#include <palacios/vmm_msr.h>
 #include <palacios/vmm_config.h>
+#include <palacios/vmm_ethernet.h>
 
 
-struct guest_info;
+struct v3_vm_info;
 
 struct v3_device_ops;
 
+typedef void * v3_dev_data_t;
+
+struct vm_device;
 
 struct vm_device {
     char name[32];
@@ -41,13 +46,12 @@ struct vm_device {
 
     struct v3_device_ops * ops;
 
-    struct guest_info * vm;
+    struct v3_vm_info * vm;
 
     struct list_head dev_link;
 
-
-    uint_t num_io_hooks;
-    struct list_head io_hooks;
+    uint_t num_res_hooks;
+    struct list_head res_hooks;
 };
 
 
@@ -62,19 +66,17 @@ struct vmm_dev_mgr {
     struct list_head net_list;
     struct hashtable * net_table;
 
-    struct list_head console_list;
-    struct hashtable * console_table;
-
-};
-
-
+    struct list_head char_list;
+    struct hashtable * char_table;
 
+    struct list_head cons_list;
+    struct hashtable * cons_table;
 
-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);
+};
 
+int v3_create_device(struct v3_vm_info * vm, const char * dev_name, v3_cfg_tree_t * cfg);
 
-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,24 +88,23 @@ 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_deinit_dev_mgr(struct v3_vm_info * vm);
 
+int v3_free_vm_devices(struct v3_vm_info * vm);
 
 
 
-int v3_init_devices();
 
 
-struct v3_device_ops {
-    int (*free)(struct vm_device *dev);
 
 
-    int (*reset)(struct vm_device *dev);
+int V3_init_devices();
+int V3_deinit_devices();
 
-    int (*start)(struct vm_device *dev);
-    int (*stop)(struct vm_device *dev);
 
+struct v3_device_ops {
+    int (*free)(void * private_data);
 
     //int (*save)(struct vm_device *dev, struct *iostream);
     //int (*restore)(struct vm_device *dev, struct *iostream);
@@ -114,24 +115,39 @@ 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 v3_dev_hook_io(struct vm_device   * dev,
+		   uint16_t            port,
+		   int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
+		   int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data));
 
-int v3_dev_unhook_io(struct vm_device   *dev,
-		     ushort_t            port);
+int v3_dev_unhook_io(struct vm_device   * dev,
+		     uint16_t            port);
 
 
-int v3_attach_device(struct guest_info * vm, struct vm_device * dev);
-int v3_detach_device(struct vm_device * dev);
+int v3_dev_hook_msr(struct vm_device * dev, 
+		    uint32_t           msr,
+		    int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data), 
+		    int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data));
+
+int v3_dev_unhook_msr(struct vm_device * dev, 
+		      uint32_t msr);
+	    
+
 
+
+struct vm_device * v3_add_device(struct v3_vm_info * vm, char * name, 
+				 struct v3_device_ops * ops, void * private_data);
+int v3_remove_device(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);
 
 
 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 +162,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,42 +173,111 @@ struct v3_dev_blk_ops {
 };
 
 struct v3_dev_net_ops {
-
+    /* Backend implemented functions */
+    int (*send)(uint8_t * buf, uint32_t count, void * private_data);
+    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; 
+    char fnt_mac[ETH_ALEN];
 };
 
 struct v3_dev_console_ops {
+    int (*update_screen)(uint_t x, uint_t y, uint_t length, uint8_t * fb_data, void * private_data);
+    int (*update_cursor)(uint_t x, uint_t y, void * private_data);
+    int (*scroll)(int rows, void * private_data);
+    int (*set_text_resolution)(int cols, int rows, void * private_data);
+
+    /* frontend implemented functions */
+    int (*get_screen)(uint_t x, uint_t y, uint_t length, void * frontend_data);
+    void * push_fn_arg;
+};
 
+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 guest_info * info, 
+
+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_console_frontend(struct v3_vm_info * vm, 
+				char * name, 
+				int (*connect)(struct v3_vm_info * vm, 
+					       void * frontend_data, 
+					       struct v3_dev_console_ops * ops, 
+					       v3_cfg_tree_t * cfg, 
+					       void * private_data), 
+				void * priv_data);
+
+int v3_dev_connect_console(struct v3_vm_info * vm, 
+			   char * frontend_name, 
+			   struct v3_dev_console_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