X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=0211b99b97bad6dd822fcea5d54639577dfa9235;hp=793a0f3bae2348d78beb10b1b395826a365ffd43;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=5b56e669e95075b07c1f7c7d77b4e37311b6a4c2

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 793a0f3..0211b99 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -20,11 +20,11 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
+#include <palacios/vm_guest.h>
 
 
 
-
-#ifndef DEBUG_IO
+#ifndef CONFIG_DEBUG_IO
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -81,7 +81,7 @@ static inline struct v3_io_hook * insert_io_hook(struct guest_info * info, struc
 }
 
 
-struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port) {
+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 * hook = NULL;
 
@@ -104,8 +104,7 @@ struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port) {
 
 
 
-
-int v3_hook_io_port(struct guest_info * info, uint_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), 
 		    void * priv_data) {
@@ -129,39 +128,42 @@ int v3_hook_io_port(struct guest_info * info, uint_t port,
   io_hook->priv_data = priv_data;
 
   if (insert_io_hook(info, io_hook)) {
-      PrintError("Could not insert IO hook for port %d\n", port);
+      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 %d\n", port);
-      V3_Free(io_hook);
-      return -1;
+  if (info->io_map.update_map) {
+      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;
+      }
   }
 
-
   return 0;
 }
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port) {
-  struct v3_io_hook * hook = v3_get_io_hook(info, port);
+int v3_unhook_io_port(struct guest_info * info, uint16_t port) {
+    struct v3_io_hook * hook = v3_get_io_hook(info, port);
 
-  if (hook == NULL) {
-    return -1;
-  }
+    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));
+    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);
+    if (info->io_map.update_map) {
+	// set the arch map to default (this should be 1, 1)
+	info->io_map.update_map(info, port, 0, 0);
+    }
 
-  V3_Free(hook);
+    V3_Free(hook);
 
-  return 0;
+    return 0;
 }
 
 
@@ -169,19 +171,37 @@ int v3_unhook_io_port(struct guest_info * info, uint_t port) {
 
 
 
-void v3_print_io_map(struct guest_info * info) {
-  struct v3_io_hook * tmp_hook = NULL;
-  struct rb_node * node = v3_rb_first(&(info->io_map.map));
 
-  PrintDebug("VMM IO Map\n");
+void v3_refresh_io_map(struct guest_info * info) {
+    struct v3_io_map * io_map = &(info->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;
+    }
 
-  do {
-    tmp_hook = rb_entry(node, struct v3_io_hook, tree_node);
+    v3_rb_for_each_entry(tmp, &(io_map->map), tree_node) {
+	io_map->update_map(info, tmp->port, 
+			   ((tmp->read == NULL) ? 0 : 1), 
+			   ((tmp->write == NULL) ? 0 : 1));
+    }
 
-    PrintDebug("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)));
+}
+
+
+
+void v3_print_io_map(struct guest_info * info) {
+    struct v3_io_map * io_map = &(info->io_map);
+    struct v3_io_hook * tmp_hook = NULL;
+
+    V3_Print("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", 
+		 tmp_hook->port, 
+		 (void *)(tmp_hook->read), (void *)(tmp_hook->write));
+    }
 }
 
 
@@ -268,45 +288,30 @@ 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(uint16_t port, void * src, uint_t length, void * priv_data) {
+    if (length == 1) {
+	v3_outb(port, *(uint8_t *)src);
+    } else if (length == 2) {
+	v3_outw(port, *(uint16_t *)src);
+    } else if (length == 4) {
+	v3_outdw(port, *(uint32_t *)src);
+    } else {
+	return -1;
+    }
     
-  if (length == 1) {
-  __asm__ __volatile__ (
-  "outb %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  } else if (length == 2) {
-  __asm__ __volatile__ (
-  "outw %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  } else if (length == 4) {
-  __asm__ __volatile__ (
-  "outw %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  }
-  */
-  return 0;
+    return length;
 }
 
 static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data) {
+    if (length == 1) {
+	*(uint8_t *)dst = v3_inb(port);
+    } else if (length == 2) {
+	*(uint16_t *)dst = v3_inw(port);
+    } else if (length == 4) {
+	*(uint32_t *)dst = v3_indw(port);
+    } else {
+	return -1;
+    }
 
-  /*    
-	uint8_t value;
-
-    __asm__ __volatile__ (
-	"inb %w1, %b0"
-	: "=a" (value)
-	: "Nd" (port)
-    );
-
-    return value;
-  */
-
-  return 0;
+    return length;
 }