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 network backend/frontend registration to correct location
[palacios.git] / palacios / src / palacios / vmm_dev_mgr.c
index f4c8d62..65d01f4 100644 (file)
  * 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 DEBUG_DEV_MGR
+#ifndef CONFIG_DEBUG_DEV_MGR
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #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);
+static struct hashtable * master_dev_table = NULL;
+
+static uint_t dev_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
+}
+
+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
+
+    PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices);
+
+    master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+
+
+
+    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;
+       }
+
+       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]);
+    }
+
+
+    return 0;
+}
+
 
 int v3_init_dev_mgr(struct guest_info * info) {
     struct vmm_dev_mgr * mgr = &(info->dev_mgr);
@@ -40,8 +92,16 @@ int v3_init_dev_mgr(struct guest_info * info) {
     INIT_LIST_HEAD(&(mgr->dev_list));
     mgr->num_devs = 0;
 
-    //   mgr->dev_table = v3_create_htable(0, , );
+    mgr->dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
 
+    INIT_LIST_HEAD(&(mgr->blk_list));
+    INIT_LIST_HEAD(&(mgr->net_list));
+    INIT_LIST_HEAD(&(mgr->console_list));
+
+    mgr->blk_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    mgr->net_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    mgr->console_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    
     return 0;
 }
 
@@ -61,35 +121,46 @@ int v3_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;
+int v3_create_device(struct guest_info * info, const char * dev_name, v3_cfg_tree_t * cfg) {
+    int (*dev_init)(struct guest_info * info, void * cfg_data);
 
-    list_add(&(dev->dev_link), &(mgr->dev_list));
-    mgr->num_devs++;
+    dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name);
 
-    dev->ops->init(dev);
+    if (dev_init == NULL) {
+       PrintError("Could not find device %s in master device table\n", dev_name);
+       return -1;
+    }
+
+
+    if (dev_init(info, cfg) == -1) {
+       PrintError("Could not initialize Device %s\n", dev_name);
+       return -1;
+    }
 
     return 0;
 }
 
-int v3_detach_device(struct vm_device * dev) {
-    struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
-    dev->ops->deinit(dev);
+void v3_free_device(struct vm_device * dev) {
+    V3_Free(dev);
+}
 
-    list_del(&(dev->dev_link));
-    mgr->num_devs--;
 
-    dev->vm = NULL;
 
-    return 0;
-}
+struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) {
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
 
+    if (!dev_name) {
+       return NULL;
+    }
 
+    return (struct vm_device *)v3_htable_search(mgr->dev_table, (addr_t)dev_name);
+}
 
 
+/****************************************************************/
+/* The remaining functions are called by the devices themselves */
+/****************************************************************/
 
 /* IO HOOKS */
 int v3_dev_hook_io(struct vm_device * dev, uint16_t port,
@@ -108,33 +179,192 @@ int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
 
 
 
+int v3_detach_device(struct vm_device * dev) {
+    struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
+    dev->ops->free(dev);
 
-#ifdef DEBUG_DEV_MGR
+    list_del(&(dev->dev_link));
+    mgr->num_devs--;
 
-void PrintDebugDevMgr(struct guest_info * info) {
+    dev->vm = NULL;
+
+    return -1;
+}
+
+
+struct vm_device * v3_allocate_device(char * name, 
+                                     struct v3_device_ops * ops, 
+                                     void * private_data) {
+    struct vm_device * dev = NULL;
+
+    dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
+
+    strncpy(dev->name, name, 32);
+    dev->ops = ops;
+    dev->private_data = private_data;
+
+    dev->vm = NULL;
+
+    return dev;
+}
+
+
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) {
+    struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
+
+    dev->vm = vm;
+
+    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 v3_print_dev_mgr(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);
+    V3_Print("%d devices registered with manager\n", mgr->num_devs);
 
     list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
-       PrintDebugDev(dev);
-       PrintDebug("next..\n");
+       V3_Print("Device: %s\n", dev->name);
     }
 
     return;
 }
 
 
-void PrintDebugDev(struct vm_device * dev) {
-    PrintDebug("Device: %s\n", dev->name);
+
+
+struct blk_frontend {
+    int (*connect)(struct guest_info * info, 
+                   void * frontend_data, 
+                   struct v3_dev_blk_ops * ops, 
+                   v3_cfg_tree_t * cfg, 
+                   void * priv_data);
+       
+
+    struct list_head blk_node;
+
+    void * priv_data;
+};
+
+
+
+int v3_dev_add_blk_frontend(struct guest_info * info, 
+                           char * name, 
+                           int (*connect)(struct guest_info * info, 
+                                           void * frontend_data, 
+                                           struct v3_dev_blk_ops * ops, 
+                                           v3_cfg_tree_t * cfg, 
+                                           void * priv_data), 
+                           void * priv_data) {
+
+    struct blk_frontend * frontend = NULL;
+
+    frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend));
+    memset(frontend, 0, sizeof(struct blk_frontend));
+    
+    frontend->connect = connect;
+    frontend->priv_data = priv_data;
+       
+    list_add(&(frontend->blk_node), &(info->dev_mgr.blk_list));
+    v3_htable_insert(info->dev_mgr.blk_table, (addr_t)(name), (addr_t)frontend);
+
+    return 0;
+}
+
+int v3_dev_connect_blk(struct guest_info * info, 
+                      char * frontend_name, 
+                      struct v3_dev_blk_ops * ops, 
+                      v3_cfg_tree_t * cfg, 
+                      void * private_data) {
+
+    struct blk_frontend * frontend = NULL;
+
+    frontend = (struct blk_frontend *)v3_htable_search(info->dev_mgr.blk_table,
+                                                      (addr_t)frontend_name);
+    
+    if (frontend == NULL) {
+       PrintError("Could not find frontend blk device %s\n", frontend_name);
+       return 0;
+    }
+
+    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
+       PrintError("Error connecting to block frontend %s\n", frontend_name);
+       return -1;
+    }
+
+    return 0;
 }
 
 
 
+struct net_frontend {
+    int (*connect)(struct guest_info * info, 
+                   void * frontend_data, 
+                   struct v3_dev_net_ops * ops, 
+                   v3_cfg_tree_t * cfg, 
+                   void * priv_data);
+       
+
+    struct list_head net_node;
+
+    void * priv_data;
+};
+
+
+int v3_dev_add_net_frontend(struct guest_info * info, 
+                           char * name, 
+                           int (*connect)(struct guest_info * info, 
+                                           void * frontend_data, 
+                                           struct v3_dev_net_ops * ops, 
+                                           v3_cfg_tree_t * cfg, 
+                                           void * private_data), 
+                           void * priv_data)
+{
+    struct net_frontend * frontend = NULL;
+
+    frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend));
+    memset(frontend, 0, sizeof(struct net_frontend));
+    
+    frontend->connect = connect;
+    frontend->priv_data = priv_data;
+       
+    list_add(&(frontend->net_node), &(info->dev_mgr.net_list));
+    v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
+
+    return 0;
+}
+
+
+int v3_dev_connect_net(struct guest_info * info, 
+                      char * frontend_name, 
+                      struct v3_dev_net_ops * ops, 
+                      v3_cfg_tree_t * cfg, 
+                      void * private_data)
+{
+    struct net_frontend * frontend = NULL;
+
+    frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table,
+                                                      (addr_t)frontend_name);
+    
+    if (frontend == NULL) {
+       PrintError("Could not find frontend net device %s\n", frontend_name);
+       return 0;
+    }
+
+    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
+       PrintError("Error connecting to net frontend %s\n", frontend_name);
+       return -1;
+    }
+
+    return 0;
+}
 
-#else 
-void PrintDebugDevMgr(struct guest_info * info) {}
-void PrintDebugDev(struct vm_device * dev) {}
-#endif