X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=949586123ba46873fd5641ee4df6c5eaa2eb0fd6;hb=fe36af6238917000f4cc8b971829e347732df598;hp=a403d920d7fe4def73a6b9bbffc01caca8bf6056;hpb=f23519733b314e4cbaf0b2f1e4ea317302680898;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index a403d92..9495861 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -25,28 +25,48 @@
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
+#include <palacios/vmm_hashtable.h>
+
 
-struct vm_device;
 struct guest_info;
 
+struct v3_device_ops;
 
-struct vmm_dev_mgr {
-  uint_t num_devs;
-  struct list_head dev_list;
 
-  uint_t num_io_hooks;
-  struct list_head io_hooks;
+struct vm_device {
+    char name[32];
   
-  uint_t num_mem_hooks;
-  struct list_head mem_hooks;
+    void * private_data;
+
+    struct v3_device_ops * ops;
+
+    struct guest_info * vm;
+
+    struct list_head dev_link;
 
-  uint_t num_msr_hook;
-  struct list_head msr_hooks;
 
+    uint_t num_io_hooks;
+    struct list_head io_hooks;
+};
+
+
+struct vmm_dev_mgr {
+    uint_t num_devs;
+    struct list_head dev_list;
+
+    struct hashtable * dev_table;
 };
 
 
 
+
+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);
+
+
 // Registration of devices
 
 //
@@ -54,47 +74,74 @@ struct vmm_dev_mgr {
 // when the guest is stopped
 //
 
-int v3_attach_device(struct guest_info *vm, struct vm_device * dev);
-int v3_unattach_device(struct vm_device *dev);
 
 
+int v3_init_dev_mgr(struct guest_info * info);
+int v3_dev_mgr_deinit(struct guest_info * info);
 
 
 
 
-struct dev_io_hook {
-  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_init_devices();
+
+
+struct v3_device_ops {
+    int (*free)(struct vm_device *dev);
 
-  struct vm_device * dev;
 
-  // Do not touch anything below this  
+    int (*reset)(struct vm_device *dev);
 
-  struct list_head dev_list;
-  struct list_head mgr_list;
+    int (*start)(struct vm_device *dev);
+    int (*stop)(struct vm_device *dev);
+
+
+    //int (*save)(struct vm_device *dev, struct *iostream);
+    //int (*restore)(struct vm_device *dev, struct *iostream);
 };
 
-struct dev_mem_hook {
-  void  *addr_start;
-  void  *addr_end;
 
-  struct vm_device * dev;
 
-  // Do not touch anything below this
-  struct list_head dev_list;
-  struct list_head mgr_list;
+
+
+
+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_unhook_io(struct vm_device   *dev,
+		     ushort_t            port);
+
+
+int v3_attach_device(struct guest_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, void * cfg_data);
 };
 
 
-int v3_init_dev_mgr(struct guest_info * info);
-int v3_dev_mgr_deinit(struct guest_info * info);
+#define device_register(name, init_dev_fn)				\
+    static char _v3_device_name[] = name;				\
+    static struct v3_device_info _v3_device				\
+    __attribute__((__used__))						\
+	__attribute__((unused, __section__ ("_v3_devices"),		\
+		       aligned(sizeof(addr_t))))			\
+	= {_v3_device_name , init_dev_fn};
+
+
+
 
 void PrintDebugDevMgr(struct guest_info * info);
 void PrintDebugDev(struct vm_device * dev);
-void PrintDebugDevIO(struct vm_device * dev);
-void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr);
+
+
+
+
 
 #endif // ! __V3VEE__