X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=20dd3019281ab62b0aeee9de552d80d414b7a07e;hb=9b4bfeefac09294a6f0ae12dbadf102eb547f5ec;hp=827d7e7445589e40b2d394df3c2b7f1730da53ce;hpb=091d8b1fcfc3a766f6603d4c1c69d9f8f4bf3031;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index 827d7e7..20dd301 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,5 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * 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_IO_H
 #define __VMM_IO_H
@@ -9,11 +25,16 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
+#include <palacios/vmm_rbtree.h>
+
+typedef struct rb_root v3_io_map_t;
 
 
 struct guest_info;
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port);
+void v3_init_io_map(struct guest_info * info);
+
+
 
 
 /* External API */
@@ -22,47 +43,31 @@ int v3_hook_io_port(struct guest_info * info, uint_t port,
 		    int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
 		    void * priv_data);
 
+int v3_unhook_io_port(struct guest_info * info, uint_t port);
 
 
 
 
+struct v3_io_hook {
+    ushort_t port;
 
-struct vmm_io_hook;
-
-struct vmm_io_map {
-  uint_t num_ports;
-  struct vmm_io_hook * head;
-
-};
-
-
-void init_vmm_io_map(struct guest_info * info);
-
-// FOREACH_IO_HOOK(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook)
-#define FOREACH_IO_HOOK(io_map, io_hook) for (io_hook = (io_map).head; io_hook != NULL; io_hook = (io_hook)->next)
-
-
-struct vmm_io_hook {
-  ushort_t port;
-
-  // Reads data into the IO port (IN, INS)
-  int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data);
-
-  // Writes data from the IO port (OUT, OUTS)
-  int (*write)(ushort_t port, void * src, uint_t length, void * priv_data);
+    // Reads data into the IO port (IN, INS)
+    int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data);
 
-  void * priv_data;
+    // Writes data from the IO port (OUT, OUTS)
+    int (*write)(ushort_t port, void * src, uint_t length, void * priv_data);
 
-  struct vmm_io_hook * next;
-  struct vmm_io_hook * prev;
+    void * priv_data;
+  
+    struct rb_node tree_node;
 
 };
 
 
-struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
+struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port);
 
 
-void PrintDebugIOMap(struct vmm_io_map * io_map);
+void v3_print_io_map(struct guest_info * info);