X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=9e019b5b092e933e05603d8533f79bc7b2c1b62a;hb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;hp=949586123ba46873fd5641ee4df6c5eaa2eb0fd6;hpb=37c18b2c2335a41c68c2f0b779fd2b7d51ab216d;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 9495861..9e019b5 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,9 +26,10 @@
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm_hashtable.h>
+#include <palacios/vmm_config.h>
 
 
-struct guest_info;
+struct v3_vm_info;
 
 struct v3_device_ops;
 
@@ -40,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;
 
@@ -53,18 +54,26 @@ struct vm_device {
 struct vmm_dev_mgr {
     uint_t num_devs;
     struct list_head dev_list;
-
     struct hashtable * dev_table;
-};
 
+    struct list_head blk_list;
+    struct hashtable * blk_table;
 
+    struct list_head net_list;
+    struct hashtable * net_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, void * cfg_data);
 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
@@ -76,8 +85,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);
+
+
 
 
 
@@ -106,14 +117,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);
@@ -121,7 +132,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, void * cfg_data);
+    int (*init)(struct v3_vm_info * info, v3_cfg_tree_t * cfg);
 };
 
 
@@ -136,11 +147,65 @@ struct v3_device_info {
 
 
 
-void PrintDebugDevMgr(struct guest_info * info);
-void PrintDebugDev(struct vm_device * dev);
+void v3_print_dev_mgr(struct v3_vm_info * vm);
+
 
+struct v3_dev_blk_ops {
+    uint64_t (*get_capacity)(void * private_data);
+    // Reads always operate on 2048 byte blocks
+    int (*read)(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data);
+    int (*write)(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data);
+};
 
+struct v3_dev_net_ops {
+    /* below functions are called by frontend device
+     * These will be filled in by the backend when a backend is initiated.  --Lei*/
+    int (*send)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev);
+    void (*start_rx)(void *back_data);
+    void (*stop_rx)(void *back_data);
+
+    /* below functions are called by Backend device
+     * These will be filled in by the frontend when a backend is connected. -- Lei*/
+    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);
+    void * frontend_data;
+};
+
+struct v3_dev_console_ops {
+
+};
 
+int v3_dev_add_blk_frontend(struct v3_vm_info * vm, 
+			    char * name, 
+			    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 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 v3_vm_info * vm, 
+			    char * name, 
+			    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 v3_vm_info * vm, 
+		       char * frontend_name, 
+		       struct v3_dev_net_ops * ops, 
+		       v3_cfg_tree_t * cfg, 
+		       void * private_data);
 
 
 #endif // ! __V3VEE__