large scale namespace changes

[palacios.git] / palacios / include / palacios / vm_dev.h

diff --git a/palacios/include/palacios/vm_dev.h b/palacios/include/palacios/vm_dev.h
index 192a2b5..8bd93a9 100644 (file)
--- a/palacios/include/palacios/vm_dev.h
+++ b/palacios/include/palacios/vm_dev.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 __VM_DEV_H
 #define __VM_DEV_H
 
+#ifdef __V3VEE__
+
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_dev_mgr.h>
@@ -37,39 +58,50 @@ struct vm_device {
 
   struct guest_info * vm;
 
-  struct vm_device   *next, *prev;
+  struct list_head dev_link;
+
 
+  uint_t num_io_hooks;
+  struct list_head io_hooks;
+  uint_t num_mem_hooks;
+  struct list_head mem_hooks;
+  uint_t num_irq_hooks;
+  struct list_head irq_hooks;
 
-  struct dev_io_hook_list io_hooks;
-  struct dev_mem_hook_list mem_hooks;
 };
 
 
 
-struct vm_device * allocate_device();
-struct vm_device * create_device(char * name, struct vm_device_ops * ops, void * private_data);
-void free_device(struct vm_device * dev);
 
+struct vm_device * v3_create_device(char * name, struct vm_device_ops * ops, void * private_data);
+void v3_free_device(struct vm_device * dev);
 
 
-int dev_hook_io(struct vm_device   *dev,
+
+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 dev_unhook_io(struct vm_device   *dev,
+int v3_dev_unhook_io(struct vm_device   *dev,
                  ushort_t            port);
 
-int dev_hook_mem(struct vm_device   *dev,
+int v3_dev_hook_mem(struct vm_device   *dev,
                 void               *start,
                 void               *end);
 
-int dev_unhook_mem(struct vm_device   * dev,
+int v3_dev_unhook_mem(struct vm_device   * dev,
                   void               * start,
                   void               * end);
 
 
+int v3_dev_hook_irq(struct vm_device * dev,
+                uint_t irq, 
+                int (*handler)(uint_t irq, struct vm_device * dev));
+int v3_dev_unhook_irq(struct vm_device * dev, uint_t irq);
+
 
 
+#endif // ! __V3VEE__
 
 #endif