X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=3642c3a2815a996c36d325a4e9c04d23f73a3bec;hb=3b0d98aaf40fd7a1bfc3bc736144386636cc7a73;hp=d094d7920cb918458cba9b8bc2bce7a54efe3905;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index d094d79..3642c3a 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -24,11 +24,12 @@
 
 
 
-#ifndef CONFIG_DEBUG_IO
+#ifndef V3_CONFIG_DEBUG_IO
 #undef PrintDebug
 #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);
@@ -42,6 +43,22 @@ void v3_init_io_map(struct v3_vm_info * vm) {
 
 }
 
+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;
+
+    while (node) {
+	hook = rb_entry(node, struct v3_io_hook, tree_node);
+	tmp_node = node;
+	node = v3_rb_next(node);
+
+	free_hook(vm, hook);
+    }
+
+    return 0;
+}
+
 
 
 
@@ -62,6 +79,7 @@ static inline struct v3_io_hook * __insert_io_hook(struct v3_vm_info * vm, struc
       return tmp_hook;
     }
   }
+
   rb_link_node(&(hook->tree_node), parent, p);
 
   return NULL;
@@ -124,7 +142,6 @@ int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port,
     io_hook->write = write;
   }
 
-
   io_hook->priv_data = priv_data;
 
   if (insert_io_hook(vm, io_hook)) {
@@ -146,19 +163,13 @@ int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port,
   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;
-    }
 
+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, port, 0, 0);
+	vm->io_map.update_map(vm, hook->port, 0, 0);
     }
 
     V3_Free(hook);
@@ -166,6 +177,19 @@ int v3_unhook_io_port(struct v3_vm_info * vm, uint16_t port) {
     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;
+    }
+
+    free_hook(vm, hook);
+
+    return 0;
+}
+