X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=c21295846b26801e536a4321430a1d7dd84d6a79;hb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;hp=258e85840971e1b9c0c6b1ad6ef4a1e2a8ed2f6e;hpb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 258e858..c212958 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -17,286 +17,227 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#include <palacios/vm_dev.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_decoder.h>
 
 
-
-#ifndef NULL
-#define NULL 0
+#ifndef CONFIG_DEBUG_DEV_MGR
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
 #endif
 
-int dev_mgr_init(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;
+static struct hashtable * master_dev_table = NULL;
 
-  return 0;
+static uint_t dev_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
 }
 
-
-int 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);
-  }
-
-  return 0;
+static int dev_eq_fn(addr_t key1, addr_t key2) {
+    char * name1 = (char *)key1;
+    char * name2 = (char *)key2;
+    
+    return (strcmp(name1, name2) == 0);
 }
 
 
+int v3_init_devices() {
+    extern struct v3_device_info __start__v3_devices[];
+    extern struct v3_device_info __stop__v3_devices[];
+    struct v3_device_info * tmp_dev =  __start__v3_devices;
+    int i = 0;
 
+#ifdef CONFIG_DEBUG_DEV_MGR
+    {
+	int num_devices = (__stop__v3_devices - __start__v3_devices) / sizeof(struct v3_device_info);
+	PrintDebug("%d Virtual devices registered with Palacios\n", num_devices);
+    }
+#endif
 
-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++;
+    PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices);
 
-  return 0;
-}
+    master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
 
-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;
-}
 
+    while (tmp_dev != __stop__v3_devices) {
+	PrintDebug("Device: %s\n", tmp_dev->name);
 
+	if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) {
+	    PrintError("Multiple instance of device (%s)\n", tmp_dev->name);
+	    return -1;
+	}
 
-/* 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;
-}
+	if (v3_htable_insert(master_dev_table, 
+			     (addr_t)(tmp_dev->name), 
+			     (addr_t)(tmp_dev->init)) == 0) {
+	    PrintError("Could not add device %s to master list\n", tmp_dev->name);
+	    return -1;
+	}
 
+	tmp_dev = &(__start__v3_devices[++i]);
+    }
 
-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--;
 
-  return 0;
+    return 0;
 }
 
 
-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;
-}
+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;
 
-int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  list_del(&(hook->dev_list));
-  dev->num_io_hooks--;
+    mgr->dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
 
-  return 0;
+    return 0;
 }
 
 
+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;
 
-
-
-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;
+    list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
+	v3_detach_device(dev);
+	v3_free_device(dev);
     }
-  }
-  return NULL;
-}
 
-struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
-  struct dev_io_hook * tmp = NULL;
-
-  list_for_each_entry(tmp, &(dev->io_hooks), dev_list) {
-    if (tmp->port == port) {
-      return tmp;
-    }
-  }
-  return NULL;
+    return 0;
 }
 
 
 
+int v3_create_device(struct guest_info * info, const char * dev_name, void * cfg_data) {
+    int (*dev_init)(struct guest_info * info, void * cfg_data);
 
-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));
-  
-  if (!hook) { 
-    return -1;
-  }
-
+    dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name);
 
-  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) {
+    if (dev_init == NULL) {
+	PrintError("Could not find device %s in master device table\n", dev_name);
+	return -1;
+    }
 
-    hook->dev = dev;
-    hook->port = port;
-    hook->read = read;
-    hook->write = write;
-    
-    dev_mgr_add_io_hook(&(dev->vm->dev_mgr), hook);
-    dev_add_io_hook(dev, hook);
-  } else {
 
-    return -1;
-  }
+    if (dev_init(info, cfg_data) == -1) {
+	PrintError("Could not initialize Device %s\n", dev_name);
+	return -1;
+    }
 
-  return 0;
+    return 0;
 }
 
 
-int dev_unhook_io(struct vm_device   *dev,
-		  ushort_t            port) {
+void v3_free_device(struct vm_device * dev) {
+    V3_Free(dev);
+}
 
-  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;
-  }
 
-  dev_mgr_remove_io_hook(mgr, hook);
-  dev_remove_io_hook(dev, hook);
+struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) {
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
 
-  return v3_unhook_io_port(dev->vm, port);
+    return (struct vm_device *)v3_htable_search(mgr->dev_table, (addr_t)dev_name);
 }
 
 
-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);
+/****************************************************************/
+/* The remaining functions are called by the devices themselves */
+/****************************************************************/
 
-  return 0;
+/* IO HOOKS */
+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_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 v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
+    return v3_unhook_io_port(dev->vm, port);
 }
 
 
 
+int v3_detach_device(struct vm_device * dev) {
+    struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
+    dev->ops->free(dev);
 
-int dev_mgr_hook_mem(struct guest_info    *vm,
-		     struct vm_device   *device,
-		     void               *start,
-		     void               *end)
-{
+    list_del(&(dev->dev_link));
+    mgr->num_devs--;
 
-  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));
+    dev->vm = NULL;
 
-  if (!hook) { 
     return -1;
-  }
+}
 
-  /* not implemented yet
-  hook_memory(vm->mem_map, 
-	      guest_physical_address_start, 
-	      guest_physical_address_end, 
-	      read,
-	      write,
-	      device);
 
-  */
+struct vm_device * v3_allocate_device(char * name, 
+				      struct v3_device_ops * ops, 
+				      void * private_data) {
+    struct vm_device * dev = NULL;
 
-  return -1;   // remove when hook_memory works
+    dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
 
+    strncpy(dev->name, name, 32);
+    dev->ops = ops;
+    dev->private_data = private_data;
 
-  hook->addr_start = start;
-  hook->addr_end = end;
+    dev->vm = NULL;
 
-  return 0;
-  
+    return dev;
 }
 
 
-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;
-  }
-  */
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) {
+    struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
 
-  /* not implemented yet
-  return unhook_mem_port(vm->mem_map,
-			 guest_physical_start,
-		         guest_physical_end) ;
+    dev->vm = vm;
 
-  */
-  return -1;
-}
+    list_add(&(dev->dev_link), &(mgr->dev_list));
+    mgr->num_devs++;
 
 
+    v3_htable_insert(mgr->dev_table, (addr_t)(dev->name), (addr_t)dev);
 
+    return 0;
+}
 
-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) {
-    PrintDebugDev(dev);
-    PrintDebug("next..\n");
-  }
+#ifdef CONFIG_DEBUG_DEV_MGR
 
-  return;
-}
+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);
 
-void PrintDebugDev(struct vm_device * dev) {
-  
-  PrintDebug("Device: %s\n", dev->name);
-  PrintDebugDevIO(dev);
+    list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
+	PrintDebugDev(dev);
+	PrintDebug("next..\n");
+    }
+
+    return;
 }
 
-void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {
 
+void PrintDebugDev(struct vm_device * dev) {
+    PrintDebug("Device: %s\n", dev->name);
 }
 
-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%x), (write=0x%x)\n", hook->port, hook->read, hook->write);
-  }
 
-  return;
-}
+#else 
+void PrintDebugDevMgr(struct guest_info * info) {}
+void PrintDebugDev(struct vm_device * dev) {}
+#endif