X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=0e099e5a5ebee2f638e83795394142baad2688fc;hb=b3662a67b9b28e2b0724ebb2ea10edccba5d2a5b;hp=c5cdb5947ef0c4a8c0ad849e0fe9bfd5b8f02dfc;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index c5cdb59..0e099e5 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -20,7 +20,7 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
-
+#include <palacios/vm_guest.h>
 
 
 
@@ -29,24 +29,41 @@
 #define PrintDebug(fmt, args...)
 #endif
 
+static int free_hook(struct v3_vm_info * vm, struct v3_io_hook * hook);
+
+static int default_write(struct guest_info * core, uint16_t port, void *src, uint_t length, void * priv_data);
+static int default_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data);
+
+
+void v3_init_io_map(struct v3_vm_info * vm) {
+
+  vm->io_map.map.rb_node = NULL;
+  vm->io_map.arch_data = NULL;
+  vm->io_map.update_map = NULL;
 
-static int default_write(uint16_t port, void *src, uint_t length, void * priv_data);
-static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data);
+}
 
+int v3_deinit_io_map(struct v3_vm_info * vm) {
+    struct rb_node * node = v3_rb_first(&(vm->io_map.map));
+    struct v3_io_hook * hook = NULL;
+    struct rb_node * tmp_node = NULL;
 
-void v3_init_io_map(struct guest_info * info) {
+    while (node) {
+	hook = rb_entry(node, struct v3_io_hook, tree_node);
+	tmp_node = node;
+	node = v3_rb_next(node);
 
-  info->io_map.map.rb_node = NULL;
-  info->io_map.arch_data = NULL;
-  info->io_map.update_map = NULL;
+	free_hook(vm, hook);
+    }
 
+    return 0;
 }
 
 
 
 
-static inline struct v3_io_hook * __insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) {
-  struct rb_node ** p = &(info->io_map.map.rb_node);
+static inline struct v3_io_hook * __insert_io_hook(struct v3_vm_info * vm, struct v3_io_hook * hook) {
+  struct rb_node ** p = &(vm->io_map.map.rb_node);
   struct rb_node * parent = NULL;
   struct v3_io_hook * tmp_hook = NULL;
 
@@ -62,27 +79,28 @@ static inline struct v3_io_hook * __insert_io_hook(struct guest_info * info, str
       return tmp_hook;
     }
   }
+
   rb_link_node(&(hook->tree_node), parent, p);
 
   return NULL;
 }
 
 
-static inline struct v3_io_hook * insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) {
+static inline struct v3_io_hook * insert_io_hook(struct v3_vm_info * vm, struct v3_io_hook * hook) {
   struct v3_io_hook * ret;
 
-  if ((ret = __insert_io_hook(info, hook))) {
+  if ((ret = __insert_io_hook(vm, hook))) {
     return ret;
   }
 
-  v3_rb_insert_color(&(hook->tree_node), &(info->io_map.map));
+  v3_rb_insert_color(&(hook->tree_node), &(vm->io_map.map));
 
   return NULL;
 }
 
 
-struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint16_t port) {
-  struct rb_node * n = info->io_map.map.rb_node;
+struct v3_io_hook * v3_get_io_hook(struct v3_vm_info * vm, uint16_t port) {
+  struct rb_node * n = vm->io_map.map.rb_node;
   struct v3_io_hook * hook = NULL;
 
   while (n) {
@@ -104,10 +122,9 @@ struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint16_t port) {
 
 
 
-
-int v3_hook_io_port(struct guest_info * info, uint16_t port, 
-		    int (*read)(uint16_t port, void * dst, uint_t length, void * priv_data),
-		    int (*write)(uint16_t port, void * src, uint_t length, void * priv_data), 
+int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port, 
+		    int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
+		    int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data), 
 		    void * priv_data) {
   struct v3_io_hook * io_hook = (struct v3_io_hook *)V3_Malloc(sizeof(struct v3_io_hook));
 
@@ -125,42 +142,50 @@ int v3_hook_io_port(struct guest_info * info, uint16_t port,
     io_hook->write = write;
   }
 
-
   io_hook->priv_data = priv_data;
 
-  if (insert_io_hook(info, io_hook)) {
+  if (insert_io_hook(vm, io_hook)) {
       PrintError("Could not insert IO hook for port %u (0x%x)\n", port, port);
       V3_Free(io_hook);
       return -1;
   }
 
-
-  if (info->io_map.update_map(info, port, 
-			      ((read == NULL) ? 0 : 1), 
-			      ((write == NULL) ? 0 : 1)) == -1) {
-      PrintError("Could not update IO map for port %u (0x%x)\n", port, port);
-      V3_Free(io_hook);
-      return -1;
+  if (vm->io_map.update_map) {
+      if (vm->io_map.update_map(vm, port, 
+				  ((read == NULL) ? 0 : 1), 
+				  ((write == NULL) ? 0 : 1)) == -1) {
+	  PrintError("Could not update IO map for port %u (0x%x)\n", port, port);
+	  V3_Free(io_hook);
+	  return -1;
+      }
   }
 
-
   return 0;
 }
 
-int v3_unhook_io_port(struct guest_info * info, uint16_t port) {
-    struct v3_io_hook * hook = v3_get_io_hook(info, port);
+
+static int free_hook(struct v3_vm_info * vm, struct v3_io_hook * hook) {
+    v3_rb_erase(&(hook->tree_node), &(vm->io_map.map));
+
+    if (vm->io_map.update_map) {
+	// set the arch map to default (this should be 1, 1)
+	vm->io_map.update_map(vm, hook->port, 0, 0);
+    }
+
+    V3_Free(hook);
+
+    return 0;
+}
+
+int v3_unhook_io_port(struct v3_vm_info * vm, uint16_t port) {
+    struct v3_io_hook * hook = v3_get_io_hook(vm, port);
 
     if (hook == NULL) {
 	PrintError("Could not find port to unhook %u (0x%x)\n", port, port);
 	return -1;
     }
 
-    v3_rb_erase(&(hook->tree_node), &(info->io_map.map));
-
-    // set the arch map to default (this should be 1, 1)
-    info->io_map.update_map(info, port, 0, 0);
-
-    V3_Free(hook);
+    free_hook(vm, hook);
 
     return 0;
 }
@@ -170,19 +195,37 @@ int v3_unhook_io_port(struct guest_info * info, uint16_t port) {
 
 
 
-void v3_print_io_map(struct guest_info * info) {
+
+void v3_refresh_io_map(struct v3_vm_info * vm) {
+    struct v3_io_map * io_map = &(vm->io_map);
+    struct v3_io_hook * tmp = NULL;
+    
+    if (io_map->update_map == NULL) {
+	PrintError("Trying to refresh an io map with no backend\n");
+	return;
+    }
+
+    v3_rb_for_each_entry(tmp, &(io_map->map), tree_node) {
+	io_map->update_map(vm, tmp->port, 
+			   ((tmp->read == NULL) ? 0 : 1), 
+			   ((tmp->write == NULL) ? 0 : 1));
+    }
+
+}
+
+
+
+void v3_print_io_map(struct v3_vm_info * vm) {
+    struct v3_io_map * io_map = &(vm->io_map);
     struct v3_io_hook * tmp_hook = NULL;
-    struct rb_node * node = v3_rb_first(&(info->io_map.map));
 
     V3_Print("VMM IO Map\n");
 
-    do {
-	tmp_hook = rb_entry(node, struct v3_io_hook, tree_node);
-
+    v3_rb_for_each_entry(tmp_hook, &(io_map->map), tree_node) {
 	V3_Print("IO Port: %hu (Read=%p) (Write=%p)\n", 
 		 tmp_hook->port, 
 		 (void *)(tmp_hook->read), (void *)(tmp_hook->write));
-    } while ((node = v3_rb_next(node)));
+    }
 }
 
 
@@ -269,7 +312,7 @@ uint_t v3_indw(uint16_t port) {
 
 
 /* FIX ME */
-static int default_write(uint16_t port, void * src, uint_t length, void * priv_data) {
+static int default_write(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data) {
     if (length == 1) {
 	v3_outb(port, *(uint8_t *)src);
     } else if (length == 2) {
@@ -283,7 +326,7 @@ static int default_write(uint16_t port, void * src, uint_t length, void * priv_d
     return length;
 }
 
-static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data) {
+static int default_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data) {
     if (length == 1) {
 	*(uint8_t *)dst = v3_inb(port);
     } else if (length == 2) {