X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=b7552c46ba9f2921046f6a23d19bd61dc72805e2;hb=9b4bfeefac09294a6f0ae12dbadf102eb547f5ec;hp=ed49769b2f3b3b77b3aab655e6d6d5d04f4d7fcd;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index ed49769..b7552c4 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -1,6 +1,27 @@
+/*
+ * 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_list.h>
 #include <palacios/vmm_string.h>
@@ -10,43 +31,20 @@ struct guest_info;
 
 
 struct vmm_dev_mgr {
-  uint_t num_devs;
-  struct list_head dev_list;
+    uint_t num_devs;
+    struct list_head dev_list;
 
-  uint_t num_io_hooks;
-  struct list_head io_hooks;
+    uint_t num_io_hooks;
+    struct list_head io_hooks;
   
-  uint_t num_mem_hooks;
-  struct list_head mem_hooks;
-
-};
+    uint_t num_mem_hooks;
+    struct list_head mem_hooks;
 
+    uint_t num_msr_hook;
+    struct list_head msr_hooks;
 
-
-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);
-
-  struct vm_device * dev;
-
-  // Do not touch anything below this  
-
-  struct list_head dev_list;
-  struct list_head mgr_list;
 };
 
-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;
-};
 
 
 // Registration of devices
@@ -56,24 +54,48 @@ struct dev_mem_hook {
 // when the guest is stopped
 //
 
-int dev_mgr_init(struct vmm_dev_mgr *mgr);
-int dev_mgr_deinit(struct vmm_dev_mgr * mgr);
+int v3_attach_device(struct guest_info *vm, struct vm_device * dev);
+int v3_unattach_device(struct vm_device *dev);
+
 
 
 
-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);
+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);
 
+    struct vm_device * dev;
 
+    // Do not touch anything below this  
 
+    struct list_head dev_list;
+    struct list_head mgr_list;
+};
+
+struct dev_mem_hook {
+    void  *addr_start;
+    void  *addr_end;
 
-void PrintDebugDevMgr(struct vmm_dev_mgr * mgr);
+    struct vm_device * dev;
+
+    // Do not touch anything below this
+    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);
+
+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