X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=3cfe633dc6fe990e315805351918082e57eecb8d;hb=23ee10c7be0d5c16226b2f703741842248add8e7;hp=d6431b7e25f1a2837215767836de28df3c2fcb5f;hpb=d16ef42bba84c7fe88352e5dc23e5e70a5207e29;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index d6431b7..3cfe633 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -2,20 +2,26 @@
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
 
-extern struct vmm_os_hooks * os_hooks;
 
 
 
+#ifndef DEBUG_IO
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
 
-void init_vmm_io_map(vmm_io_map_t * io_map) {
+void 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;
 }
 
 
 
-int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
+
+
+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;
@@ -30,7 +36,7 @@ int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
 
     return 0;
   } else {
-    vmm_io_hook_t * tmp_hook = io_map->head;
+    struct vmm_io_hook * tmp_hook = io_map->head;
     
     while ((tmp_hook->next)  && 
 	   (tmp_hook->next->port <= io_hook->port)) {
@@ -59,7 +65,7 @@ int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
   return -1;
 }
 
-int remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
+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) {
@@ -125,11 +131,12 @@ static int default_read(ushort_t port, void * dst, uint_t length, void * priv_da
   return 0;
 }
 
-int hook_io_port(vmm_io_map_t * io_map, 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), 
-		 void * priv_data) {
-  vmm_io_hook_t * io_hook = os_hooks->malloc(sizeof(vmm_io_hook_t));
+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), 
+		    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));
 
   io_hook->port = port;
 
@@ -158,8 +165,9 @@ int hook_io_port(vmm_io_map_t * io_map, uint_t port,
   return 0;
 }
 
-int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
-  vmm_io_hook_t * hook = get_io_hook(io_map, port);
+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);
 
   if (hook == NULL) {
     return -1;
@@ -170,8 +178,8 @@ int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
 }
 
 
-vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port) {
-  vmm_io_hook_t * tmp_hook;
+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;
@@ -182,8 +190,8 @@ vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port) {
 
 
 
-void PrintDebugIOMap(vmm_io_map_t * io_map) {
-  vmm_io_hook_t * iter = io_map->head;
+void PrintDebugIOMap(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);