X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=11d64ec140e1586e287eb35a0044d920d3a2a40a;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hp=6ea56df1f1be8f10099f2f328a6dcf282a944cd4;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 6ea56df..11d64ec 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -1,39 +1,61 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #ifndef _VMM_DEV_MGR
 #define _VMM_DEV_MGR
 
+#ifdef __V3VEE__
+
 #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
+//
+
+int v3_attach_device(struct guest_info *vm, struct vm_device * dev);
+int v3_unattach_device(struct vm_device *dev);
 
 
 
-struct vmm_dev_mgr {
-  struct vm_dev_list dev_list;
-  struct dev_io_hook_list io_hooks;
-  struct dev_mem_hook_list mem_hooks;
-};
 
 
 
@@ -46,44 +68,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 v3_init_dev_mgr(struct guest_info * info);
+int v3_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