Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


moved over the a real linked list implementation
[palacios.git] / palacios / src / palacios / vmm_dev_mgr.c
index 615c8ec..8652209 100644 (file)
@@ -2,7 +2,7 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm.h>
-
+#include <palacios/vmm_irq.h>
 
 extern struct vmm_os_hooks *os_hooks;
 
@@ -11,21 +11,24 @@ extern struct vmm_os_hooks *os_hooks;
 #endif
 
 int dev_mgr_init(struct vmm_dev_mgr * mgr) {
-  mgr->dev_list.head = NULL;
-  mgr->dev_list.num_devs = 0;
+
+  INIT_LIST_HEAD(&(mgr->dev_list));
+  mgr->num_devs = 0;
+
+  INIT_LIST_HEAD(&(mgr->io_hooks));
+  mgr->num_io_hooks = 0;
   return 0;
 }
 
 
-int dev_mgr_deinit(struct vmm_dev_mgr * mgr)
-{
-  struct vm_device * dev = mgr->dev_list.head;
+int dev_mgr_deinit(struct vmm_dev_mgr * mgr) {
+  struct vm_device * dev;
 
-  while (dev) { 
+  list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
     unattach_device(dev);
     free_device(dev);
-    dev = dev->next;
   }
+
   return 0;
 }
 
@@ -33,144 +36,77 @@ int dev_mgr_deinit(struct vmm_dev_mgr * mgr)
 
 
 int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
-  dev->next = mgr->dev_list.head;
-  dev->prev = 0;
-  if (dev->next) { 
-    dev->next->prev = dev;
-  }
-  mgr->dev_list.head = dev;
-
-  mgr->dev_list.num_devs++;
+  list_add(&(dev->dev_link), &(mgr->dev_list));
+  mgr->num_devs++;
 
   return 0;
 }
 
 int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
-  if (mgr->dev_list.head == dev) { 
-    mgr->dev_list.head = dev->next;
-  } else {
-    dev->prev->next = dev->next;
-  }
-  if (dev->next) { 
-    dev->next->prev = dev->prev;
-  }
-  
-  mgr->dev_list.num_devs--;
+  list_del(&(dev->dev_link));
+  mgr->num_devs--;
 
   return 0;
 }
 
 
-int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
-  hook->mgr_next = mgr->io_hooks.head;
-  hook->mgr_prev = NULL;
-  if (hook->mgr_next) {
-    hook->mgr_next->mgr_prev = hook;
-  }
-  mgr->io_hooks.head = hook;
-
-  mgr->io_hooks.num_hooks++;
 
+/* 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) {
-  if (mgr->io_hooks.head == hook) {
-    mgr->io_hooks.head = hook->mgr_next;
-  } else {
-    hook->mgr_prev->mgr_next = hook->mgr_next;
-  }
-
-  if (hook->mgr_next) {
-    hook->mgr_next->mgr_prev = hook->mgr_prev;
-  }
-  
-  mgr->io_hooks.num_hooks--;
+  list_del(&(hook->mgr_list));
+  mgr->num_io_hooks--;
 
   return 0;
 }
 
 
 int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  hook->dev_next = dev->io_hooks.head;
-  hook->dev_prev = NULL;
-  if (hook->dev_next) {
-    hook->dev_next->dev_prev = hook;
-  }
-  dev->io_hooks.head = hook;
-
-  dev->io_hooks.num_hooks++;
-
+  list_add(&(hook->dev_list), &(dev->io_hooks));
+  dev->num_io_hooks++;
   return 0;
 }
 
 
 int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  if (dev->io_hooks.head == hook) {
-    dev->io_hooks.head = hook->dev_next;
-  } else {
-    hook->dev_prev->dev_next = hook->dev_next;
-  }
-
-  if (hook->dev_next) {
-    hook->dev_next->dev_prev = hook->dev_prev;
-  }
-  
-  dev->io_hooks.num_hooks--;
+  list_del(&(hook->dev_list));
+  dev->num_io_hooks--;
 
   return 0;
 }
 
 
+
+
+
 struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
-  struct dev_io_hook * tmp = mgr->io_hooks.head;
+  struct dev_io_hook * tmp;
 
-  while (tmp) {
+  list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) {
     if (tmp->port == port) {
-      break;
+      return tmp;
     }
-    tmp = tmp->mgr_next;
   }
-
-  return tmp;
+  return NULL;
 }
 
 struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
-  struct dev_io_hook * tmp = dev->io_hooks.head;
+  struct dev_io_hook * tmp;
 
-  while (tmp) {
+  list_for_each_entry(tmp, &(dev->io_hooks), dev_list) {
     if (tmp->port == port) {
-      break;
+      return tmp;
     }
-    tmp = tmp->dev_next;
   }
-
-  return tmp;
-}
-
-
-
-
-int 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;
+  return NULL;
 }
 
-int 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;
-}
 
 
 
@@ -224,13 +160,151 @@ int dev_unhook_io(struct vm_device   *dev,
 
 
 
+
+/* IRQ HOOKS */
+
+int dev_mgr_add_irq_hook(struct vmm_dev_mgr * mgr, struct dev_irq_hook * hook) {
+  list_add(&(hook->mgr_list), &(mgr->irq_hooks));
+  mgr->num_irq_hooks++;
+  return 0;
+}
+
+
+int dev_mgr_remove_irq_hook(struct vmm_dev_mgr * mgr, struct dev_irq_hook * hook) {
+  list_del(&(hook->mgr_list));
+  mgr->num_irq_hooks--;
+
+  return 0;
+}
+
+
+int dev_add_irq_hook(struct vm_device * dev, struct dev_irq_hook * hook) {
+  list_add(&(hook->dev_list), &(dev->irq_hooks));
+  dev->num_irq_hooks++;
+  return 0;
+}
+
+
+int dev_remove_irq_hook(struct vm_device * dev, struct dev_irq_hook * hook) {
+  list_del(&(hook->dev_list));
+  dev->num_irq_hooks--;
+
+  return 0;
+}
+
+
+
+
+
+struct dev_irq_hook * dev_mgr_find_irq_hook(struct vmm_dev_mgr * mgr, uint_t irq) {
+  struct dev_irq_hook * tmp;
+
+  list_for_each_entry(tmp, &(mgr->irq_hooks), mgr_list) {
+    if (tmp->irq == irq) {
+      return tmp;
+    }
+  }
+  return NULL;
+}
+
+struct dev_irq_hook * dev_find_irq_hook(struct vm_device * dev, uint_t irq) {
+  struct dev_irq_hook * tmp;
+
+  list_for_each_entry(tmp, &(dev->irq_hooks), dev_list) {
+    if (tmp->irq == irq) {
+      return tmp;
+    }
+  }
+  return NULL;
+}
+
+
+
+
+int dev_hook_irq(struct vm_device   *dev,
+                uint_t irq,
+                int (*handler)(uint_t irq, struct vm_device * dev)) {
+
+  struct dev_irq_hook *hook = os_hooks->malloc(sizeof(struct dev_irq_hook));
+  
+  if (!hook) { 
+    return -1;
+  }
+
+
+  if (hook_irq(&(dev->vm->irq_map), irq, 
+              (int (*)(uint_t, void *))handler, 
+              (void *)dev) == 0) {
+
+    hook->dev = dev;
+    hook->irq = irq;
+    hook->handler = handler;
+    
+    dev_mgr_add_irq_hook(&(dev->vm->dev_mgr), hook);
+    dev_add_irq_hook(dev, hook);
+  } else {
+    return -1;
+  }
+
+  return 0;
+}
+
+
+int dev_unhook_irq(struct vm_device * dev,
+                  uint_t irq) {
+
+  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
+  struct dev_irq_hook * hook = dev_mgr_find_irq_hook(mgr, irq);
+
+  if (!hook) { 
+    return -1;
+  }
+
+  dev_mgr_remove_irq_hook(mgr, hook);
+  dev_remove_irq_hook(dev, hook);
+
+  return unhook_irq(&(dev->vm->irq_map), irq);
+}
+
+
+
+
+
+
+
+
+int 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 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)
 {
 
-  struct dev_mem_hook *hook = os_hooks->malloc(sizeof(struct dev_mem_hook));
+  struct dev_mem_hook *hook;
+  VMMMalloc(struct dev_mem_hook *, hook,sizeof(struct dev_mem_hook));
   
   if (!hook) { 
     return -1;
@@ -260,24 +334,18 @@ int dev_mgr_hook_mem(struct guest_info    *vm,
 }
 
 
-int dev_mgr_unhook_mem(struct guest_info    *vm,
-                      struct vm_device   *device,
-                      void               *start,
-                      void               *end) 
-{
-  struct dev_mem_hook *hook = device->mem_hooks.head;
-
-  while (hook) { 
-    if (((hook->addr_start) == start) && (hook->addr_end == end)) {
-      break;
-    }
-  }
-
+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);
+  
   if (!hook) { 
     // Very bad - unhooking something that doesn't exist!
     return -1;
   }
-
+  */
 
   /* not implemented yet
   return unhook_mem_port(vm->mem_map,
@@ -292,11 +360,12 @@ int dev_mgr_unhook_mem(struct guest_info    *vm,
 
 
 void PrintDebugDevMgr(struct vmm_dev_mgr * mgr) {
-  struct vm_device * dev = mgr->dev_list.head;
+  struct vm_device * dev;
+  PrintDebug("%d devices registered with manager\n", mgr->num_devs);
 
-  while (dev) {
+  list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
     PrintDebugDev(dev);
-    dev = dev->next;
+    PrintDebug("next..\n");
   }
 
   return;
@@ -314,13 +383,12 @@ void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {
 }
 
 void PrintDebugDevIO(struct vm_device * dev) {
-  struct dev_io_hook * hook = dev->io_hooks.head;
-  
-  PrintDebug("IO Hooks (%d) for Device: %s\n", dev->io_hooks.num_hooks, dev->name);
-  
-  while (hook) {
+  struct dev_io_hook * hook;
+
+  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);
-    hook = hook->dev_next;
   }
 
   return;