removed a lot of pointless stuff from the device manager

diff --git a/palacios/include/palacios/vm_dev.h b/palacios/include/palacios/vm_dev.h
index 6c7d77f..acac3f1 100644 (file)
--- a/palacios/include/palacios/vm_dev.h
+++ b/palacios/include/palacios/vm_dev.h
@@ -63,11 +63,6 @@ struct vm_device {
 
     uint_t num_io_hooks;
     struct list_head io_hooks;
-    uint_t num_mem_hooks;
-    struct list_head mem_hooks;
-    uint_t num_irq_hooks;
-    struct list_head irq_hooks;
-
 };
 
 
@@ -86,19 +81,8 @@ int v3_dev_hook_io(struct vm_device   *dev,
 int v3_dev_unhook_io(struct vm_device   *dev,
                     ushort_t            port);
 
-int v3_dev_hook_mem(struct vm_device   *dev,
-                   void               *start,
-                   void               *end);
-
-int v3_dev_unhook_mem(struct vm_device   * dev,
-                     void               * start,
-                     void               * end);
 
 
-int v3_dev_hook_irq(struct vm_device * dev,
-                   uint_t irq, 
-                   int (*handler)(uint_t irq, struct vm_device * dev));
-int v3_dev_unhook_irq(struct vm_device * dev, uint_t irq);
 
 
 

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index b7552c4..c3a5558 100644 (file)
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -25,24 +25,16 @@
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
+#include <palacios/vmm_hashtable.h>
 
 struct vm_device;
 struct guest_info;
 
-
 struct vmm_dev_mgr {
     uint_t num_devs;
     struct list_head dev_list;
 
-    uint_t num_io_hooks;
-    struct list_head io_hooks;
-  
-    uint_t num_mem_hooks;
-    struct list_head mem_hooks;
-
-    uint_t num_msr_hook;
-    struct list_head msr_hooks;
-
+    struct hashtable * dev_table;
 };
 
 
@@ -54,38 +46,8 @@ struct vmm_dev_mgr {
 // when the guest is stopped
 //
 
-int v3_attach_device(struct guest_info *vm, struct vm_device * dev);
-int v3_unattach_device(struct vm_device *dev);
-
-
-
-
-
-
-struct dev_io_hook {
-    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 vm_device * dev;
-
-    // Do not touch anything below this  
-
-    struct list_head dev_list;
-    struct list_head mgr_list;
-};
-
-struct dev_mem_hook {
-    void  *addr_start;
-    void  *addr_end;
-
-    struct vm_device * dev;
-
-    // Do not touch anything below this
-    struct list_head dev_list;
-    struct list_head mgr_list;
-};
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev);
+int v3_detach_device(struct vm_device * dev);
 
 
 int v3_init_dev_mgr(struct guest_info * info);
@@ -93,8 +55,6 @@ int v3_dev_mgr_deinit(struct guest_info * info);
 
 void PrintDebugDevMgr(struct guest_info * info);
 void PrintDebugDev(struct vm_device * dev);
-void PrintDebugDevIO(struct vm_device * dev);
-void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr);
 
 #endif // ! __V3VEE__
 

diff --git a/palacios/src/palacios/vm_dev.c b/palacios/src/palacios/vm_dev.c
index ac034ca..9078f66 100644 (file)
--- a/palacios/src/palacios/vm_dev.c
+++ b/palacios/src/palacios/vm_dev.c
@@ -24,7 +24,6 @@
 
 
 static struct vm_device * v3_allocate_device() {
-
     struct vm_device * dev = NULL;
     dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
 
@@ -35,16 +34,6 @@ static struct vm_device * v3_allocate_device() {
     dev->vm = NULL;
     dev->private_data = NULL;
 
-
-    INIT_LIST_HEAD(&(dev->io_hooks));
-    dev->num_io_hooks = 0;
-
-    INIT_LIST_HEAD(&(dev->mem_hooks));
-    dev->num_mem_hooks = 0;
-  
-    INIT_LIST_HEAD(&(dev->irq_hooks));
-    dev->num_irq_hooks = 0;
-
     return dev;
 }
 

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 61850bf..f4c8d62 100644 (file)
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -30,20 +30,17 @@
 #endif
 
 
+//DEFINE_HASHTABLE_INSERT(insert_dev, const char *, struct vm_device *);
+//DEFINE_HASHTABLE_SEARCH(find_dev, const char *, struct vm_device *);
+//DEFINE_HASHTABLE_REMOVE(remove_dev, const char *, struct vm_device *, 0);
 
 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;
 
-    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;
+    //   mgr->dev_table = v3_create_htable(0, , );
 
     return 0;
 }
@@ -55,7 +52,7 @@ int v3_dev_mgr_deinit(struct guest_info * info) {
     struct vm_device * tmp;
 
     list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
-       v3_unattach_device(dev);
+       v3_detach_device(dev);
        v3_free_device(dev);
     }
 
@@ -77,7 +74,7 @@ int v3_attach_device(struct guest_info * vm, struct vm_device * dev) {
     return 0;
 }
 
-int v3_unattach_device(struct vm_device * dev) {
+int v3_detach_device(struct vm_device * dev) {
     struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
     dev->ops->deinit(dev);
@@ -95,74 +92,17 @@ int v3_unattach_device(struct vm_device * dev) {
 
 
 /* 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) {
-           return tmp;
-       }
-    }
-    return NULL;
-}
-
-
-
-
-
-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;
-    }
-
-
-    if (v3_hook_io_port(dev->vm, port, 
-                       (int (*)(ushort_t, void *, uint_t, void *))read, 
-                       (int (*)(ushort_t, void *, uint_t, void *))write, 
-                       (void *)dev) == 0) {
-
-       hook->dev = dev;
-       hook->port = port;
-       hook->read = read;
-       hook->write = write;
-    
-       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;
-    }
-
-    return 0;
+int v3_dev_hook_io(struct vm_device * dev, uint16_t port,
+                  int (*read)(uint16_t port, void * dst, uint_t length, struct vm_device * dev),
+                  int (*write)(uint16_t port, void * src, uint_t length, struct vm_device * dev)) {
+    return v3_hook_io_port(dev->vm, port, 
+                          (int (*)(ushort_t, void *, uint_t, void *))read, 
+                          (int (*)(ushort_t, void *, uint_t, void *))write, 
+                          (void *)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);
-
-    if (!hook) { 
-       return -1;
-    }
-
-    list_del(&(hook->mgr_list));
-    mgr->num_io_hooks--;
-
-    list_del(&(hook->dev_list));
-    dev->num_io_hooks--;
-
-
+int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
     return v3_unhook_io_port(dev->vm, port);
 }
 
@@ -170,86 +110,12 @@ int v3_dev_unhook_io(struct vm_device   *dev,
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-#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));
-    //  V3_Malloc(struct dev_mem_hook *, hook,sizeof(struct dev_mem_hook));
-
-    if (!hook) { 
-       return -1;
-    }
-
-    /* not implemented yet
-       hook_memory(vm->mem_map, 
-       guest_physical_address_start, 
-       guest_physical_address_end, 
-       read,
-       write,
-       device);
-
-    */
-
-    return -1;   // remove when hook_memory works
-
-
-    hook->addr_start = start;
-    hook->addr_end = end;
-
-    return 0;
-  
-}
-
-
-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);
-  
-      if (!hook) { 
-      // Very bad - unhooking something that doesn't exist!
-      return -1;
-      }
-    */
-
-    /* not implemented yet
-       return unhook_mem_port(vm->mem_map,
-       guest_physical_start,
-       guest_physical_end) ;
-
-    */
-    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;
+
     PrintDebug("%d devices registered with manager\n", mgr->num_devs);
 
     list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
@@ -262,32 +128,13 @@ void PrintDebugDevMgr(struct guest_info * info) {
 
 
 void PrintDebugDev(struct vm_device * dev) {
-  
     PrintDebug("Device: %s\n", dev->name);
-    PrintDebugDevIO(dev);
-}
-
-void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {
-
 }
 
-void PrintDebugDevIO(struct vm_device * dev) {
-    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%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