code clean up

[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 6ea56df..931bdd3 100644 (file)
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -2,41 +2,42 @@
 #define _VMM_DEV_MGR
 
 #include <palacios/vmm_types.h>
-#include <palacios/vmm_device_types.h>
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
 
-
 struct vm_device;
 struct guest_info;
 
-struct vm_dev_list {
-  struct vm_device * head;
+
+struct vmm_dev_mgr {
   uint_t num_devs;
-};
+  struct list_head dev_list;
 
+  uint_t num_io_hooks;
+  struct list_head io_hooks;
+  
+  uint_t num_mem_hooks;
+  struct list_head mem_hooks;
 
-struct dev_io_hook_list {
-  struct dev_io_hook * head;
-  uint_t num_hooks;
 };
 
 
-struct dev_mem_hook_list {
-  struct dev_mem_hook * head;
-  uint_t num_hooks;
-};
 
+// Registration of devices
 
+//
+// The following device manager functions should only be called
+// when the guest is stopped
+//
 
-struct vmm_dev_mgr {
-  struct vm_dev_list dev_list;
-  struct dev_io_hook_list io_hooks;
-  struct dev_mem_hook_list mem_hooks;
-};
+int v3_attach_device(struct guest_info *vm, struct vm_device * dev);
+int v3_unattach_device(struct vm_device *dev);
 
 
 
+
+#ifdef __V3VEE__
+
 struct dev_io_hook {
   ushort_t port;
   
@@ -46,44 +47,31 @@ struct dev_io_hook {
   struct vm_device * dev;
 
   // Do not touch anything below this  
-  struct dev_io_hook *dev_next, *dev_prev;
-  struct dev_io_hook *mgr_next, *mgr_prev;
+
+  struct list_head dev_list;
+  struct list_head mgr_list;
 };
 
 struct dev_mem_hook {
-  void             *addr_start;
-  void             *addr_end;
+  void  *addr_start;
+  void  *addr_end;
+
+  struct vm_device * dev;
 
   // Do not touch anything below this
-  struct dev_mem_hook *dev_next, *dev_prev;
-  struct dev_mem_hook *mgr_next, *mgr_prev;
+  struct list_head dev_list;
+  struct list_head mgr_list;
 };
 
 
+int dev_mgr_init(struct guest_info * info);
+int dev_mgr_deinit(struct guest_info * info);
 
-// Registration of devices
-
-//
-// The following device manager functions should only be called
-// when the guest is stopped
-//
-
-int dev_mgr_init(struct vmm_dev_mgr *mgr);
-int dev_mgr_deinit(struct vmm_dev_mgr * mgr);
-
-
-
-int attach_device(struct guest_info *vm, struct vm_device * dev);
-int unattach_device(struct vm_device *dev);
-
-
-int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev);
-int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev);
-
-
-void PrintDebugDevMgr(struct vmm_dev_mgr * mgr);
+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__
+
 #endif