X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=96ee1d75647f6e28ff99642f85129c956ba3e3ea;hb=95a09f3e974f23d8e3d20b3a333f5c07631be17d;hp=5f762e423657d6f84a19cc386c3d4cc0cd571233;hpb=09a7d3811df9df65346e36419f553a38c8c45c72;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 5f762e4..96ee1d7 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;
@@ -110,6 +128,12 @@ int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port,
 		    void * priv_data) {
   struct v3_io_hook * io_hook = (struct v3_io_hook *)V3_Malloc(sizeof(struct v3_io_hook));
 
+  if (!io_hook) {
+      PrintError(vm, VCORE_NONE, "Cannot allocate in hooking an I/O port\n");
+      return -1;
+  }
+
+
   io_hook->port = port;
 
   if (!read) {
@@ -127,7 +151,7 @@ int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port,
   io_hook->priv_data = priv_data;
 
   if (insert_io_hook(vm, io_hook)) {
-      PrintError("Could not insert IO hook for port %u (0x%x)\n", port, port);
+      PrintError(vm, VCORE_NONE, "Could not insert IO hook for port %u (0x%x)\n", port, port);
       V3_Free(io_hook);
       return -1;
   }
@@ -136,7 +160,7 @@ int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port,
       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);
+	  PrintError(vm, VCORE_NONE, "Could not update IO map for port %u (0x%x)\n", port, port);
 	  V3_Free(io_hook);
 	  return -1;
       }
@@ -145,19 +169,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);
@@ -165,6 +183,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(vm, VCORE_NONE, "Could not find port to unhook %u (0x%x)\n", port, port);
+	return -1;
+    }
+
+    free_hook(vm, hook);
+
+    return 0;
+}
+
 
 
 
@@ -176,7 +207,7 @@ void v3_refresh_io_map(struct v3_vm_info * vm) {
     struct v3_io_hook * tmp = NULL;
     
     if (io_map->update_map == NULL) {
-	PrintError("Trying to refresh an io map with no backend\n");
+	PrintError(vm, VCORE_NONE, "Trying to refresh an io map with no backend\n");
 	return;
     }
 
@@ -194,10 +225,10 @@ 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;
 
-    V3_Print("VMM IO Map\n");
+    V3_Print(vm, VCORE_NONE, "VMM IO Map\n");
 
     v3_rb_for_each_entry(tmp_hook, &(io_map->map), tree_node) {
-	V3_Print("IO Port: %hu (Read=%p) (Write=%p)\n", 
+	V3_Print(vm, VCORE_NONE, "IO Port: %hu (Read=%p) (Write=%p)\n", 
 		 tmp_hook->port, 
 		 (void *)(tmp_hook->read), (void *)(tmp_hook->write));
     }