X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=9f44fbd27fd58b78a43b46b7a22a2cd6c7767dce;hb=29e825c5f095066bbb5ebbec5a5af1419d883264;hp=514d8e10e92bbcd9fdc7cb6846043add6aa26b8f;hpb=2ff2b6c0456f332f5dfbaffdf943c07765709173;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 514d8e1..9f44fbd 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -30,93 +30,86 @@
 #endif
 
 
-static int default_write(ushort_t port, void *src, uint_t length, void * priv_data);
-static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data);
+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);
 
 
-void v3_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;
-}
+void v3_init_io_map(struct guest_info * info) {
 
+  info->io_map.map.rb_node = NULL;
+  info->io_map.arch_data = NULL;
+  info->io_map.update_map = NULL;
 
+}
 
 
 
-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;
-    io_map->num_ports = 1;
-    return 0;
-  } else if (io_map->head->port > io_hook->port) {
-    io_hook->next = io_map->head;
+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);
+  struct rb_node * parent = NULL;
+  struct v3_io_hook * tmp_hook = NULL;
 
-    io_map->head->prev = io_hook;
-    io_map->head = io_hook;
-    io_map->num_ports++;
+  while (*p) {
+    parent = *p;
+    tmp_hook = rb_entry(parent, struct v3_io_hook, tree_node);
 
-    return 0;
-  } else {
-    struct vmm_io_hook * tmp_hook = io_map->head;
-    
-    while ((tmp_hook->next)  && 
-	   (tmp_hook->next->port <= io_hook->port)) {
-	tmp_hook = tmp_hook->next;
-    }
-    
-    if (tmp_hook->port == io_hook->port) {
-      //tmp_hook->read = io_hook->read;
-      //tmp_hook->write = io_hook->write;
-      //V3_Free(io_hook);
-      return -1;
+    if (hook->port < tmp_hook->port) {
+      p = &(*p)->rb_left;
+    } else if (hook->port > tmp_hook->port) {
+      p = &(*p)->rb_right;
     } else {
-      io_hook->prev = tmp_hook;
-      io_hook->next = tmp_hook->next;
+      return tmp_hook;
+    }
+  }
+  rb_link_node(&(hook->tree_node), parent, p);
 
-      if (tmp_hook->next) {
-	tmp_hook->next->prev = io_hook;
-      }
+  return NULL;
+}
 
-      tmp_hook->next = io_hook;
 
-      io_map->num_ports++;
-      return 0;
-    }
+static inline struct v3_io_hook * insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) {
+  struct v3_io_hook * ret;
+
+  if ((ret = __insert_io_hook(info, hook))) {
+    return ret;
   }
-  return -1;
+
+  v3_rb_insert_color(&(hook->tree_node), &(info->io_map.map));
+
+  return NULL;
 }
 
-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) {
-    io_hook->prev->next = io_hook->next;
-  } else {
-    return -1;
-    // data corruption failure
-  }
-  
-  if (io_hook->next) {
-    io_hook->next->prev = io_hook->prev;
-  }
 
-  io_map->num_ports--;
+struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port) {
+  struct rb_node * n = info->io_map.map.rb_node;
+  struct v3_io_hook * hook = NULL;
 
-  return 0;
+  while (n) {
+    hook = rb_entry(n, struct v3_io_hook, tree_node);
+    
+    if (port < hook->port) {
+      n = n->rb_left;
+    } else if (port > hook->port) {
+      n = n->rb_right;
+    } else {
+      return hook;
+    }
+  }
+
+  return NULL;
 }
 
 
 
 
 
+
 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), 
+		    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) {
-  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));
+  struct v3_io_hook * io_hook = (struct v3_io_hook *)V3_Malloc(sizeof(struct v3_io_hook));
 
   io_hook->port = port;
 
@@ -132,54 +125,61 @@ int v3_hook_io_port(struct guest_info * info, uint_t port,
     io_hook->write = write;
   }
 
-  io_hook->next = NULL;
-  io_hook->prev = NULL;
 
   io_hook->priv_data = priv_data;
 
-  if (add_io_hook(io_map, io_hook) != 0) {
+  if (insert_io_hook(info, io_hook)) {
     V3_Free(io_hook);
     return -1;
   }
 
+
+  if (info->io_map.update_map(info, port, 
+			      ((read == NULL) ? 0 : 1), 
+			      ((write == NULL) ? 0 : 1)) == -1) {
+    V3_Free(io_hook);
+    return -1;
+  }
+
+
   return 0;
 }
 
 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);
+  struct v3_io_hook * hook = v3_get_io_hook(info, port);
 
   if (hook == NULL) {
     return -1;
   }
 
-  remove_io_hook(io_map, hook);
+  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);
+
   return 0;
 }
 
 
-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;
-    }
-  }
-  return NULL;
-}
 
 
 
-void v3_print_io_map(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);
+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");
+
+  do {
+    tmp_hook = rb_entry(node, struct v3_io_hook, tree_node);
 
-  while (iter) {
     PrintDebug("IO Port: %hu (Read=%p) (Write=%p)\n", 
-	       iter->port, 
-	       (void *)(iter->read), (void *)(iter->write));
-  }
+	       tmp_hook->port, 
+	       (void *)(tmp_hook->read), (void *)(tmp_hook->write));
+  } while ((node = v3_rb_next(node)));
 }
 
 
@@ -187,7 +187,7 @@ void v3_print_io_map(struct vmm_io_map * io_map) {
 /*
  * Write a byte to an I/O port.
  */
-void v3_outb(ushort_t port, uchar_t value) {
+void v3_outb(uint16_t port, uint8_t value) {
     __asm__ __volatile__ (
 	"outb %b0, %w1"
 	:
@@ -198,8 +198,8 @@ void v3_outb(ushort_t port, uchar_t value) {
 /*
  * Read a byte from an I/O port.
  */
-uchar_t v3_inb(ushort_t port) {
-    uchar_t value;
+uint8_t v3_inb(uint16_t port) {
+    uint8_t value;
 
     __asm__ __volatile__ (
 	"inb %w1, %b0"
@@ -213,7 +213,7 @@ uchar_t v3_inb(ushort_t port) {
 /*
  * Write a word to an I/O port.
  */
-void v3_outw(ushort_t port, ushort_t value) {
+void v3_outw(uint16_t port, uint16_t value) {
     __asm__ __volatile__ (
 	"outw %w0, %w1"
 	:
@@ -224,8 +224,8 @@ void v3_outw(ushort_t port, ushort_t value) {
 /*
  * Read a word from an I/O port.
  */
-ushort_t v3_inw(ushort_t port) {
-    ushort_t value;
+uint16_t v3_inw(uint16_t port) {
+    uint16_t value;
 
     __asm__ __volatile__ (
 	"inw %w1, %w0"
@@ -239,7 +239,7 @@ ushort_t v3_inw(ushort_t port) {
 /*
  * Write a double word to an I/O port.
  */
-void v3_outdw(ushort_t port, uint_t value) {
+void v3_outdw(uint16_t port, uint_t value) {
     __asm__ __volatile__ (
 	"outl %0, %1"
 	:
@@ -250,7 +250,7 @@ void v3_outdw(ushort_t port, uint_t value) {
 /*
  * Read a double word from an I/O port.
  */
-uint_t v3_indw(ushort_t port) {
+uint_t v3_indw(uint16_t port) {
     uint_t value;
 
     __asm__ __volatile__ (
@@ -266,7 +266,7 @@ uint_t v3_indw(ushort_t port) {
 
 
 /* FIX ME */
-static int default_write(ushort_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) {
@@ -292,10 +292,10 @@ static int default_write(ushort_t port, void *src, uint_t length, void * priv_da
   return 0;
 }
 
-static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data) {
+static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data) {
 
   /*    
-	uchar_t value;
+	uint8_t value;
 
     __asm__ __volatile__ (
 	"inb %w1, %b0"