added copyright tags

[palacios.git] / palacios / src / palacios / vmm_io.c

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 81febc7..fa17c53 100644 (file)
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
@@ -11,14 +14,17 @@
 #endif
 
 
-void init_vmm_io_map(vmm_io_map_t * io_map) {
+void init_vmm_io_map(struct guest_info * info) {
+  struct vmm_io_map * io_map = &(info->io_map);
   io_map->num_ports = 0;
   io_map->head = NULL;
 }
 
 
 
-int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
+
+
+static int add_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) {
 
   if (!(io_map->head)) {
     io_map->head = io_hook;
@@ -33,7 +39,7 @@ int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
 
     return 0;
   } else {
-    vmm_io_hook_t * tmp_hook = io_map->head;
+    struct vmm_io_hook * tmp_hook = io_map->head;
     
     while ((tmp_hook->next)  && 
           (tmp_hook->next->port <= io_hook->port)) {
@@ -62,7 +68,7 @@ int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
   return -1;
 }
 
-int remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
+static int remove_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) {
   if (io_map->head == io_hook) {
     io_map->head = io_hook->next;
   } else if (io_hook->prev) {
@@ -128,11 +134,12 @@ static int default_read(ushort_t port, void * dst, uint_t length, void * priv_da
   return 0;
 }
 
-int hook_io_port(vmm_io_map_t * io_map, uint_t port, 
-                int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data),
-                int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
-                void * priv_data) {
-  vmm_io_hook_t * io_hook = (vmm_io_hook_t *)V3_Malloc(sizeof(vmm_io_hook_t));
+int v3_hook_io_port(struct guest_info * info, uint_t port, 
+                   int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data),
+                   int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
+                   void * priv_data) {
+  struct vmm_io_map * io_map = &(info->io_map);
+  struct vmm_io_hook * io_hook = (struct vmm_io_hook *)V3_Malloc(sizeof(struct vmm_io_hook));
 
   io_hook->port = port;
 
@@ -161,8 +168,9 @@ int hook_io_port(vmm_io_map_t * io_map, uint_t port,
   return 0;
 }
 
-int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
-  vmm_io_hook_t * hook = get_io_hook(io_map, port);
+int v3_unhook_io_port(struct guest_info * info, uint_t port) {
+  struct vmm_io_map * io_map = &(info->io_map);
+  struct vmm_io_hook * hook = v3_get_io_hook(io_map, port);
 
   if (hook == NULL) {
     return -1;
@@ -173,8 +181,8 @@ int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
 }
 
 
-vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port) {
-  vmm_io_hook_t * tmp_hook;
+struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port) {
+  struct vmm_io_hook * tmp_hook;
   FOREACH_IO_HOOK(*io_map, tmp_hook) {
     if (tmp_hook->port == port) {
       return tmp_hook;
@@ -185,8 +193,8 @@ vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port) {
 
 
 
-void PrintDebugIOMap(vmm_io_map_t * io_map) {
-  vmm_io_hook_t * iter = io_map->head;
+void PrintDebugIOMap(struct vmm_io_map * io_map) {
+  struct vmm_io_hook * iter = io_map->head;
 
   PrintDebug("VMM IO Map (Entries=%d)\n", io_map->num_ports);