X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=e872ce7cd1464a1d6ca9b955e02682b0500be49a;hb=176328b42924a56b53e4c7255ef83acb5847c621;hp=bc9a940031400d7d752779ffddcf275d4a768723;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index bc9a940..e872ce7 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -24,12 +24,14 @@
 #include <palacios/vmm_decoder.h>
 
 
-
-#ifndef NULL
-#define NULL 0
+#ifndef DEBUG_DEV_MGR
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
 #endif
 
-int dev_mgr_init(struct guest_info * info) {
+
+
+int v3_init_dev_mgr(struct guest_info * info) {
   struct vmm_dev_mgr * mgr = &(info->dev_mgr);
   INIT_LIST_HEAD(&(mgr->dev_list));
   mgr->num_devs = 0;
@@ -37,18 +39,24 @@ int dev_mgr_init(struct guest_info * info) {
   INIT_LIST_HEAD(&(mgr->io_hooks));
   mgr->num_io_hooks = 0;
 
+  INIT_LIST_HEAD(&(mgr->mem_hooks));
+  mgr->num_mem_hooks = 0;
+
+  INIT_LIST_HEAD(&(mgr->msr_hooks));
+  mgr->num_msr_hook = 0;
+
   return 0;
 }
 
 
-int dev_mgr_deinit(struct guest_info * info) {
+int v3_dev_mgr_deinit(struct guest_info * info) {
   struct vm_device * dev;
   struct vmm_dev_mgr * mgr = &(info->dev_mgr);
   struct vm_device * tmp;
 
   list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
     v3_unattach_device(dev);
-    free_device(dev);
+    v3_free_device(dev);
   }
 
   return 0;
@@ -56,49 +64,28 @@ int dev_mgr_deinit(struct guest_info * info) {
 
 
 
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev) {
+  struct vmm_dev_mgr *mgr= &(vm->dev_mgr);
+  
+  dev->vm = vm;
 
-static int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
   list_add(&(dev->dev_link), &(mgr->dev_list));
   mgr->num_devs++;
 
-  return 0;
-}
-
-static int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
-  list_del(&(dev->dev_link));
-  mgr->num_devs--;
-
-  return 0;
-}
-
-
-
-/* IO HOOKS */
-int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
-  list_add(&(hook->mgr_list), &(mgr->io_hooks));
-  mgr->num_io_hooks++;
-  return 0;
-}
-
-
-int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
-  list_del(&(hook->mgr_list));
-  mgr->num_io_hooks--;
+  dev->ops->init(dev);
 
   return 0;
 }
 
+int v3_unattach_device(struct vm_device * dev) {
+  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
-int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  list_add(&(hook->dev_list), &(dev->io_hooks));
-  dev->num_io_hooks++;
-  return 0;
-}
+  dev->ops->deinit(dev);
 
+  list_del(&(dev->dev_link));
+  mgr->num_devs--;
 
-int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  list_del(&(hook->dev_list));
-  dev->num_io_hooks--;
+  dev->vm = NULL;
 
   return 0;
 }
@@ -107,8 +94,9 @@ int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
 
 
 
-struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
-  struct dev_io_hook * tmp;
+/* IO HOOKS */
+static struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
+  struct dev_io_hook * tmp = NULL;
 
   list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) {
     if (tmp->port == port) {
@@ -118,27 +106,18 @@ struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t por
   return NULL;
 }
 
-struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
-  struct dev_io_hook * tmp;
 
-  list_for_each_entry(tmp, &(dev->io_hooks), dev_list) {
-    if (tmp->port == port) {
-      return tmp;
-    }
-  }
-  return NULL;
-}
 
 
 
-
-int dev_hook_io(struct vm_device   *dev,
-		ushort_t            port,
-		int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
-		int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
-
-  struct dev_io_hook *hook = (struct dev_io_hook *)V3_Malloc(sizeof(struct dev_io_hook));
+int v3_dev_hook_io(struct vm_device   *dev,
+		   ushort_t            port,
+		   int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
+		   int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
   
+  struct dev_io_hook *hook = (struct dev_io_hook *)V3_Malloc(sizeof(struct dev_io_hook));
+  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
+
   if (!hook) { 
     return -1;
   }
@@ -154,8 +133,11 @@ int dev_hook_io(struct vm_device   *dev,
     hook->read = read;
     hook->write = write;
     
-    dev_mgr_add_io_hook(&(dev->vm->dev_mgr), hook);
-    dev_add_io_hook(dev, hook);
+    list_add(&(hook->mgr_list), &(mgr->io_hooks));
+    mgr->num_io_hooks++;
+    
+    list_add(&(hook->dev_list), &(dev->io_hooks));
+    dev->num_io_hooks++;
   } else {
 
     return -1;
@@ -165,9 +147,8 @@ int dev_hook_io(struct vm_device   *dev,
 }
 
 
-int dev_unhook_io(struct vm_device   *dev,
+int v3_dev_unhook_io(struct vm_device   *dev,
 		  ushort_t            port) {
-
   struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
   struct dev_io_hook * hook = dev_mgr_find_io_hook(mgr, port);
 
@@ -175,41 +156,38 @@ int dev_unhook_io(struct vm_device   *dev,
     return -1;
   }
 
-  dev_mgr_remove_io_hook(mgr, hook);
-  dev_remove_io_hook(dev, hook);
+  list_del(&(hook->mgr_list));
+  mgr->num_io_hooks--;
+
+  list_del(&(hook->dev_list));
+  dev->num_io_hooks--;
+
 
   return v3_unhook_io_port(dev->vm, port);
 }
 
 
-int v3_attach_device(struct guest_info * vm, struct vm_device * dev) {
-  struct vmm_dev_mgr *mgr= &(vm->dev_mgr);
-  
-  dev->vm = vm;
-  dev_mgr_add_device(mgr, dev);
-  dev->ops->init(dev);
 
-  return 0;
-}
 
-int v3_unattach_device(struct vm_device * dev) {
-  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
-  dev->ops->deinit(dev);
-  dev_mgr_remove_device(mgr, dev);
-  dev->vm = NULL;
 
-  return 0;
-}
 
 
 
 
 
-int dev_mgr_hook_mem(struct guest_info    *vm,
-		     struct vm_device   *device,
-		     void               *start,
-		     void               *end)
+
+
+
+
+
+
+
+#if 0
+static int dev_mgr_hook_mem(struct guest_info    *vm,
+			    struct vm_device   *device,
+			    void               *start,
+			    void               *end)
 {
 
   struct dev_mem_hook * hook = (struct dev_mem_hook*)V3_Malloc(sizeof(struct dev_mem_hook));
@@ -240,9 +218,9 @@ int dev_mgr_hook_mem(struct guest_info    *vm,
 }
 
 
-int dev_mgr_unhook_mem(struct vm_device   *dev,
-		       addr_t start,
-		       addr_t end)  {
+static int dev_mgr_unhook_mem(struct vm_device   *dev,
+			      addr_t start,
+			      addr_t end)  {
   /*
   struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
   struct dev_mem_hook *hook = dev_mgr_find_mem_hook(mgr, start, end);
@@ -261,10 +239,32 @@ int dev_mgr_unhook_mem(struct vm_device   *dev,
   */
   return -1;
 }
+#endif
+
+
+
+
+
+
+
+
+
+
 
 
 
 
+
+
+
+
+
+
+
+
+
+#ifdef DEBUG_DEV_MGR
+
 void PrintDebugDevMgr(struct guest_info * info) {
   struct vmm_dev_mgr * mgr = &(info->dev_mgr);
   struct vm_device * dev;
@@ -295,8 +295,17 @@ void PrintDebugDevIO(struct vm_device * dev) {
   PrintDebug("IO Hooks(%d)  for Device: %s\n", dev->num_io_hooks,  dev->name);
 
   list_for_each_entry(hook, &(dev->io_hooks), dev_list) {
-    PrintDebug("\tPort: 0x%x (read=0x%x), (write=0x%x)\n", hook->port, hook->read, hook->write);
+    PrintDebug("\tPort: 0x%x (read=0x%p), (write=0x%p)\n", hook->port, 
+	       (void *)(addr_t)(hook->read), 
+	       (void *)(addr_t)(hook->write));
   }
 
   return;
 }
+
+#else 
+void PrintDebugDevMgr(struct guest_info * info) {}
+void PrintDebugDev(struct vm_device * dev) {}
+void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {}
+void PrintDebugDevIO(struct vm_device * dev) {}
+#endif